代码清理

o2server/configSample/token.json

@@ -81,10 +81,10 @@
   "###initialManagerDistinguishedName": "初始管理员DistinguishedName,不可更改.###",
   "###ldapAuth": "LDAP认证配置###",
   "ldapAuth": {
-    "enable": true,
-    "ldapUrl": "ldap://172.16.84.3:5389/",
-    "baseDn": "dc=jl,DC=CMCC",
-    "userDn": "uid=*,ou=users,dc=jl,DC=CMCC",
+    "enable": false,
+    "ldapUrl": "",
+    "baseDn": "",
+    "userDn": "",
     "###enable": "是否启用###",
     "###ldapUrl": "LDAP地址###",
     "###baseDn": "LDAP查询的根名称如：dc\u003dzone,DC\u003dCOM###",
@@ -93,4 +93,4 @@
   "###ssos": "sso登录配置###",
   "###oauths": "oauth单点登录配置###",
   "###oauthClients": "作为客户端单点登录配置###"
-}
+}
\ No newline at end of file

o2server/x_console/src/main/java/com/x/server/console/ResourceFactory.java

 package com.x.server.console;
 
+import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -67,9 +68,6 @@ public class ResourceFactory {
 			containerEntityNames(cl, sr);
 			stroageContainerEntityNames(cl, sr);
 		}
-//		if (BooleanUtils.isTrue(Config.logLevel().audit().enable())) {
-//			auditLog();
-//		}
 		if (BooleanUtils.isTrue(Config.externalDataSources().enable())) {
 			external();
 		} else {
@@ -82,8 +80,11 @@ public class ResourceFactory {
 	private static Path[] unzipCustomWar() throws Exception {
 		FileUtils.cleanDirectory(Config.dir_local_temp_custom(true));
 		List<String> list = new ArrayList<>();
-		for (String str : Config.dir_custom(true).list(new WildcardFileFilter("*" + PathTools.DOT_WAR))) {
-			list.add(FilenameUtils.getBaseName(str));
+		File dir = Config.dir_custom(true);
+		if (null != dir) {
+			for (String str : dir.list(new WildcardFileFilter("*" + PathTools.DOT_WAR))) {
+				list.add(FilenameUtils.getBaseName(str));
+			}
 		}
 		list = ListTools.includesExcludesWildcard(list, Config.currentNode().getApplication().getIncludes(),
 				Config.currentNode().getApplication().getExcludes());
@@ -223,7 +224,8 @@ public class ResourceFactory {
 	}
 
 	private static void tokenThresholds() throws NamingException {
-		Map<String, Date> linkedHashMap = new LinkedHashMap<>() {
+		// java8中无法将 <> 与匿名内部类一起使用,所以这里需要进行类型的申明
+		Map<String, Date> linkedHashMap = new LinkedHashMap<String, Date>() {
 			private static final long serialVersionUID = 2324816564609476854L;
 
 			@Override