Merge branch 'cherry-pick-395d5d44' into 'wrdp'

java8 compatible

See merge request o2oa/o2oa!5430

o2server/x_base_core_project/src/main/java/com/x/base/core/project/logger/Logger.java

@@ -18,8 +18,6 @@ import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.tools.DateTools;
 import com.x.base.core.project.tools.StringTools;
 
-import jdk.jfr.Description;
-
 public class Logger {
 
 	private final org.slf4j.Logger internalLogger;

o2server/x_base_core_project/src/main/java/com/x/base/core/project/tools/URLTools.java

@@ -27,7 +27,7 @@ public class URLTools {
 	 */
 	public static String encode(String str) {
 		try {
-			return URLEncoder.encode(str, StandardCharsets.UTF_8);
+			return URLEncoder.encode(str, StandardCharsets.UTF_8.name());
 		} catch (Exception e) {
 			e.printStackTrace();
 		}