Merge branch 'o2cloud_0813' into 'wrdp'

服务器启动时添加保存urlmapping至o2云unit的服务

See merge request o2oa/o2oa!4921

o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/WebServers.java

@@ -179,7 +179,7 @@ public class WebServers extends ConcurrentSkipListMap<String, WebServer> {
 		map.put("indexPage", Config.portal().getIndexPage());
 		map.put("webSocketEnable", Config.communicate().wsEnable());
 		map.put("urlMapping", Config.portal().getUrlMapping());
-		if(!(Config.portal().getUrlMapping().isEmpty())){
+		if(null != Config.portal().getUrlMapping() && !(Config.portal().getUrlMapping().isEmpty())){
 			try {
 				String urlMapping = XGsonBuilder.toJson(Config.portal().getUrlMapping());
 				Map<String, String> urlmap = new HashMap<>();