springboot springcloud 升级

pom.xml

@@ -16,9 +16,18 @@
 			<artifactId>examcloud-jenkins-build</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
+
+		<dependency>
+			<groupId>jdk.tools</groupId>
+			<artifactId>jdk.tools</artifactId>
+			<version>${java.version}</version>
+			<scope>system</scope>
+			<systemPath>${JAVA_HOME}/lib/tools.jar</systemPath>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<exclusions>
 				<exclusion>
 					<groupId>org.springframework.boot</groupId>
@@ -26,6 +35,18 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>compile</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-log4j2</artifactId>
@@ -38,6 +59,7 @@
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-1.2-api</artifactId>
 		</dependency>
+
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-yaml</artifactId>
@@ -65,6 +87,7 @@
 		<dependency>
 			<groupId>com.thoughtworks.xstream</groupId>
 			<artifactId>xstream</artifactId>
+			<version>1.4.10</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-net</groupId>
@@ -185,13 +208,6 @@
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>jdk.tools</groupId>
-			<artifactId>jdk.tools</artifactId>
-			<version>${java.version}</version>
-			<scope>system</scope>
-			<systemPath>${JAVA_HOME}/lib/tools.jar</systemPath>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-mail</artifactId>

src/main/java/cn/com/qmth/examcloud/commons/util/JsonUtil.java

@@ -98,8 +98,7 @@ public class JsonUtil {
 		if (null == json) {
 			return json;
 		}
-		JsonParser jsonParser = new JsonParser();
-		JsonElement jsonEl = jsonParser.parse(json);
+		JsonElement jsonEl = JsonParser.parseString(json);
 		return toPrettyJson(jsonEl);
 	}
 
@@ -140,8 +139,7 @@ public class JsonUtil {
 	 * @return
 	 */
 	public static Map<String, String> json2Map(String s) {
-		JsonParser parser = new JsonParser();
-		JsonElement jsonElement = parser.parse(s);
+		JsonElement jsonElement = JsonParser.parseString(s);
 		JsonObject jsonObject = jsonElement.getAsJsonObject();
 		Set<Entry<String, JsonElement>> entrySet = jsonObject.entrySet();