Merge branch 'develop' into 'fix/Process.mobile_blue_flat_style_modify'

# Conflicts:
#   o2web/source/o2_core/o2/widget/$Dialog/mobile_blue_flat/dialog.html
#   o2web/source/x_component_Selector/$Selector/blue_flat_mobile/css.wcss
#   o2web/source/x_component_Template/$MSelector/mobile_blue_flat/css.wcss

o2server/x_attendance_assemble_control/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";
@@ -694,8 +694,8 @@ Describe.createSampleCommon= function(m,className) {
 		 strSample += ");\n"
 		} 
    return  strSample ;		
-   }
-   
+    }
+
 Describe.prototype = {
 	"load" : function() {
 		var str = '<ul>';

o2server/x_bbs_assemble_control/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2server/x_calendar_assemble_control/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2server/x_cms_assemble_control/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2server/x_component_assemble_control/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

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

@@ -44,17 +44,18 @@ public class NodeAgent extends Thread {
 
 	public static final Pattern redeploy_pattern = Pattern.compile("^redeploy:(.+)$", Pattern.CASE_INSENSITIVE);
 
-	public static final Pattern upload_resource_pattern = Pattern.compile("^uploadResource:(.+)$", Pattern.CASE_INSENSITIVE);
+	public static final Pattern upload_resource_pattern = Pattern.compile("^uploadResource:(.+)$",
+			Pattern.CASE_INSENSITIVE);
 
 	public static final Pattern read_log_pattern = Pattern.compile("^readLog:(.+)$", Pattern.CASE_INSENSITIVE);
-	
+
 	public static final Pattern execute_command_pattern = Pattern.compile("^command:(.+)$", Pattern.CASE_INSENSITIVE);
-	
+
 	public static final int LOG_MAX_READ_SIZE = 6 * 1024;
 
-	private static final int BUFFER_SIZE = 1024*1024*1000;
+	private static final int BUFFER_SIZE = 1024 * 1024 * 1000;
 
-	private LinkedBlockingQueue<String>  commandQueue;
+	private LinkedBlockingQueue<String> commandQueue;
 
 	private FileOutputStream fos;
 
@@ -73,11 +74,11 @@ public class NodeAgent extends Thread {
 			while (true) {
 				try (Socket socket = serverSocket.accept()) {
 					try (DataOutputStream dos = new DataOutputStream(socket.getOutputStream());
-						 DataInputStream dis = new DataInputStream(socket.getInputStream())) {
+							DataInputStream dis = new DataInputStream(socket.getInputStream())) {
 						String json = dis.readUTF();
-						
-						//logger.info("receive socket json={}",json);
-						
+
+						// logger.info("receive socket json={}",json);
+
 						CommandObject commandObject = XGsonBuilder.instance().fromJson(json, CommandObject.class);
 						if (BooleanUtils.isTrue(Config.currentNode().nodeAgentEncrypt())) {
 							String decrypt = Crypto.rsaDecrypt(commandObject.getCredential(), Config.privateKey());
@@ -87,61 +88,60 @@ public class NodeAgent extends Thread {
 								continue;
 							}
 						}
-						
+
 						matcher = redeploy_pattern.matcher(commandObject.getCommand());
 						if (matcher.find()) {
 							String strCommand = commandObject.getCommand();
 							strCommand = strCommand.trim();
-							strCommand = strCommand.substring(strCommand.indexOf(":")+1, strCommand.length());
-							logger.info("收接到命令:"+strCommand);
+							strCommand = strCommand.substring(strCommand.indexOf(":") + 1, strCommand.length());
+							logger.info("收接到命令:" + strCommand);
 							String filename = dis.readUTF();
-							File tempFile  = null;
+							File tempFile = null;
 							switch (strCommand) {
-							case "storeWar":
-								 tempFile = Config.dir_store();
-								break;
-							case "storeJar":
-								 tempFile = Config.dir_store_jars();
-								break;
-							case "customWar":
-								 tempFile = Config.dir_custom();
-								  break;
-							case "customJar":
-								 tempFile = Config.dir_custom_jars();
-								break;
+								case "storeWar":
+									tempFile = Config.dir_store();
+									break;
+								case "storeJar":
+									tempFile = Config.dir_store_jars();
+									break;
+								case "customWar":
+									tempFile = Config.dir_custom();
+									break;
+								case "customJar":
+									tempFile = Config.dir_custom_jars();
+									break;
 							}
 							FileTools.forceMkdir(tempFile);
-							logger.info("文件名path:"+tempFile.getAbsolutePath()+ File.separator +  filename);
-							File file = new File(tempFile.getAbsolutePath()+ File.separator +  filename);
-						    fos = new FileOutputStream(file);
+							logger.info("文件名path:" + tempFile.getAbsolutePath() + File.separator + filename);
+							File file = new File(tempFile.getAbsolutePath() + File.separator + filename);
+							fos = new FileOutputStream(file);
 							byte[] bytes = new byte[1024];
-							int length =0;
-							while((length = dis.read(bytes, 0, bytes.length)) != -1) {
+							int length = 0;
+							while ((length = dis.read(bytes, 0, bytes.length)) != -1) {
 								fos.write(bytes, 0, length);
 								fos.flush();
 							}
 							fos.close();
-							bytes = IOUtils.xxxx(file);
-							filename = filename.substring(0,filename.lastIndexOf("."));
-			                //部署
+							bytes = FileUtils.readFileToByteArray(file);
+							filename = filename.substring(0, filename.lastIndexOf("."));
+							// 部署
 							String result = this.redeploy(filename, bytes);
-							logger.info("部署:"+result);
+							logger.info("部署:" + result);
 							continue;
-							
-						}
 
+						}
 
 						matcher = upload_resource_pattern.matcher(commandObject.getCommand());
 						if (matcher.find()) {
 							int fileLength = dis.readInt();
 							byte[] bytes;
-							try(ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
+							try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
 								byte[] onceBytes = new byte[1024];
 								int length = 0;
 								while ((length = dis.read(onceBytes, 0, onceBytes.length)) != -1) {
 									bos.write(onceBytes, 0, length);
 									bos.flush();
-									if(bos.size() == fileLength){
+									if (bos.size() == fileLength) {
 										break;
 									}
 								}
@@ -161,17 +161,16 @@ public class NodeAgent extends Thread {
 							continue;
 						}
 
-						
 						matcher = execute_command_pattern.matcher(commandObject.getCommand());
 						if (matcher.find()) {
 							String strCommand = commandObject.getCommand();
 							strCommand = strCommand.trim();
-							strCommand = strCommand.substring(strCommand.indexOf(":")+1, strCommand.length());
-							logger.info("收接到命令:"+strCommand);
+							strCommand = strCommand.substring(strCommand.indexOf(":") + 1, strCommand.length());
+							logger.info("收接到命令:" + strCommand);
 							commandQueue.add(strCommand);
 							continue;
 						}
-						
+
 						dos.writeUTF("failure:no pattern method!");
 						dos.flush();
 
@@ -189,12 +188,12 @@ public class NodeAgent extends Thread {
 		}
 	}
 
-	private void readLog(long lastTimeFileSize, DataOutputStream dos) throws Exception{
+	private void readLog(long lastTimeFileSize, DataOutputStream dos) throws Exception {
 		try {
 			File logFile = new File(Config.base(), "logs/" + DateTools.format(new Date(), "yyyy_MM_dd") + ".out.log");
-			if(logFile.exists()){
+			if (logFile.exists()) {
 				List<Map<String, String>> list = new ArrayList<>();
-				try(RandomAccessFile randomFile = new RandomAccessFile(logFile,"r")) {
+				try (RandomAccessFile randomFile = new RandomAccessFile(logFile, "r")) {
 					long curFileSize = randomFile.length();
 					if (lastTimeFileSize <= 0 || lastTimeFileSize > curFileSize) {
 						lastTimeFileSize = (curFileSize > LOG_MAX_READ_SIZE) ? (curFileSize - LOG_MAX_READ_SIZE) : 0;
@@ -214,8 +213,8 @@ public class NodeAgent extends Thread {
 							if (DateTools.isDateTime(time)) {
 								time = StringUtils.left(lineStr, 23);
 								curTime = time;
-								if(lineStr.length() > 29){
-									logLevel = StringUtils.right(StringUtils.left(lineStr, 29),5).trim();
+								if (lineStr.length() > 29) {
+									logLevel = StringUtils.right(StringUtils.left(lineStr, 29), 5).trim();
 								}
 							} else {
 								if (StringUtils.isEmpty(curTime)) {
@@ -232,16 +231,16 @@ public class NodeAgent extends Thread {
 							}
 						}
 						Map<String, String> map = new HashMap<>();
-						map.put("logTime",time+"#"+Config.node());
+						map.put("logTime", time + "#" + Config.node());
 						map.put("node", Config.node());
 						map.put("logLevel", logLevel);
 						map.put("lineLog", lineStr);
 						list.add(map);
-						if (curReadSize > LOG_MAX_READ_SIZE){
+						if (curReadSize > LOG_MAX_READ_SIZE) {
 							break;
 						}
 					}
-					if(curReadSize>0) {
+					if (curReadSize > 0) {
 						lastTimeFileSize = lastTimeFileSize + curReadSize - 1;
 					}
 				}
@@ -260,20 +259,20 @@ public class NodeAgent extends Thread {
 		dos.flush();
 	}
 
-	private String uploadResource(Map<String,Object> param, byte[] bytes){
+	private String uploadResource(Map<String, Object> param, byte[] bytes) {
 		String result = "success";
-		if(param == null || param.isEmpty()){
+		if (param == null || param.isEmpty()) {
 			result = "failure";
 			return result;
 		}
 		try {
-			String fileName = (String)param.get("fileName");
-			String filePath = (String)param.get("filePath");
-			Boolean flag = (Boolean)param.get("asNew");
-			boolean asNew = flag==null ? false : flag;
+			String fileName = (String) param.get("fileName");
+			String filePath = (String) param.get("filePath");
+			Boolean flag = (Boolean) param.get("asNew");
+			boolean asNew = flag == null ? false : flag;
 
-			if(StringUtils.isNotEmpty(fileName)){
-				if(fileName.toLowerCase().endsWith(".zip")) {
+			if (StringUtils.isNotEmpty(fileName)) {
+				if (fileName.toLowerCase().endsWith(".zip")) {
 					File tempFile = new File(Config.base(), "local/temp/upload");
 					FileTools.forceMkdir(tempFile);
 					FileUtils.cleanDirectory(tempFile);
@@ -290,20 +289,20 @@ public class NodeAgent extends Thread {
 
 					FileUtils.cleanDirectory(tempFile);
 					logger.print("upload resource {} success!", fileName);
-				}else if(StringUtils.isNotEmpty(filePath)){
+				} else if (StringUtils.isNotEmpty(filePath)) {
 					File dist = new File(Config.base(), Config.DIR_SERVERS_WEBSERVER);
 					dist = new File(dist, filePath);
 					FileTools.forceMkdir(dist);
 					File file = new File(dist, fileName);
-					if(file.exists()){
+					if (file.exists()) {
 						file.delete();
 					}
 					FileUtils.writeByteArrayToFile(file, bytes);
 					logger.print("upload resource {} success!", fileName);
-				}else{
+				} else {
 					result = "failure";
 				}
-			}else{
+			} else {
 				result = "failure";
 			}
 
@@ -319,18 +318,18 @@ public class NodeAgent extends Thread {
 		try {
 			logger.print("redeploy:{}.", name);
 			switch (this.type(name)) {
-			case "storeWar":
-				storeWar(name, bytes);
-				break;
-			case "storeJar":
-				storeJar(name, bytes);
-				break;
-			case "customWar":
-				customWar(name, bytes);
-				break;
-			case "customJar":
-				customJar(name, bytes);
-				break;
+				case "storeWar":
+					storeWar(name, bytes);
+					break;
+				case "storeJar":
+					storeJar(name, bytes);
+					break;
+				case "customWar":
+					customWar(name, bytes);
+					break;
+				case "customJar":
+					customJar(name, bytes);
+					break;
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -566,9 +565,13 @@ public class NodeAgent extends Thread {
 			this.credential = credential;
 		}
 
-		public Map<String,Object> getParam() { return param; }
+		public Map<String, Object> getParam() {
+			return param;
+		}
 
-		public void setParam(Map<String, Object> param) { this.param = param; }
+		public void setParam(Map<String, Object> param) {
+			this.param = param;
+		}
 
 	}
 
@@ -588,40 +591,41 @@ public class NodeAgent extends Thread {
 		return null;
 	}
 
-	public static void main(String[] args) throws  Exception{
-		//File logFile = new File(Config.base(), "logs/" + DateTools.format(new Date(), "yyyy_MM_dd") + ".out.log");
+	public static void main(String[] args) throws Exception {
+		// File logFile = new File(Config.base(), "logs/" + DateTools.format(new Date(),
+		// "yyyy_MM_dd") + ".out.log");
 		File logFile = new File("/Users/chengjian/Desktop/temp/temp/2020_03_12.out.log");
-		RandomAccessFile randomFile = new RandomAccessFile(logFile,"r");
-		long lastTimeFileSize = randomFile.length()-10*1024;
+		RandomAccessFile randomFile = new RandomAccessFile(logFile, "r");
+		long lastTimeFileSize = randomFile.length() - 10 * 1024;
 		long tempSize = lastTimeFileSize;
 		randomFile.seek(lastTimeFileSize);
 		String tmp = "";
 		String curTime = "";
-		while( (tmp = randomFile.readLine())!= null) {
+		while ((tmp = randomFile.readLine()) != null) {
 			byte[] bytes = tmp.getBytes("ISO8859-1");
 			String lineStr = new String(bytes);
-			tempSize = tempSize + bytes.length+1;
+			tempSize = tempSize + bytes.length + 1;
 			String time = curTime;
-			if(lineStr.length()>23){
+			if (lineStr.length() > 23) {
 				time = StringUtils.left(lineStr, 19);
-				if(DateTools.isDateTime(time)){
+				if (DateTools.isDateTime(time)) {
 					time = StringUtils.left(lineStr, 23);
 					curTime = time;
-					//System.out.println(lineStr);
-				}else{
-					if(StringUtils.isEmpty(curTime)){
+					// System.out.println(lineStr);
+				} else {
+					if (StringUtils.isEmpty(curTime)) {
 						continue;
-					}else {
+					} else {
 						time = curTime;
-						//System.out.println(lineStr);
+						// System.out.println(lineStr);
 					}
 				}
-			}else{
-				if(StringUtils.isEmpty(curTime)){
+			} else {
+				if (StringUtils.isEmpty(curTime)) {
 					continue;
-				}else{
+				} else {
 					time = curTime;
-					//System.out.println(lineStr);
+					// System.out.println(lineStr);
 				}
 			}
 		}

o2server/x_console/src/main/java/com/x/server/console/action/RestatWar.java

@@ -21,6 +21,8 @@ import org.eclipse.jetty.quickstart.QuickStartWebApp;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.gzip.GzipHandler;
+import org.eclipse.jetty.util.resource.JarResource;
+import org.eclipse.jetty.util.resource.Resource;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -36,13 +38,33 @@ public class RestatWar {
 			try {
 				GzipHandler gzipHandler = (GzipHandler) Servers.applicationServer.getHandler();
 				HandlerList hanlderList = (HandlerList) gzipHandler.getHandler();
+				File dir = null;
+				String warFilePath = null;
 				Boolean appExists = false;
 				for (Handler handler : hanlderList.getHandlers()) {
 					if ( QuickStartWebApp.class.isAssignableFrom(handler.getClass())) {
 						QuickStartWebApp app = (QuickStartWebApp) handler;
 						if (StringUtils.equals("/" + simpleName, app.getContextPath())) {
 							appExists = true;
+							if( StringUtils.equals( type(simpleName), "storeWar")){
+								warFilePath = Config.dir_store(true) + "/" + simpleName + ".war";
+								dir = new File(Config.dir_servers_applicationServer_work(), simpleName);
+								logger.print("stoping offical application {} ...", simpleName );
+							}else if( StringUtils.equals( type(simpleName), "customWar")){
+								warFilePath = Config.dir_custom(true) + "/" + simpleName + ".war";
+								dir = new File(Config.dir_servers_applicationServer_work(), simpleName);
+								logger.print("stoping custom application {} ...", simpleName );
+							}
 							app.stop();
+							Thread.sleep(2000);
+							if( dir != null && dir.exists() ){
+								FileUtils.forceDelete(dir);
+							}
+							Resource base = Resource.newResource( warFilePath );
+							dir.mkdirs();
+							logger.print("redeploy application {} to work dir...", simpleName );
+							JarResource.newJarResource(base).copyTo(dir);
+							logger.print("starting application {} ...", simpleName );
 							app.start();
 						}
 					}
@@ -57,7 +79,23 @@ public class RestatWar {
 		}else{
 			logger.print("application server not start." );
 		}
-		logger.print("restart application command excute completed." );
+		logger.print("restart application {} command excute completed.", simpleName );
 		return true;
 	}
+
+	private String type(String simpleName) throws Exception {
+		if ((new File(Config.dir_store(), simpleName + ".war")).exists()) {
+			return "storeWar";
+		}
+		if ((new File(Config.dir_store_jars(), simpleName + ".jar")).exists()) {
+			return "storeJar";
+		}
+		if ((new File(Config.dir_custom(), simpleName + ".war")).exists()) {
+			return "customWar";
+		}
+		if ((new File(Config.dir_custom_jars(), simpleName + ".jar")).exists()) {
+			return "customJar";
+		}
+		return null;
+	}
 }

o2server/x_file_assemble_control/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2server/x_general_assemble_control/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2server/x_hotpic_assemble_control/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2server/x_meeting_assemble_control/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2server/x_message_assemble_communicate/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2server/x_mind_assemble_control/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2server/x_okr_assemble_control/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2server/x_organization_assemble_authentication/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2server/x_organization_assemble_control/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2server/x_organization_assemble_express/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2server/x_organization_assemble_personal/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2server/x_portal_assemble_designer/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2server/x_portal_assemble_surface/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2server/x_processplatform_assemble_bam/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2server/x_processplatform_assemble_designer/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/read/ActionManageListFilterPaging.java

@@ -62,37 +62,37 @@ class ActionManageListFilterPaging extends BaseAction {
 			p = cb.and(p, root.get(Read_.application).in(wi.getApplicationList()));
 		}
 		if (StringUtils.isNotBlank(wi.getPerson())){
-			p = cb.and(p,cb.equal(root.get(Read_.person), wi.person));
+			p = cb.and(p,cb.equal(root.get(Read_.person), wi.getPerson()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue01())){
-			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.stringValue01));
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.getStringValue01()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue02())){
-			p = cb.and(p,cb.equal(root.get(Read_.stringValue02), wi.stringValue02));
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue02), wi.getStringValue02()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue03())){
-			p = cb.and(p,cb.equal(root.get(Read_.stringValue03), wi.stringValue03));
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue03), wi.getStringValue03()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue04())){
-			p = cb.and(p,cb.equal(root.get(Read_.stringValue04), wi.stringValue04));
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue04), wi.getStringValue04()));
 		}
-		if (StringUtils.isNotBlank(wi.getStringValue01())){
-			p = cb.and(p,cb.equal(root.get(Read_.stringValue05), wi.stringValue05));
+		if (StringUtils.isNotBlank(wi.getStringValue05())){
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue05), wi.getStringValue05()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue06())){
-			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.stringValue06));
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue06), wi.getStringValue06()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue07())){
-			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.stringValue07));
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue07), wi.getStringValue07()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue08())){
-			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.stringValue08));
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue08), wi.getStringValue08()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue09())){
-			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.stringValue09));
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue09), wi.getStringValue09()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue10())){
-			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.stringValue10));
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue10), wi.getStringValue10()));
 		}
 		if (ListTools.isNotEmpty(wi.getProcessList())) {
 			p = cb.and(p, root.get(Read_.process).in(wi.getProcessList()));
@@ -149,37 +149,37 @@ class ActionManageListFilterPaging extends BaseAction {
 			p = cb.and(p, root.get(Read_.application).in(wi.getApplicationList()));
 		}
 		if (StringUtils.isNotBlank(wi.getPerson())){
-			p = cb.and(p,cb.equal(root.get(Read_.person), wi.person));
+			p = cb.and(p,cb.equal(root.get(Read_.person), wi.getPerson()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue01())){
-			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.stringValue01));
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.getStringValue01()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue02())){
-			p = cb.and(p,cb.equal(root.get(Read_.stringValue02), wi.stringValue02));
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue02), wi.getStringValue02()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue03())){
-			p = cb.and(p,cb.equal(root.get(Read_.stringValue03), wi.stringValue03));
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue03), wi.getStringValue03()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue04())){
-			p = cb.and(p,cb.equal(root.get(Read_.stringValue04), wi.stringValue04));
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue04), wi.getStringValue04()));
 		}
-		if (StringUtils.isNotBlank(wi.getStringValue01())){
-			p = cb.and(p,cb.equal(root.get(Read_.stringValue05), wi.stringValue05));
+		if (StringUtils.isNotBlank(wi.getStringValue05())){
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue05), wi.getStringValue05()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue06())){
-			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.stringValue06));
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue06), wi.getStringValue06()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue07())){
-			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.stringValue07));
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue07), wi.getStringValue07()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue08())){
-			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.stringValue08));
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue08), wi.getStringValue08()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue09())){
-			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.stringValue09));
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue09), wi.getStringValue09()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue10())){
-			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.stringValue10));
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue10), wi.getStringValue10()));
 		}
 		if (ListTools.isNotEmpty(wi.getProcessList())) {
 			p = cb.and(p, root.get(Read_.process).in(wi.getProcessList()));
@@ -285,6 +285,8 @@ class ActionManageListFilterPaging extends BaseAction {
 			return applicationList;
 		}
 
+
+
 		public String getPerson() { return person; }
 		public String getStringValue01() { return stringValue01; }
 		public String getStringValue02() { return stringValue02; }
@@ -296,6 +298,19 @@ class ActionManageListFilterPaging extends BaseAction {
 		public String getStringValue08() { return stringValue08; }
 		public String getStringValue09() { return stringValue09; }
 		public String getStringValue10() { return stringValue10; }
+		public void setStringValue01(String stringValue01) { this.stringValue01 = stringValue01; }
+		public void setStringValue02(String stringValue02) { this.stringValue02 = stringValue02; }
+		public void setStringValue03(String stringValue03) { this.stringValue03 = stringValue03; }
+		public void setStringValue04(String stringValue04) { this.stringValue04 = stringValue04; }
+		public void setStringValue05(String stringValue05) { this.stringValue05 = stringValue05; }
+		public void setStringValue06(String stringValue06) { this.stringValue06 = stringValue06; }
+		public void setStringValue07(String stringValue07) { this.stringValue07 = stringValue07; }
+		public void setStringValue08(String stringValue08) { this.stringValue08 = stringValue08; }
+		public void setStringValue09(String stringValue09) { this.stringValue09 = stringValue09; }
+		public void setStringValue10(String stringValue10) { this.stringValue10 = stringValue10; }
+		public void setPerson(String person) {
+			this.person = person;
+		}
 
 		public void setApplicationList(List<String> applicationList) {
 			this.applicationList = applicationList;

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/ActionManageListFilterPaging.java

@@ -65,37 +65,37 @@ class ActionManageListFilterPaging extends BaseAction {
 		}
 
 		if (StringUtils.isNotBlank(wi.getPerson())){
-			p = cb.and(p,cb.equal(root.get(ReadCompleted_.person), wi.person));
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.person), wi.getPerson()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue01())){
-			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.stringValue01));
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.getStringValue01()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue02())){
-			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue02), wi.stringValue02));
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue02), wi.getStringValue02()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue03())){
-			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue03), wi.stringValue03));
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue03), wi.getStringValue03()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue04())){
-			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue04), wi.stringValue04));
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue04), wi.getStringValue04()));
 		}
-		if (StringUtils.isNotBlank(wi.getStringValue01())){
-			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue05), wi.stringValue05));
+		if (StringUtils.isNotBlank(wi.getStringValue05())){
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue05), wi.getStringValue05()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue06())){
-			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.stringValue06));
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue06), wi.getStringValue06()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue07())){
-			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.stringValue07));
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue07), wi.getStringValue07()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue08())){
-			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.stringValue08));
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue08), wi.getStringValue08()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue09())){
-			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.stringValue09));
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue09), wi.getStringValue09()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue10())){
-			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.stringValue10));
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue10), wi.getStringValue10()));
 		}
 
 		if (ListTools.isNotEmpty(wi.getProcessList())) {
@@ -154,37 +154,37 @@ class ActionManageListFilterPaging extends BaseAction {
 		}
 
 		if (StringUtils.isNotBlank(wi.getPerson())){
-			p = cb.and(p,cb.equal(root.get(ReadCompleted_.person), wi.person));
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.person), wi.getPerson()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue01())){
-			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.stringValue01));
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.getStringValue01()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue02())){
-			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue02), wi.stringValue02));
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue02), wi.getStringValue02()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue03())){
-			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue03), wi.stringValue03));
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue03), wi.getStringValue03()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue04())){
-			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue04), wi.stringValue04));
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue04), wi.getStringValue04()));
 		}
-		if (StringUtils.isNotBlank(wi.getStringValue01())){
-			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue05), wi.stringValue05));
+		if (StringUtils.isNotBlank(wi.getStringValue05())){
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue05), wi.getStringValue05()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue06())){
-			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.stringValue06));
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue06), wi.getStringValue06()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue07())){
-			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.stringValue07));
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue07), wi.getStringValue07()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue08())){
-			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.stringValue08));
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue08), wi.getStringValue08()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue09())){
-			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.stringValue09));
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue09), wi.getStringValue09()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue10())){
-			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.stringValue10));
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue10), wi.getStringValue10()));
 		}
 
 		if (ListTools.isNotEmpty(wi.getProcessList())) {
@@ -302,7 +302,19 @@ class ActionManageListFilterPaging extends BaseAction {
 		public String getStringValue08() { return stringValue08; }
 		public String getStringValue09() { return stringValue09; }
 		public String getStringValue10() { return stringValue10; }
-
+		public void setStringValue01(String stringValue01) { this.stringValue01 = stringValue01; }
+		public void setStringValue02(String stringValue02) { this.stringValue02 = stringValue02; }
+		public void setStringValue03(String stringValue03) { this.stringValue03 = stringValue03; }
+		public void setStringValue04(String stringValue04) { this.stringValue04 = stringValue04; }
+		public void setStringValue05(String stringValue05) { this.stringValue05 = stringValue05; }
+		public void setStringValue06(String stringValue06) { this.stringValue06 = stringValue06; }
+		public void setStringValue07(String stringValue07) { this.stringValue07 = stringValue07; }
+		public void setStringValue08(String stringValue08) { this.stringValue08 = stringValue08; }
+		public void setStringValue09(String stringValue09) { this.stringValue09 = stringValue09; }
+		public void setStringValue10(String stringValue10) { this.stringValue10 = stringValue10; }
+		public void setPerson(String person) {
+			this.person = person;
+		}
 		public void setApplicationList(List<String> applicationList) {
 			this.applicationList = applicationList;
 		}

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/review/V2Base.java

@@ -101,6 +101,50 @@ abstract class V2Base extends StandardJaxrsAction {
 		@FieldDescribe("关键字")
 		private String key;
 
+
+		@FieldDescribe("业务数据String值01")
+		private String stringValue01;
+		@FieldDescribe("业务数据String值02")
+		private String stringValue02;
+		@FieldDescribe("业务数据String值03")
+		private String stringValue03;
+		@FieldDescribe("业务数据String值04")
+		private String stringValue04;
+		@FieldDescribe("业务数据String值05")
+		private String stringValue05;
+		@FieldDescribe("业务数据String值06")
+		private String stringValue06;
+		@FieldDescribe("业务数据String值07")
+		private String stringValue07;
+		@FieldDescribe("业务数据String值08")
+		private String stringValue08;
+		@FieldDescribe("业务数据String值09")
+		private String stringValue09;
+		@FieldDescribe("业务数据String值10")
+		private String stringValue10;
+
+		public String getStringValue01() { return stringValue01; }
+		public String getStringValue02() { return stringValue02; }
+		public String getStringValue03() { return stringValue03; }
+		public String getStringValue04() { return stringValue04; }
+		public String getStringValue05() { return stringValue05; }
+		public String getStringValue06() { return stringValue06; }
+		public String getStringValue07() { return stringValue07; }
+		public String getStringValue08() { return stringValue08; }
+		public String getStringValue09() { return stringValue09; }
+		public String getStringValue10() { return stringValue10; }
+		public void setStringValue01(String stringValue01) { this.stringValue01 = stringValue01; }
+		public void setStringValue02(String stringValue02) { this.stringValue02 = stringValue02; }
+		public void setStringValue03(String stringValue03) { this.stringValue03 = stringValue03; }
+		public void setStringValue04(String stringValue04) { this.stringValue04 = stringValue04; }
+		public void setStringValue05(String stringValue05) { this.stringValue05 = stringValue05; }
+		public void setStringValue06(String stringValue06) { this.stringValue06 = stringValue06; }
+		public void setStringValue07(String stringValue07) { this.stringValue07 = stringValue07; }
+		public void setStringValue08(String stringValue08) { this.stringValue08 = stringValue08; }
+		public void setStringValue09(String stringValue09) { this.stringValue09 = stringValue09; }
+		public void setStringValue10(String stringValue10) { this.stringValue10 = stringValue10; }
+
+
 		public Boolean getNotCompleted() {
 			return notCompleted;
 		}
@@ -401,6 +445,38 @@ abstract class V2Base extends StandardJaxrsAction {
 		}else{
 			p = cb.equal(root.get(Review_.person), effectivePerson.getDistinguishedName());
 		}
+
+		if (StringUtils.isNotBlank(wi.getStringValue01())){
+			p = cb.and(p,cb.equal(root.get(Review_.stringValue01), wi.getStringValue01()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue02())){
+			p = cb.and(p,cb.equal(root.get(Review_.stringValue02), wi.getStringValue02()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue03())){
+			p = cb.and(p,cb.equal(root.get(Review_.stringValue03), wi.getStringValue03()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue04())){
+			p = cb.and(p,cb.equal(root.get(Review_.stringValue04), wi.getStringValue04()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue05())){
+			p = cb.and(p,cb.equal(root.get(Review_.stringValue05), wi.getStringValue05()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue06())){
+			p = cb.and(p,cb.equal(root.get(Review_.stringValue06), wi.getStringValue06()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue07())){
+			p = cb.and(p,cb.equal(root.get(Review_.stringValue07), wi.getStringValue07()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue08())){
+			p = cb.and(p,cb.equal(root.get(Review_.stringValue08), wi.getStringValue08()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue09())){
+			p = cb.and(p,cb.equal(root.get(Review_.stringValue09), wi.getStringValue09()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue10())){
+			p = cb.and(p,cb.equal(root.get(Review_.stringValue10), wi.getStringValue10()));
+		}
+
 		if (ListTools.isNotEmpty(wi.getApplicationList())) {
 			p = cb.and(p, root.get(Review_.application).in(wi.getApplicationList()));
 		}

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionManageListFilterPaging.java

@@ -64,37 +64,37 @@ class ActionManageListFilterPaging extends BaseAction {
 			p = cb.and(p, root.get(Task_.application).in(wi.getApplicationList()));
 		}
 		if (StringUtils.isNotBlank(wi.getPerson())){
-			p = cb.and(p,cb.equal(root.get(Task_.person), wi.person));
+			p = cb.and(p,cb.equal(root.get(Task_.person), wi.getPerson()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue01())){
-			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.stringValue01));
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.getStringValue01()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue02())){
-			p = cb.and(p,cb.equal(root.get(Task_.stringValue02), wi.stringValue02));
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue02), wi.getStringValue02()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue03())){
-			p = cb.and(p,cb.equal(root.get(Task_.stringValue03), wi.stringValue03));
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue03), wi.getStringValue03()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue04())){
-			p = cb.and(p,cb.equal(root.get(Task_.stringValue04), wi.stringValue04));
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue04), wi.getStringValue04()));
 		}
-		if (StringUtils.isNotBlank(wi.getStringValue01())){
-			p = cb.and(p,cb.equal(root.get(Task_.stringValue05), wi.stringValue05));
+		if (StringUtils.isNotBlank(wi.getStringValue05())){
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue05), wi.getStringValue05()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue06())){
-			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.stringValue06));
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue06), wi.getStringValue06()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue07())){
-			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.stringValue07));
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue07), wi.getStringValue07()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue08())){
-			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.stringValue08));
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue08), wi.getStringValue08()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue09())){
-			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.stringValue09));
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue09), wi.getStringValue09()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue10())){
-			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.stringValue10));
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue10), wi.getStringValue10()));
 		}
 
 		if (ListTools.isNotEmpty(wi.getProcessList())) {
@@ -160,37 +160,37 @@ class ActionManageListFilterPaging extends BaseAction {
 			p = cb.and(p, root.get(Task_.application).in(wi.getApplicationList()));
 		}
 		if (StringUtils.isNotBlank(wi.getPerson())){
-			p = cb.and(p,cb.equal(root.get(Task_.person), wi.person));
+			p = cb.and(p,cb.equal(root.get(Task_.person), wi.getPerson()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue01())){
-			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.stringValue01));
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.getStringValue01()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue02())){
-			p = cb.and(p,cb.equal(root.get(Task_.stringValue02), wi.stringValue02));
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue02), wi.getStringValue02()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue03())){
-			p = cb.and(p,cb.equal(root.get(Task_.stringValue03), wi.stringValue03));
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue03), wi.getStringValue03()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue04())){
-			p = cb.and(p,cb.equal(root.get(Task_.stringValue04), wi.stringValue04));
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue04), wi.getStringValue04()));
 		}
-		if (StringUtils.isNotBlank(wi.getStringValue01())){
-			p = cb.and(p,cb.equal(root.get(Task_.stringValue05), wi.stringValue05));
+		if (StringUtils.isNotBlank(wi.getStringValue05())){
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue05), wi.getStringValue05()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue06())){
-			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.stringValue06));
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue06), wi.getStringValue06()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue07())){
-			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.stringValue07));
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue07), wi.getStringValue07()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue08())){
-			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.stringValue08));
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue08), wi.getStringValue08()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue09())){
-			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.stringValue09));
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue09), wi.getStringValue09()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue10())){
-			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.stringValue10));
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue10), wi.getStringValue10()));
 		}
 
 		if (ListTools.isNotEmpty(wi.getProcessList())) {
@@ -323,7 +323,19 @@ class ActionManageListFilterPaging extends BaseAction {
 		public String getStringValue08() { return stringValue08; }
 		public String getStringValue09() { return stringValue09; }
 		public String getStringValue10() { return stringValue10; }
-
+		public void setStringValue01(String stringValue01) { this.stringValue01 = stringValue01; }
+		public void setStringValue02(String stringValue02) { this.stringValue02 = stringValue02; }
+		public void setStringValue03(String stringValue03) { this.stringValue03 = stringValue03; }
+		public void setStringValue04(String stringValue04) { this.stringValue04 = stringValue04; }
+		public void setStringValue05(String stringValue05) { this.stringValue05 = stringValue05; }
+		public void setStringValue06(String stringValue06) { this.stringValue06 = stringValue06; }
+		public void setStringValue07(String stringValue07) { this.stringValue07 = stringValue07; }
+		public void setStringValue08(String stringValue08) { this.stringValue08 = stringValue08; }
+		public void setStringValue09(String stringValue09) { this.stringValue09 = stringValue09; }
+		public void setStringValue10(String stringValue10) { this.stringValue10 = stringValue10; }
+		public void setPerson(String person) {
+			this.person = person;
+		}
 
 		public void setApplicationList(List<String> applicationList) {
 			this.applicationList = applicationList;

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/taskcompleted/ActionManageListFilterPaging.java

@@ -63,52 +63,37 @@ class ActionManageListFilterPaging extends BaseAction {
 			p = cb.and(p, root.get(TaskCompleted_.application).in(wi.getApplicationList()));
 		}
 		if (StringUtils.isNotBlank(wi.getPerson())){
-			p = cb.and(p,cb.equal(root.get(TaskCompleted_.person), wi.person));
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.person), wi.getPerson()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue01())){
-			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.stringValue01));
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.getStringValue01()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue02())){
-			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue02), wi.stringValue02));
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue02), wi.getStringValue02()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue03())){
-			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue03), wi.stringValue03));
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue03), wi.getStringValue03()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue04())){
-			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue04), wi.stringValue04));
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue04), wi.getStringValue04()));
 		}
-		if (StringUtils.isNotBlank(wi.getStringValue01())){
-			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue05), wi.stringValue05));
+		if (StringUtils.isNotBlank(wi.getStringValue05())){
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue05), wi.getStringValue05()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue06())){
-			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.stringValue06));
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue06), wi.getStringValue06()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue07())){
-			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.stringValue07));
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue07), wi.getStringValue07()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue08())){
-			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.stringValue08));
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue08), wi.getStringValue08()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue09())){
-			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.stringValue09));
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue09), wi.getStringValue09()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue10())){
-			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.stringValue10));
-		}
-		if (ListTools.isNotEmpty(wi.getProcessList())) {
-			p = cb.and(p, root.get(TaskCompleted_.process).in(wi.getProcessList()));
-		}
-		if(DateTools.isDateTimeOrDate(wi.getStartTime())){
-			p = cb.and(p, cb.greaterThan(root.get(TaskCompleted_.startTime), DateTools.parse(wi.getStartTime())));
-		}
-		if(DateTools.isDateTimeOrDate(wi.getEndTime())){
-			p = cb.and(p, cb.lessThan(root.get(TaskCompleted_.startTime), DateTools.parse(wi.getEndTime())));
-		}
-		if (ListTools.isNotEmpty(person_ids)) {
-			p = cb.and(p, root.get(TaskCompleted_.person).in(person_ids));
-		}
-		if (ListTools.isNotEmpty(wi.getCreatorUnitList())) {
-			p = cb.and(p, root.get(TaskCompleted_.creatorUnit).in(wi.getCreatorUnitList()));
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue10), wi.getStringValue10()));
 		}
 		if (ListTools.isNotEmpty(wi.getWorkList())) {
 			p = cb.and(p, root.get(TaskCompleted_.work).in(wi.getWorkList()));
@@ -142,37 +127,37 @@ class ActionManageListFilterPaging extends BaseAction {
 			p = cb.and(p, root.get(TaskCompleted_.application).in(wi.getApplicationList()));
 		}
 		if (StringUtils.isNotBlank(wi.getPerson())){
-			p = cb.and(p,cb.equal(root.get(TaskCompleted_.person), wi.person));
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.person), wi.getPerson()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue01())){
-			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.stringValue01));
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.getStringValue01()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue02())){
-			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue02), wi.stringValue02));
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue02), wi.getStringValue02()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue03())){
-			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue03), wi.stringValue03));
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue03), wi.getStringValue03()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue04())){
-			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue04), wi.stringValue04));
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue04), wi.getStringValue04()));
 		}
-		if (StringUtils.isNotBlank(wi.getStringValue01())){
-			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue05), wi.stringValue05));
+		if (StringUtils.isNotBlank(wi.getStringValue05())){
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue05), wi.getStringValue05()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue06())){
-			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.stringValue06));
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue06), wi.getStringValue06()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue07())){
-			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.stringValue07));
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue07), wi.getStringValue07()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue08())){
-			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.stringValue08));
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue08), wi.getStringValue08()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue09())){
-			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.stringValue09));
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue09), wi.getStringValue09()));
 		}
 		if (StringUtils.isNotBlank(wi.getStringValue10())){
-			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.stringValue10));
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue10), wi.getStringValue10()));
 		}
 		if (ListTools.isNotEmpty(wi.getProcessList())) {
 			p = cb.and(p, root.get(TaskCompleted_.process).in(wi.getProcessList()));
@@ -282,7 +267,19 @@ class ActionManageListFilterPaging extends BaseAction {
 		public String getStringValue08() { return stringValue08; }
 		public String getStringValue09() { return stringValue09; }
 		public String getStringValue10() { return stringValue10; }
-
+		public void setStringValue01(String stringValue01) { this.stringValue01 = stringValue01; }
+		public void setStringValue02(String stringValue02) { this.stringValue02 = stringValue02; }
+		public void setStringValue03(String stringValue03) { this.stringValue03 = stringValue03; }
+		public void setStringValue04(String stringValue04) { this.stringValue04 = stringValue04; }
+		public void setStringValue05(String stringValue05) { this.stringValue05 = stringValue05; }
+		public void setStringValue06(String stringValue06) { this.stringValue06 = stringValue06; }
+		public void setStringValue07(String stringValue07) { this.stringValue07 = stringValue07; }
+		public void setStringValue08(String stringValue08) { this.stringValue08 = stringValue08; }
+		public void setStringValue09(String stringValue09) { this.stringValue09 = stringValue09; }
+		public void setStringValue10(String stringValue10) { this.stringValue10 = stringValue10; }
+		public void setPerson(String person) {
+			this.person = person;
+		}
 		public void setApplicationList(List<String> applicationList) {
 			this.applicationList = applicationList;
 		}

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionManageListFilterPaging.java

@@ -16,6 +16,7 @@ import com.x.base.core.project.tools.ListTools;
 import com.x.base.core.project.tools.StringTools;
 import com.x.processplatform.assemble.surface.Business;
 import com.x.processplatform.core.entity.content.*;
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.persistence.EntityManager;
@@ -53,7 +54,7 @@ class ActionManageListFilterPaging extends BaseAction {
 	}
 
 	private List<Work> list(EffectivePerson effectivePerson, Business business, Integer adjustPage,
-			Integer adjustPageSize, Wi wi) throws Exception {
+							Integer adjustPageSize, Wi wi) throws Exception {
 		EntityManager em = business.entityManagerContainer().get(Work.class);
 		List<String> person_ids = business.organization().person().list(wi.getCredentialList());
 		CriteriaBuilder cb = em.getCriteriaBuilder();
@@ -63,6 +64,44 @@ class ActionManageListFilterPaging extends BaseAction {
 		if (ListTools.isNotEmpty(wi.getApplicationList())) {
 			p = cb.and(p, root.get(Work_.application).in(wi.getApplicationList()));
 		}
+
+		if(null != wi.getWorkThroughManual()){
+			p = cb.and(p, cb.equal(root.get(Work_.workThroughManual), wi.getWorkThroughManual()));
+		}
+		if(StringUtils.isNotBlank(wi.getWorkCreateType())){
+			p = cb.and(p, cb.equal(root.get(Work_.workCreateType), wi.getWorkCreateType()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue01())){
+			p = cb.and(p,cb.equal(root.get(Work_.stringValue01), wi.getStringValue01()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue02())){
+			p = cb.and(p,cb.equal(root.get(Work_.stringValue02), wi.getStringValue02()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue03())){
+			p = cb.and(p,cb.equal(root.get(Work_.stringValue03), wi.getStringValue03()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue04())){
+			p = cb.and(p,cb.equal(root.get(Work_.stringValue04), wi.getStringValue04()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue05())){
+			p = cb.and(p,cb.equal(root.get(Work_.stringValue05), wi.getStringValue05()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue06())){
+			p = cb.and(p,cb.equal(root.get(Work_.stringValue06), wi.getStringValue06()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue07())){
+			p = cb.and(p,cb.equal(root.get(Work_.stringValue07), wi.getStringValue07()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue08())){
+			p = cb.and(p,cb.equal(root.get(Work_.stringValue08), wi.getStringValue08()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue09())){
+			p = cb.and(p,cb.equal(root.get(Work_.stringValue09), wi.getStringValue09()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue10())){
+			p = cb.and(p,cb.equal(root.get(Work_.stringValue10), wi.getStringValue10()));
+		}
+
 		if (ListTools.isNotEmpty(wi.getProcessList())) {
 			p = cb.and(p, root.get(Work_.process).in(wi.getProcessList()));
 		}
@@ -109,9 +148,53 @@ class ActionManageListFilterPaging extends BaseAction {
 		if (ListTools.isNotEmpty(wi.getApplicationList())) {
 			p = cb.and(p, root.get(Work_.application).in(wi.getApplicationList()));
 		}
+
+		if(null != wi.getWorkThroughManual()){
+			p = cb.and(p, cb.equal(root.get(Work_.workThroughManual), wi.getWorkThroughManual()));
+		}
+		if(StringUtils.isNotBlank(wi.getWorkCreateType())){
+			p = cb.and(p, cb.equal(root.get(Work_.workCreateType), wi.getWorkCreateType()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue01())){
+			p = cb.and(p,cb.equal(root.get(Work_.stringValue01), wi.getStringValue01()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue02())){
+			p = cb.and(p,cb.equal(root.get(Work_.stringValue02), wi.getStringValue02()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue03())){
+			p = cb.and(p,cb.equal(root.get(Work_.stringValue03), wi.getStringValue03()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue04())){
+			p = cb.and(p,cb.equal(root.get(Work_.stringValue04), wi.getStringValue04()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue05())){
+			p = cb.and(p,cb.equal(root.get(Work_.stringValue05), wi.getStringValue05()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue06())){
+			p = cb.and(p,cb.equal(root.get(Work_.stringValue06), wi.getStringValue06()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue07())){
+			p = cb.and(p,cb.equal(root.get(Work_.stringValue07), wi.getStringValue07()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue08())){
+			p = cb.and(p,cb.equal(root.get(Work_.stringValue08), wi.getStringValue08()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue09())){
+			p = cb.and(p,cb.equal(root.get(Work_.stringValue09), wi.getStringValue09()));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue10())){
+			p = cb.and(p,cb.equal(root.get(Work_.stringValue10), wi.getStringValue10()));
+		}
+
 		if (ListTools.isNotEmpty(wi.getProcessList())) {
 			p = cb.and(p, root.get(Work_.process).in(wi.getProcessList()));
 		}
+		if (ListTools.isNotEmpty(wi.getWorkList())) {
+			p = cb.and(p, root.get(Work_.id).in(wi.getWorkList()));
+		}
+		if (ListTools.isNotEmpty(wi.getJobList())) {
+			p = cb.and(p, root.get(Work_.job).in(wi.getJobList()));
+		}
 		if(DateTools.isDateTimeOrDate(wi.getStartTime())){
 			p = cb.and(p, cb.greaterThan(root.get(Work_.startTime), DateTools.parse(wi.getStartTime())));
 		}
@@ -124,15 +207,6 @@ class ActionManageListFilterPaging extends BaseAction {
 		if (ListTools.isNotEmpty(wi.getCreatorUnitList())) {
 			p = cb.and(p, root.get(Work_.creatorUnit).in(wi.getCreatorUnitList()));
 		}
-		if (ListTools.isNotEmpty(wi.getWorkList())) {
-			p = cb.and(p, root.get(Work_.id).in(wi.getWorkList()));
-		}
-		if (ListTools.isNotEmpty(wi.getJobList())) {
-			p = cb.and(p, root.get(Work_.job).in(wi.getJobList()));
-		}
-		if (ListTools.isNotEmpty(wi.getStartTimeMonthList())) {
-			p = cb.and(p, root.get(Work_.startTimeMonth).in(wi.getStartTimeMonthList()));
-		}
 		if (ListTools.isNotEmpty(wi.getActivityNameList())) {
 			p = cb.and(p, root.get(Work_.activityName).in(wi.getActivityNameList()));
 		}
@@ -143,6 +217,7 @@ class ActionManageListFilterPaging extends BaseAction {
 			String key = StringTools.escapeSqlLikeKey(wi.getKey());
 			p = cb.and(p,cb.like(root.get(Work_.title), "%" + key + "%", StringTools.SQL_ESCAPE_CHAR));
 		}
+
 		return em.createQuery(cq.select(cb.count(root)).where(p)).getSingleResult();
 	}
 
@@ -185,13 +260,63 @@ class ActionManageListFilterPaging extends BaseAction {
 		@FieldDescribe("关键字")
 		private String key;
 
+		@FieldDescribe("是否已经经过人工节点,")
+		private Boolean workThroughManual;
+		@FieldDescribe("工作创建类型,")
+		private String workCreateType;
+
+		@FieldDescribe("业务数据String值01")
+		private String stringValue01;
+		@FieldDescribe("业务数据String值02")
+		private String stringValue02;
+		@FieldDescribe("业务数据String值03")
+		private String stringValue03;
+		@FieldDescribe("业务数据String值04")
+		private String stringValue04;
+		@FieldDescribe("业务数据String值05")
+		private String stringValue05;
+		@FieldDescribe("业务数据String值06")
+		private String stringValue06;
+		@FieldDescribe("业务数据String值07")
+		private String stringValue07;
+		@FieldDescribe("业务数据String值08")
+		private String stringValue08;
+		@FieldDescribe("业务数据String值09")
+		private String stringValue09;
+		@FieldDescribe("业务数据String值10")
+		private String stringValue10;
 		public Wi() {
 		}
 
+		public Boolean getWorkThroughManual() { return workThroughManual; }
+		public String getWorkCreateType() {return workCreateType;}
+		public String getStringValue01() { return stringValue01; }
+		public String getStringValue02() { return stringValue02; }
+		public String getStringValue03() { return stringValue03; }
+		public String getStringValue04() { return stringValue04; }
+		public String getStringValue05() { return stringValue05; }
+		public String getStringValue06() { return stringValue06; }
+		public String getStringValue07() { return stringValue07; }
+		public String getStringValue08() { return stringValue08; }
+		public String getStringValue09() { return stringValue09; }
+		public String getStringValue10() { return stringValue10; }
+
+		public void setWorkThroughManual(Boolean workThroughManual) { this.workThroughManual = workThroughManual; }
+		public void setWorkCreateType(String workCreateType) { this.workCreateType = workCreateType; }
+		public void setStringValue01(String stringValue01) { this.stringValue01 = stringValue01; }
+		public void setStringValue02(String stringValue02) { this.stringValue02 = stringValue02; }
+		public void setStringValue03(String stringValue03) { this.stringValue03 = stringValue03; }
+		public void setStringValue04(String stringValue04) { this.stringValue04 = stringValue04; }
+		public void setStringValue05(String stringValue05) { this.stringValue05 = stringValue05; }
+		public void setStringValue06(String stringValue06) { this.stringValue06 = stringValue06; }
+		public void setStringValue07(String stringValue07) { this.stringValue07 = stringValue07; }
+		public void setStringValue08(String stringValue08) { this.stringValue08 = stringValue08; }
+		public void setStringValue09(String stringValue09) { this.stringValue09 = stringValue09; }
+		public void setStringValue10(String stringValue10) { this.stringValue10 = stringValue10; }
+
 		public List<String> getApplicationList() {
 			return applicationList;
 		}
-
 		public void setApplicationList(List<String> applicationList) {
 			this.applicationList = applicationList;
 		}

o2server/x_processplatform_assemble_surface/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2server/x_processplatform_service_processing/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/CommandJaxrsFilter.java

@@ -0,0 +1,13 @@
+package com.x.program.center.jaxrs;
+
+import javax.servlet.annotation.WebFilter;
+
+import com.x.base.core.project.jaxrs.CipherManagerJaxrsFilter;
+
+@WebFilter(urlPatterns = "/jaxrs/command/*", asyncSupported = true)
+public class CommandJaxrsFilter extends CipherManagerJaxrsFilter {
+
+	
+	
+	
+}

o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/command/ActionCommand.java

@@ -0,0 +1,127 @@
+package com.x.program.center.jaxrs.command;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.net.Socket;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import com.google.gson.JsonElement;
+import com.x.base.core.project.annotation.FieldDescribe;
+import com.x.base.core.project.config.Config;
+import com.x.base.core.project.gson.GsonPropertyObject;
+import com.x.base.core.project.gson.XGsonBuilder;
+import com.x.base.core.project.http.ActionResult;
+import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
+import com.x.base.core.project.tools.Crypto;
+
+/*执行服务器命令*/
+public class ActionCommand extends BaseAction {
+	
+	
+	private static Logger logger = LoggerFactory.getLogger(ActionCommand.class);
+	ActionResult<Wo> execute(EffectivePerson effectivePerson, JsonElement jsonElement) throws Exception {
+		ActionResult<Wo> result = new ActionResult<>();
+		Wi wi = this.convertToWrapIn(jsonElement, Wi.class);
+		String ctl = wi.getCtl();
+		String nodeName = wi.getNodeName() ;
+		int nodePort =Integer.parseInt(wi.getNodePort());
+		Wo wo = executeCommand(ctl, nodeName, nodePort);
+		result.setData(wo);
+		return result;
+	}
+	
+	synchronized private Wo executeCommand(String ctl , String nodeName ,int nodePort) throws Exception{
+		Wo wo = new Wo();
+		wo.setNode(nodeName);
+		wo.setStatus("success");
+		try (Socket socket = new Socket(nodeName, nodePort)) {
+			socket.setKeepAlive(true);
+			socket.setSoTimeout(5000);
+			try (DataOutputStream dos = new DataOutputStream(socket.getOutputStream());
+				 DataInputStream dis = new DataInputStream(socket.getInputStream())){
+				Map<String, Object> commandObject = new HashMap<>();
+				commandObject.put("command", "command:"+ ctl);
+				commandObject.put("credential", Crypto.rsaEncrypt("o2@", Config.publicKey()));
+				dos.writeUTF(XGsonBuilder.toJson(commandObject));
+				dos.flush();
+			}
+		} catch (Exception ex) {
+			wo.setStatus("fail");
+			logger.warn("socket dispatch executeCommand to {}:{} error={}", nodeName, nodePort, ex.getMessage());
+		}
+		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		wo.setTime(df.format(new Date()));
+		return wo;
+	}
+   
+	
+	
+	public static class Wi  extends GsonPropertyObject{
+		@FieldDescribe("命令名称")
+		private String ctl;
+		@FieldDescribe("服务器地址")
+		private String nodeName;
+		@FieldDescribe("服务端口")
+		private String nodePort;
+		
+		public String getCtl() {
+			return ctl;
+		}
+		public void setCtl(String ctl) {
+			this.ctl = ctl;
+		}
+		public String getNodeName() {
+			return nodeName;
+		}
+		public void setNodeName(String nodeName) {
+			this.nodeName = nodeName;
+		}
+		public String getNodePort() {
+			return nodePort;
+		}
+		public void setNodePort(String nodePort) {
+			this.nodePort = nodePort;
+		}
+	}
+	
+	public static class Wo extends GsonPropertyObject {
+		
+		@FieldDescribe("执行时间")
+		private String time;
+		@FieldDescribe("执行结束")
+		private String status;
+		@FieldDescribe("执行服务器")
+		private String node;
+
+		public String getTime() {
+			return time;
+		}
+		
+		public void setTime(String time) {
+			this.time = time;
+		}
+		
+		public String getNode() {
+			return node;
+		}
+
+		public void setNode(String node) {
+			this.node = node;
+		}
+
+		public String getStatus() {
+			return status;
+		}
+
+		public void setStatus(String status) {
+			this.status = status;
+		}
+	}
+	
+	
+
+}

o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/command/ActionGet.java

@@ -0,0 +1,72 @@
+package com.x.program.center.jaxrs.command;
+
+import java.util.ArrayList;
+import java.util.List;
+import com.x.base.core.project.config.Config;
+import com.x.base.core.project.config.Nodes;
+import com.x.base.core.project.exception.ExceptionEntityNotExist;
+import com.x.base.core.project.http.ActionResult;
+import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.config.Node;
+
+/*获取服器信息列表*/
+class ActionGet extends BaseAction {
+	ActionResult<Wo> execute(EffectivePerson effectivePerson, String id) throws Exception {
+		
+			ActionResult<Wo> result = new ActionResult<>();			
+			Nodes nodes = Config.nodes();
+			if (null == nodes) {
+				throw new ExceptionEntityNotExist(id, "Nodes");
+			}
+			List<NodeInfo> nodeInfoList = new ArrayList<>();
+			for(String key:nodes.keySet()){
+				NodeInfo  nodeInfo  = new NodeInfo();
+				nodeInfo.setNodeAddress(key);
+				nodeInfo.setNode(nodes.get(key));
+				nodeInfoList.add(nodeInfo);
+			}
+			
+			Wo wo = new Wo();
+			wo.setNodeList(nodeInfoList);
+			
+			result.setData(wo);
+			return result;
+	}
+
+	
+	
+public class NodeInfo{
+		private String nodeAddress;
+        private Node   node;
+       
+		public String getNodeAddress() {
+			return nodeAddress;
+		}
+
+		public void setNodeAddress(String nodeAddress) {
+			this.nodeAddress = nodeAddress;
+		}
+
+		public Node getNode() {
+			return node;
+		}
+
+		public void setNode(Node node) {
+			this.node = node;
+		}	
+}
+	
+public static class Wo {
+	
+		private List<NodeInfo> nodeList;
+		
+		public List<NodeInfo> getNodeList() {
+			return nodeList;
+		}
+		
+		public void setNodeList(List<NodeInfo> nodeList) {
+			this.nodeList = nodeList;
+		}
+	}
+	
+}

o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/command/ActionUploadFile.java

@@ -0,0 +1,155 @@
+package com.x.program.center.jaxrs.command;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.InputStream;
+import java.net.Socket;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import com.x.base.core.project.annotation.FieldDescribe;
+import com.x.base.core.project.config.Config;
+import com.x.base.core.project.config.Nodes;
+import com.x.base.core.project.gson.GsonPropertyObject;
+import com.x.base.core.project.gson.XGsonBuilder;
+import com.x.base.core.project.http.ActionResult;
+import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
+import com.x.base.core.project.tools.Crypto;
+
+
+public class ActionUploadFile  extends BaseAction {
+    private static Logger logger = LoggerFactory.getLogger(CommandAction.class);
+
+	ActionResult<Wo> execute(EffectivePerson effectivePerson, String ctl, String nodeName , String nodePort, InputStream fileInputStream, FormDataContentDisposition disposition) throws Exception {
+			ActionResult<Wo> result = new ActionResult<>();	
+			Wo wo  = null;
+			if(nodeName.equalsIgnoreCase("*")) {
+				Nodes nodes = Config.nodes();
+				for (String node : nodes.keySet()){
+					if(nodes.get(node).getApplication().getEnable() || nodes.get(node).getCenter().getEnable()){
+				      wo = executeCommand( ctl,  node ,  nodes.get(node).nodeAgentPort(),  fileInputStream, disposition);
+					}
+				}
+			}else {
+				
+			     wo = executeCommand( ctl,  nodeName ,  Integer.parseInt(nodePort),  fileInputStream, disposition);
+			}
+			result.setData(wo);
+			return result;
+	}
+
+	synchronized private Wo executeCommand(String ctl , String nodeName ,int nodePort,InputStream fileInputStream, FormDataContentDisposition disposition) throws Exception{
+		Wo wo = new Wo();
+		wo.setNode(nodeName);
+		wo.setStatus("success");
+		try (Socket socket = new Socket(nodeName, nodePort)) {
+			socket.setKeepAlive(true);
+			socket.setSoTimeout(5000);
+			DataOutputStream dos = null;
+			DataInputStream dis  = null;
+			try {
+				dos = new DataOutputStream(socket.getOutputStream());
+			    dis = new DataInputStream(socket.getInputStream());
+			    
+				Map<String, Object> commandObject = new HashMap<>();
+				commandObject.put("command", "redeploy:"+ ctl);
+				commandObject.put("credential", Crypto.rsaEncrypt("o2@", Config.publicKey()));
+				dos.writeUTF(XGsonBuilder.toJson(commandObject));
+				dos.flush();
+				
+				dos.writeUTF(disposition.getFileName());
+				dos.flush();
+				
+				logger.info("发送文件starting.......");
+				byte[] bytes = new byte[1024];
+				int length =0;
+				while((length = fileInputStream.read(bytes, 0, bytes.length)) != -1) {
+					dos.write(bytes, 0, length);
+					dos.flush();
+				}
+				logger.info("发送文件end.......");
+				
+			}finally {
+				dos.close();
+				dis.close();
+				fileInputStream.close();
+			}
+		} catch (Exception ex) {
+			wo.setStatus("fail");
+			//logger.warn("socket dispatch executeCommand to {}:{} error={}", nodeName, nodePort, ex.getMessage());
+		}
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		wo.setTime(df.format(new Date()));
+		return wo;
+	}
+	
+
+	public static class Wi  extends GsonPropertyObject{
+		private String ctl;
+		private String nodeName;
+		private String nodePort;
+		
+		public String getCtl() {
+			return ctl;
+		}
+		public void setCtl(String ctl) {
+			this.ctl = ctl;
+		}
+		public String getNodeName() {
+			return nodeName;
+		}
+		public void setNodeName(String nodeName) {
+			this.nodeName = nodeName;
+		}
+		public String getNodePort() {
+			return nodePort;
+		}
+		public void setNodePort(String nodePort) {
+			this.nodePort = nodePort;
+		}
+	}
+	
+	public static class Wo extends GsonPropertyObject {
+		
+		@FieldDescribe("执行时间")
+		private String time;
+		@FieldDescribe("执行结束")
+		private String status;
+		@FieldDescribe("执行服务器")
+		private String node;
+
+		public String getTime() {
+			return time;
+		}
+		
+		public void setTime(String time) {
+			this.time = time;
+		}
+		
+		public String getNode() {
+			return node;
+		}
+
+		public void setNode(String node) {
+			this.node = node;
+		}
+
+		public String getStatus() {
+			return status;
+		}
+
+		public void setStatus(String status) {
+			this.status = status;
+		}
+	}
+	
+}
+
+
+

o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/command/BaseAction.java

@@ -0,0 +1,44 @@
+package com.x.program.center.jaxrs.command;
+
+import com.x.base.core.project.cache.ApplicationCache;
+import com.x.base.core.project.gson.GsonPropertyObject;
+import com.x.base.core.project.jaxrs.StandardJaxrsAction;
+import net.sf.ehcache.Ehcache;
+
+abstract class BaseAction extends StandardJaxrsAction {
+
+    public static Ehcache cacheLog = ApplicationCache.instance().getCache(CacheLogObject.class);
+
+    public static class CacheLogObject extends GsonPropertyObject {
+
+        private String userToken;
+
+        private String node;
+
+        private long lastPoint;
+        public long getLastPoint() {
+            return lastPoint;
+        }
+
+        public void setLastPoint(long lastPoint) {
+            this.lastPoint = lastPoint;
+        }
+
+        public String getNode() {
+            return node;
+        }
+
+        public void setNode(String node) {
+            this.node = node;
+        }
+
+        public String getUserToken() {
+            return userToken;
+        }
+
+        public void setUserToken(String userToken) {
+            this.userToken = userToken;
+        }
+    }
+
+}

o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/command/CommandAction.java

@@ -0,0 +1,97 @@
+package com.x.program.center.jaxrs.command;
+
+import java.io.InputStream;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.container.AsyncResponse;
+import javax.ws.rs.container.Suspended;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataParam;
+
+import com.google.gson.JsonElement;
+import com.x.base.core.project.annotation.FieldDescribe;
+import com.x.base.core.project.annotation.JaxrsDescribe;
+import com.x.base.core.project.annotation.JaxrsMethodDescribe;
+import com.x.base.core.project.annotation.JaxrsParameterDescribe;
+import com.x.base.core.project.http.ActionResult;
+import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.http.HttpMediaType;
+import com.x.base.core.project.jaxrs.ResponseFactory;
+import com.x.base.core.project.jaxrs.StandardJaxrsAction;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
+
+@JaxrsDescribe("命令")
+@Path("command")
+public class CommandAction<Wo> extends StandardJaxrsAction {
+	private static Logger logger = LoggerFactory.getLogger(CommandAction.class);
+	
+	@JaxrsMethodDescribe(value = "执行服务器命令", action = ActionCommand.class)
+	@POST
+	@Path("execute")
+	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+	@Consumes(MediaType.APPLICATION_JSON)
+	public void executeCommand(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, JsonElement jsonElement) {		
+		EffectivePerson effectivePerson = this.effectivePerson(request);
+		ActionResult<ActionCommand.Wo> result = new ActionResult<>();
+		try {
+			result = new ActionCommand().execute(effectivePerson, jsonElement);
+		} catch (Exception e) {
+			e.printStackTrace();
+			result.error(e);
+		}
+		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+	}
+	
+	@JaxrsMethodDescribe(value = "获取所有服务器信息", action = ActionGet.class)
+	@GET
+	@Path("nodeInfoList")
+	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+	@Consumes(MediaType.APPLICATION_JSON)
+	public void getNodeInfoList(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) {
+		EffectivePerson effectivePerson = this.effectivePerson(request);
+		ActionResult<ActionGet.Wo> result = new ActionResult<>();
+		try {
+			result = (ActionResult<ActionGet.Wo>) new ActionGet().execute(effectivePerson, "");
+		} catch (Exception e) {
+			e.printStackTrace();
+			result.error(e);
+		}
+		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+	}
+	
+
+	@JaxrsMethodDescribe(value = "上传customJar,customWar,storeJar,storeWar包并自动部署", action = ActionUploadFile.class)
+	@POST
+	@Path("upload")
+	@Consumes(MediaType.MULTIPART_FORM_DATA)
+	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+	public void upload(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+			@JaxrsParameterDescribe("命令名称(customJar|customWar|storeJar|storeWar)") @FormDataParam("ctl") String ctl,
+			@JaxrsParameterDescribe("服务器地址(*代表多台应用服务器)") @FormDataParam("nodeName") String nodeName,
+			@JaxrsParameterDescribe("服务端口") @FormDataParam("nodePort") String nodePort,
+			@JaxrsParameterDescribe("附件名称") @FormDataParam(FILENAME_FIELD) String fileName,
+			@JaxrsParameterDescribe("文件内容") @FormDataParam(FILE_FIELD) InputStream fileInputStream,
+			@JaxrsParameterDescribe("上传文件") @FormDataParam(FILE_FIELD) final FormDataContentDisposition disposition) {
+		ActionResult<ActionUploadFile.Wo> result = new ActionResult<>();
+		EffectivePerson effectivePerson = this.effectivePerson(request);
+		try {
+			result = new ActionUploadFile().execute(effectivePerson, ctl, nodeName, nodePort, fileInputStream, disposition);
+		} catch (Exception e) {
+			logger.error(e, effectivePerson, request, null);
+			result.error(e);
+		}
+		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+	}
+
+}

o2server/x_program_center/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2server/x_query_assemble_designer/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2server/x_query_assemble_surface/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2server/x_query_service_processing/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2server/x_teamwork_assemble_control/src/main/webapp/jest/describe.js

@@ -679,7 +679,7 @@ Describe.createSampleCommon= function(m,className) {
 				});
 			}
 		 strSample += formData;
-		 strSample += "var action = this.Actions.get(\"" + root + "\");\n";
+		 strSample += "var action = this.Actions.load(\"" + root + "\");\n";
 		 //strSample += "action."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "       action."+ className + "."+m.name+ "(//平台封装好的方法\n";
 		 strSample += "      "+parameter  +",//uri的参数\n";

o2web/gulpfile.js

@@ -1,7 +1,8 @@
 var gulp = require('gulp'),
     //var deleted = require('gulp-deleted');
     del = require('del'),
-    uglify = require('gulp-tm-uglify'),
+    //uglify = require('gulp-tm-uglify'),
+    uglify = require('gulp-uglify-es').default,
     rename = require('gulp-rename'),
     changed = require('gulp-changed'),
     gulpif = require('gulp-if'),
@@ -11,6 +12,7 @@ var gulp = require('gulp'),
     JSFtp = require('jsftp'),
     gutil = require('gulp-util'),
     fs = require("fs");
+//let uglify = require('gulp-uglify-es').default;
 var through2 = require('through2');
 
 var assetRev = require('gulp-tm-asset-rev');

o2web/package.json

@@ -37,6 +37,7 @@
     "gulp-sftp-up4": "^0.1.8",
     "gulp-tm-asset-rev": "0.0.16",
     "gulp-tm-uglify": "3.0.1",
+    "gulp-uglify-es": "^2.0.0",
     "merge-stream": "^1.0.1",
     "readline-sync": "^1.4.10",
     "minimist": "^1.2.0"

o2web/source/index.html

@@ -3,7 +3,7 @@
 <head>
 	<meta charset="UTF-8"/>
 	<meta property="qc:admins" content="1556771456600414672564530" />
-	<meta http-equiv="refresh" content="0;url=/x_desktop/index.html"/>
+	<meta http-equiv="refresh" content="0;url=./x_desktop/index.html"/>
 </head>
 <body style="margin:0;font-size: 1.0em;font-family:Microsoft Yahei"></body>
 </html>

o2web/source/o2_core/init.js

@@ -46,7 +46,7 @@
         },
         "session": {
             "isDebugger": _debug,
-            "path": "/o2_core/o2"
+            "path": "../o2_core/o2"
         },
         "language": _lp,
         "splitStr": /\s*(?:,|;)\s*/
@@ -268,22 +268,22 @@
     //load js
     //use framework url
     var _frameworks = {
-        "o2.core": ["/o2_core/o2/o2.core.js"],
-        "o2.more": ["/o2_core/o2/o2.more.js"],
-        "ie_adapter": ["/o2_lib/o2/ie_adapter.js"],
-        "jquery": ["/o2_lib/jquery/jquery.min.js"],
-        "mootools": ["/o2_lib/mootools/mootools-1.6.0_all.js"],
-        "ckeditor": ["/o2_lib/htmleditor/ckeditor4114/ckeditor.js"],
-        "ckeditor5": ["/o2_lib/htmleditor/ckeditor5-12-1-0/ckeditor.js"],
-        "raphael": ["/o2_lib/raphael/raphael.js"],
-        "d3": ["/o2_lib/d3/d3.min.js"],
-        "ace": ["/o2_lib/ace/src-noconflict/ace.js","/o2_lib/ace/src-noconflict/ext-language_tools.js"],
-        "JSBeautifier": ["/o2_lib/JSBeautifier/beautify.js"],
-        "JSBeautifier_css": ["/o2_lib/JSBeautifier/beautify-css.js"],
-        "JSBeautifier_html": ["/o2_lib/JSBeautifier/beautify-html.js"],
-        "JSONTemplate": ["/o2_lib/mootools/plugin/Template.js"],
-        "kity": ["/o2_lib/kityminder/kity/kity.min.js"],
-        "kityminder": ["/o2_lib/kityminder/core/dist/kityminder.core.js"]
+        "o2.core": ["../o2_core/o2/o2.core.js"],
+        "o2.more": ["../o2_core/o2/o2.more.js"],
+        "ie_adapter": ["../o2_lib/o2/ie_adapter.js"],
+        "jquery": ["../o2_lib/jquery/jquery.min.js"],
+        "mootools": ["../o2_lib/mootools/mootools-1.6.0_all.js"],
+        "ckeditor": ["../o2_lib/htmleditor/ckeditor4114/ckeditor.js"],
+        "ckeditor5": ["../o2_lib/htmleditor/ckeditor5-12-1-0/ckeditor.js"],
+        "raphael": ["../o2_lib/raphael/raphael.js"],
+        "d3": ["../o2_lib/d3/d3.min.js"],
+        "ace": ["../o2_lib/ace/src-noconflict/ace.js","../o2_lib/ace/src-noconflict/ext-language_tools.js"],
+        "JSBeautifier": ["../o2_lib/JSBeautifier/beautify.js"],
+        "JSBeautifier_css": ["../o2_lib/JSBeautifier/beautify-css.js"],
+        "JSBeautifier_html": ["../o2_lib/JSBeautifier/beautify-html.js"],
+        "JSONTemplate": ["../o2_lib/mootools/plugin/Template.js"],
+        "kity": ["../o2_lib/kityminder/kity/kity.min.js"],
+        "kityminder": ["../o2_lib/kityminder/core/dist/kityminder.core.js"]
     };
     var _loaded = {};
     var _loadedCss = {};
@@ -827,7 +827,7 @@ o2.addReady(function(){
     MWF.require(modules, function(){
         if (layout.config) _getDistribute(function(){ _load(); });
     });
-    o2.getJSON("/x_desktop/res/config/config.json", function(config){
+    o2.getJSON("../x_desktop/res/config/config.json", function(config){
         layout.config = config;
         if (MWF.xDesktop.getServiceAddress) _getDistribute(function(){ _load(); });
     });

o2web/source/o2_core/o2.js

@@ -79,7 +79,7 @@
     };
     if (!this.o2.session) this.o2.session ={
         "isDebugger": _debug,
-        "path": "/o2_core/o2"
+        "path": "../o2_core/o2"
     };
     this.o2.language = _lp;
     this.o2.splitStr = /\s*(?:,|;)\s*/;
@@ -92,7 +92,7 @@
     //     },
     //     "session": {
     //         "isDebugger": _debug,
-    //         "path": "/o2_core/o2"
+    //         "path": "../o2_core/o2"
     //     },
     //     "language": _lp,
     //     "splitStr": /\s*(?:,|;)\s*/
@@ -272,6 +272,16 @@
                 }
             }
         }
+
+        if (window.layout && layout.config && layout.config.urlMapping){
+            for (var k in layout.config.urlMapping){
+                var regex = new RegExp(k);
+                if (regex.test(url)){
+                    return url.replace(regex, layout.config.urlMapping[k]);
+                }
+            }
+        }
+
         return url;
     };
     this.o2.filterUrl = _filterUrl;
@@ -337,29 +347,30 @@
     //load js
     //use framework url
     var _frameworks = {
-        "o2.core": ["/o2_core/o2/o2.core.js"],
-        "o2.more": ["/o2_core/o2/o2.more.js"],
-        "ie_adapter": ["/o2_core/o2/ie_adapter.js"],
-        "jquery": ["/o2_lib/jquery/jquery.min.js"],
-        "mootools": ["/o2_lib/mootools/mootools-1.6.0_all.js"],
-        "ckeditor": ["/o2_lib/htmleditor/ckeditor4114/ckeditor.js"],
-        "ckeditor5": ["/o2_lib/htmleditor/ckeditor5-12-1-0/ckeditor.js"],
-        "raphael": ["/o2_lib/raphael/raphael.js"],
-        "d3": ["/o2_lib/d3/d3.min.js"],
-        "ace": ["/o2_lib/ace/src-min-noconflict/ace.js","/o2_lib/ace/src-min-noconflict/ext-language_tools.js"],
-        "monaco": ["/o2_lib/vs/loader.js"],
-        "JSBeautifier": ["/o2_lib/JSBeautifier/beautify.js"],
-        "JSBeautifier_css": ["/o2_lib/JSBeautifier/beautify-css.js"],
-        "JSBeautifier_html": ["/o2_lib/JSBeautifier/beautify-html.js"],
-        "JSONTemplate": ["/o2_lib/mootools/plugin/Template.js"],
-        "kity": ["/o2_lib/kityminder/kity/kity.js"],
-        "kityminder": ["/o2_lib/kityminder/core/dist/kityminder.core.js"]
+        "o2.core": ["../o2_core/o2/o2.core.js"],
+        "o2.more": ["../o2_core/o2/o2.more.js"],
+        "ie_adapter": ["../o2_core/o2/ie_adapter.js"],
+        "jquery": ["../o2_lib/jquery/jquery.min.js"],
+        "mootools": ["../o2_lib/mootools/mootools-1.6.0_all.js"],
+        "ckeditor": ["../o2_lib/htmleditor/ckeditor4114/ckeditor.js"],
+        "ckeditor5": ["../o2_lib/htmleditor/ckeditor5-12-1-0/ckeditor.js"],
+        "raphael": ["../o2_lib/raphael/raphael.js"],
+        "d3": ["../o2_lib/d3/d3.min.js"],
+        "ace": ["../o2_lib/ace/src-min-noconflict/ace.js","../o2_lib/ace/src-min-noconflict/ext-language_tools.js"],
+        "monaco": ["../o2_lib/vs/loader.js"],
+        "JSBeautifier": ["../o2_lib/JSBeautifier/beautify.js"],
+        "JSBeautifier_css": ["../o2_lib/JSBeautifier/beautify-css.js"],
+        "JSBeautifier_html": ["../o2_lib/JSBeautifier/beautify-html.js"],
+        "JSONTemplate": ["../o2_lib/mootools/plugin/Template.js"],
+        "kity": ["../o2_lib/kityminder/kity/kity.js"],
+        "kityminder": ["../o2_lib/kityminder/core/dist/kityminder.core.js"]
     };
     var _loaded = {};
     var _loadedCss = {};
     var _loadedHtml = {};
     var _loadCssRunning = {};
     var _loadCssQueue = [];
+    var _loadingModules = {};
 
     var _loadSingle = function(module, callback, op){
         var url = module;
@@ -370,38 +381,51 @@
             if (callback)callback(); return;
         }
 
-        var head = (op.doc.head || op.doc.getElementsByTagName("head")[0] || op.doc.documentElement);
-        var s = op.doc.createElement('script');
-        head.appendChild(s);
-        s.id = uuid;
-        s.src = this.o2.filterUrl(url);
-
-        var _checkScriptLoaded = function(_, isAbort, err){
-            if (isAbort || !s.readyState || s.readyState === "loaded" || s.readyState === "complete") {
-                var scriptObj = {"module": module, "id": uuid, "script": s, "doc": op.doc};
-                if (!err) _loaded[key] = scriptObj;
-                _removeListener(s, 'readystatechange', _checkScriptLoaded);
-                _removeListener(s, 'load', _checkScriptLoaded);
-                _removeListener(s, 'error', _checkScriptErrorLoaded);
-                if (!isAbort || err){
-                    if (err){
-                        if (s) head.removeChild(s);
-                        if (callback)callback();
-                    }else{
-                        //head.removeChild(s);
-                        if (callback)callback(scriptObj);
+        if (_loadingModules[key]){
+            if (!_loadingModules[key].callbacks) _loadingModules[key].callbacks = [];
+            _loadingModules[key].callbacks.push(callback);
+        }else{
+            _loadingModules[key] = { callbacks: [callback] };
+
+            var head = (op.doc.head || op.doc.getElementsByTagName("head")[0] || op.doc.documentElement);
+            var s = op.doc.createElement('script');
+            head.appendChild(s);
+            s.id = uuid;
+            s.src = this.o2.filterUrl(url);
+
+            var _checkScriptLoaded = function(_, isAbort, err){
+                if (isAbort || !s.readyState || s.readyState === "loaded" || s.readyState === "complete") {
+                    var scriptObj = {"module": module, "id": uuid, "script": s, "doc": op.doc};
+                    if (!err) _loaded[key] = scriptObj;
+                    _removeListener(s, 'readystatechange', _checkScriptLoaded);
+                    _removeListener(s, 'load', _checkScriptLoaded);
+                    _removeListener(s, 'error', _checkScriptErrorLoaded);
+                    if (!isAbort || err){
+                        if (err){
+                            if (s) head.removeChild(s);
+                            while (_loadingModules[key].callbacks.length){
+                                (_loadingModules[key].callbacks.shift())();
+                            }
+                            //if (callback)callback();
+                        }else{
+                            //head.removeChild(s);
+                            while (_loadingModules[key].callbacks.length){
+                                (_loadingModules[key].callbacks.shift())(scriptObj);
+                            }
+                            //if (callback)callback(scriptObj);
+                        }
                     }
                 }
-            }
-        };
-        var _checkScriptErrorLoaded = function(e, err){
-            console.log("Error: load javascript module: "+module);
-            _checkScriptLoaded(e, true, "error");
-        };
+            };
+            var _checkScriptErrorLoaded = function(e, err){
+                console.log("Error: load javascript module: "+module);
+                _checkScriptLoaded(e, true, "error");
+            };
 
-        if ('onreadystatechange' in s) _addListener(s, 'readystatechange', _checkScriptLoaded);
-        _addListener(s, 'load', _checkScriptLoaded);
-        _addListener(s, 'error', _checkScriptErrorLoaded);
+            if ('onreadystatechange' in s) _addListener(s, 'readystatechange', _checkScriptLoaded);
+            _addListener(s, 'load', _checkScriptLoaded);
+            _addListener(s, 'error', _checkScriptErrorLoaded);
+        }
     };
 
     var _load = function(urls, options, callback){

o2web/source/o2_core/o2/o2.core.js

@@ -163,7 +163,7 @@
         //levels.shift();
         var root = "x_component_"+levels.join("_");
         var clazzName = clazz || "Main";
-        var path = "/"+root+"/"+clazzName.replace(/\./g, "/")+".js";
+        var path = "../"+root+"/"+clazzName.replace(/\./g, "/")+".js";
         var loadAsync = (async!==false);
         _requireJs(path, callback, loadAsync, compression);
     };
@@ -484,6 +484,15 @@
         }
         return arr;
     }
+    Date.implement({
+        "getFromServer": function(){
+            var d;
+            o2.Actions.get("x_program_center").echo(function(json){
+                d = Date.parse(json.data.serverTime);
+            }, null, false);
+            return d;
+        }
+    });
 
 })();
 o2.core = true;

o2web/source/o2_core/o2/widget/$AttachmentSelector/cms/css.wcss

@@ -45,7 +45,7 @@
     "width": "30px",
     "height": "30px",
     "float": "right",
-    "background": "url(/o2_core/o2/widget/$AttachmentSelector/cms/icon/close.png) no-repeat center center",
+    "background": "url(../o2_core/o2/widget/$AttachmentSelector/cms/icon/close.png) no-repeat center center",
     "cursor": "pointer"
   },
   "okButton" : {

o2web/source/o2_core/o2/widget/$Dialog/blue_flat_notice/css.wcss

@@ -82,7 +82,7 @@
 	"cursor" : "pointer"
   },
 	"closeAction": {
-	  "background" : "url(/x_component_process_FormDesigner/Module/Form/notice/icon/close2.png) no-repeat center center",
+	  "background" : "url(../x_component_process_FormDesigner/Module/Form/notice/icon/close2.png) no-repeat center center",
 	  "position" : "absolute",
 	  "top" : "5px",
 	  "right" : "5px",

o2web/source/o2_core/o2/widget/$Dialog/blue_flat_notice/dialog.html

@@ -1,5 +1,5 @@
 <div style="background: #F7FFF0; padding: 10px 50px 10px 20px; border: 1px solid #7ACC29;  min-width: 160px; max-width: 1300px; box-shadow: none;">
-    <div style="overflow:hidden;background: url('/x_component_process_FormDesigner/Module/Form/notice/icon/ok.png') no-repeat 25px 25px; height: 38px; color: rgb(18, 23, 31); padding-top: 20px; padding-left: 40px; font-size: 18px; font-weight: normal;" class="MWF_dialod_title">
+    <div style="overflow:hidden;background: url('../x_component_process_FormDesigner/Module/Form/notice/icon/ok.png') no-repeat 25px 25px; height: 38px; color: rgb(18, 23, 31); padding-top: 20px; padding-left: 40px; font-size: 18px; font-weight: normal;" class="MWF_dialod_title">
         <div style="height: 38px; float:left; padding-left:25px; padding-top:5px;" class="MWF_dialod_title_text"></div>
         <div style="height: 38px; float:right;" class="MWF_dialod_title_action"></div>
     </div>

o2web/source/o2_core/o2/widget/$Paging/blue_round/css.wcss

@@ -54,7 +54,7 @@
         "background-color": "#ffffff",
         "float": "left",
         "margin-right": "10px",
-        "background": "url(/o2_core/o2/widget/$Paging/default/icon/left.png) no-repeat center center"
+        "background": "url(../o2_core/o2/widget/$Paging/default/icon/left.png) no-repeat center center"
     },
     "prePage_over" : {
         "background-color": "#f1f1f1"
@@ -70,7 +70,7 @@
         "background-color": "#ffffff",
         "float": "left",
         "margin-right": "10px",
-        "background": "url(/o2_core/o2/widget/$Paging/default/icon/right.png) no-repeat center center"
+        "background": "url(../o2_core/o2/widget/$Paging/default/icon/right.png) no-repeat center center"
     },
     "nextPage_over" : {
         "background-color": "#f1f1f1"

o2web/source/o2_core/o2/widget/$Paging/default/css.wcss

@@ -52,7 +52,7 @@
         "background-color": "#ffffff",
         "float": "left",
         "margin-right": "10px",
-        "background": "url(/o2_core/o2/widget/$Paging/default/icon/left.png) no-repeat center center"
+        "background": "url(../o2_core/o2/widget/$Paging/default/icon/left.png) no-repeat center center"
     },
     "prePage_over" : {
         "background-color": "#f1f1f1"
@@ -68,7 +68,7 @@
         "background-color": "#ffffff",
         "float": "left",
         "margin-right": "10px",
-        "background": "url(/o2_core/o2/widget/$Paging/default/icon/right.png) no-repeat center center"
+        "background": "url(../o2_core/o2/widget/$Paging/default/icon/right.png) no-repeat center center"
     },
     "nextPage_over" : {
         "background-color": "#f1f1f1"

o2web/source/o2_core/o2/widget/$Paging/forum/css.wcss

@@ -36,7 +36,7 @@
         "border" : "1px solid #f3f3f3",
         "margin" : "5px",
         "cursor" : "pointer",
-        "background": "url(/o2_core/o2/widget/$Paging/forum/icon/left.png) no-repeat center center",
+        "background": "url(../o2_core/o2/widget/$Paging/forum/icon/left.png) no-repeat center center",
         "background-color" : "#f3f3f3"
     },
     "prePage_over" : {
@@ -55,7 +55,7 @@
         "margin" : "5px",
         "cursor" : "pointer",
         "color" : "#333",
-        "background": "url(/o2_core/o2/widget/$Paging/forum/icon/right.png) no-repeat center center",
+        "background": "url(../o2_core/o2/widget/$Paging/forum/icon/right.png) no-repeat center center",
         "background-color" : "#f3f3f3"
     },
     "nextPage_over" : {

o2web/source/o2_core/o2/widget/$Paging/red/css.wcss

@@ -52,7 +52,7 @@
         "background-color": "#ffffff",
         "float": "left",
         "margin-right": "10px",
-        "background": "url(/o2_core/o2/widget/$Paging/default/icon/left.png) no-repeat center center"
+        "background": "url(../o2_core/o2/widget/$Paging/default/icon/left.png) no-repeat center center"
     },
     "prePage_over" : {
         "background-color": "#f1f1f1"
@@ -68,7 +68,7 @@
         "background-color": "#ffffff",
         "float": "left",
         "margin-right": "10px",
-        "background": "url(/o2_core/o2/widget/$Paging/default/icon/right.png) no-repeat center center"
+        "background": "url(../o2_core/o2/widget/$Paging/default/icon/right.png) no-repeat center center"
     },
     "nextPage_over" : {
         "background-color": "#f1f1f1"

o2web/source/o2_core/o2/widget/$Paging/red_round/css.wcss

@@ -54,7 +54,7 @@
         "background-color": "#ffffff",
         "float": "left",
         "margin-right": "10px",
-        "background": "url(/o2_core/o2/widget/$Paging/default/icon/left.png) no-repeat center center"
+        "background": "url(../o2_core/o2/widget/$Paging/default/icon/left.png) no-repeat center center"
     },
     "prePage_over" : {
         "background-color": "#f1f1f1"
@@ -70,7 +70,7 @@
         "background-color": "#ffffff",
         "float": "left",
         "margin-right": "10px",
-        "background": "url(/o2_core/o2/widget/$Paging/default/icon/right.png) no-repeat center center"
+        "background": "url(../o2_core/o2/widget/$Paging/default/icon/right.png) no-repeat center center"
     },
     "nextPage_over" : {
         "background-color": "#f1f1f1"

o2web/source/o2_core/o2/widget/$SimpleEditor/chatReceive/Dialog/dialog.html

@@ -10,9 +10,9 @@
     </div>
 	-->
 	<div style="height:30px; font-size:12px; line-height:30px;">
-		<span style="background: url(/o2_core/o2/widget/$SimpleEditor/default/Dialog/img/arrow.gif) no-repeat transparent;height: 8px;left: 20px;position: absolute;top: -8px;width: 15px;">
+		<span style="background: url(../o2_core/o2/widget/$SimpleEditor/default/Dialog/img/arrow.gif) no-repeat transparent;height: 8px;left: 20px;position: absolute;top: -8px;width: 15px;">
 		</span>
-		<span style="background: url(/o2_core/o2/widget/$SimpleEditor/default/Dialog/img/close.gif) no-repeat transparent;cursor: pointer;height: 16px;position: absolute;right: 6px;top:6px;width:16px;" class="MWF_dialod_close">
+		<span style="background: url(../o2_core/o2/widget/$SimpleEditor/default/Dialog/img/close.gif) no-repeat transparent;cursor: pointer;height: 16px;position: absolute;right: 6px;top:6px;width:16px;" class="MWF_dialod_close">
 		</span>
 	</div>
     <div style="border-left: 1px solid #cdcdcd; border-right: 1px solid #cdcdcd" class="MWF_dialod_content">

o2web/source/o2_core/o2/widget/$SimpleEditor/default/Dialog/dialog.html

@@ -10,9 +10,9 @@
     </div>
 	-->
 	<div style="height:30px; font-size:12px; line-height:30px;">
-		<span style="background: url(/o2_core/o2/widget/$SimpleEditor/default/Dialog/img/arrow.gif) no-repeat transparent;height: 8px;left: 20px;position: absolute;top: -8px;width: 15px;">
+		<span style="background: url(../o2_core/o2/widget/$SimpleEditor/default/Dialog/img/arrow.gif) no-repeat transparent;height: 8px;left: 20px;position: absolute;top: -8px;width: 15px;">
 		</span>
-		<span style="background: url(/o2_core/o2/widget/$SimpleEditor/default/Dialog/img/close.gif) no-repeat transparent;cursor: pointer;height: 16px;position: absolute;right: 6px;top:6px;width:16px;" class="MWF_dialod_close">
+		<span style="background: url(../o2_core/o2/widget/$SimpleEditor/default/Dialog/img/close.gif) no-repeat transparent;cursor: pointer;height: 16px;position: absolute;right: 6px;top:6px;width:16px;" class="MWF_dialod_close">
 		</span>
 	</div>
     <div style="border-left: 1px solid #cdcdcd; border-right: 1px solid #cdcdcd" class="MWF_dialod_content">

o2web/source/o2_core/o2/widget/$SimpleEditor/simple/Dialog/dialog.html

@@ -10,9 +10,9 @@
     </div>
 	-->
 	<div style="height:30px; font-size:12px; line-height:30px;">
-		<span style="background: url(/o2_core/o2/widget/$SimpleEditor/default/Dialog/img/arrow.gif) no-repeat transparent;height: 8px;left: 20px;position: absolute;top: -8px;width: 15px;">
+		<span style="background: url(../o2_core/o2/widget/$SimpleEditor/default/Dialog/img/arrow.gif) no-repeat transparent;height: 8px;left: 20px;position: absolute;top: -8px;width: 15px;">
 		</span>
-		<span style="background: url(/o2_core/o2/widget/$SimpleEditor/default/Dialog/img/close.gif) no-repeat transparent;cursor: pointer;height: 16px;position: absolute;right: 6px;top:6px;width:16px;" class="MWF_dialod_close">
+		<span style="background: url(../o2_core/o2/widget/$SimpleEditor/default/Dialog/img/close.gif) no-repeat transparent;cursor: pointer;height: 16px;position: absolute;right: 6px;top:6px;width:16px;" class="MWF_dialod_close">
 		</span>
 	</div>
     <div style="border-left: 1px solid #cdcdcd; border-right: 1px solid #cdcdcd" class="MWF_dialod_content">

o2web/source/o2_core/o2/widget/AttachmentController.js

@@ -29,7 +29,7 @@ o2.widget.AttachmentController = o2.widget.ATTER  = new Class({
 		this.cssPath = o2.session.path+"/widget/$AttachmentController/"+this.options.style+"/css.wcss";
 		this._loadCss();
 
-        var iconUrl = this.options.iconConfigUrl ? this.options.iconConfigUrl : "/x_component_File/$Main/icon.json";
+        var iconUrl = this.options.iconConfigUrl ? this.options.iconConfigUrl : "../x_component_File/$Main/icon.json";
         o2.getJSON(iconUrl, function(json){
             this.icons = json;
         }.bind(this), false, false);
@@ -941,7 +941,7 @@ o2.widget.AttachmentController = o2.widget.ATTER  = new Class({
                                 });
                                 formData.append('file', file);
                                 if(parameter.fileMd5){
-                                    o2.load("/o2_lib/CryptoJS/components/spark-md5-min.js", function(){
+                                    o2.load("../o2_lib/CryptoJS/components/spark-md5-min.js", function(){
 
                                         var fileReader = new FileReader(), box = document.getElementById('box');
                                         var blobSlice = File.prototype.mozSlice || File.prototype.webkitSlice || File.prototype.slice;
@@ -1247,7 +1247,7 @@ o2.widget.AttachmentController.Attachment = new Class({
         if (!this.data.extension) this.data.extension="unkonw";
 
         var iconName = this.controller.icons[this.data.extension.toLowerCase()] || this.controller.icons.unknow;
-        var iconFolderUrl = this.controller.options.iconFolderUrl ? this.controller.options.iconFolderUrl : "/x_component_File/$Main/default/file/";
+        var iconFolderUrl = this.controller.options.iconFolderUrl ? this.controller.options.iconFolderUrl : "../x_component_File/$Main/default/file/";
         return iconFolderUrl+iconName;
     },
 

o2web/source/o2_core/o2/widget/AttachmentSelector.js

@@ -42,7 +42,7 @@ o2.widget.AttachmentSelector = o2.widget.ATTSER  = new Class({
         //});
         //r.send();
 
-        o2.getJSON("/x_component_File/$Main/icon.json", function(json){
+        o2.getJSON("../x_component_File/$Main/icon.json", function(json){
             this.icons = json;
         }.bind(this), false, false);
 

o2web/source/o2_core/o2/widget/AudioRecorder.js

@@ -22,7 +22,7 @@ o2.widget.AudioRecorder = new Class({
             this.cssPath = o2.session.path+"/widget/$AudioRecorder/"+this.options.style+"/css.wcss";
             this._loadCss();
         }
-        COMMON.AjaxModule.loadDom("/o2_lib/adapter/adapter.js", function(){
+        COMMON.AjaxModule.loadDom("../o2_lib/adapter/adapter.js", function(){
             this.load();
         }.bind(this));
 	},

o2web/source/o2_core/o2/widget/Identity.js

@@ -79,9 +79,9 @@ o2.widget.Identity = new Class({
                     img = "<img width='50' height='50' border='0' src='data:image/png;base64,"+person.data.icon+"'></img>"
                 }else{
                     if (person.genderType=="f"){
-                        img = "<img width='50' height='50' border='0' src='"+"/x_component_Organization/$PersonExplorer/default/icon/female.png'></img>";
+                        img = "<img width='50' height='50' border='0' src='"+"../x_component_Organization/$PersonExplorer/default/icon/female.png'></img>";
                     }else{
-                        img = "<img width='50' height='50' border='0' src='"+"/x_component_Organization/$PersonExplorer/default/icon/man.png'></img>";
+                        img = "<img width='50' height='50' border='0' src='"+"../x_component_Organization/$PersonExplorer/default/icon/man.png'></img>";
                     }
                 }
 

o2web/source/o2_core/o2/widget/JavascriptEditor.js

@@ -75,7 +75,7 @@ o2.widget.JavascriptEditor = new Class({
     loadMonacoEditor: function(callback){
         if (!window.monaco){
             o2.load("monaco", {"sequence": true}, function(){
-                require.config({ paths: { "vs": "/o2_lib/vs" }});
+                require.config({ paths: { "vs": "../o2_lib/vs" }});
                 require(["vs/editor/editor.main"], function() {
                     if (callback) callback();
                 });

o2web/source/o2_core/o2/widget/MediaRecorder.js

@@ -57,7 +57,7 @@ o2.widget.MediaRecorder = o2.MediaRecorder = new Class({
 	//	return flag;
 	//},
 	loadResource : function( callback ){
-		var path = "/o2_lib/adapter/adapter.js";
+		var path = "../o2_lib/adapter/adapter.js";
 		COMMON.AjaxModule.load( path, function () {
 			if (callback)callback();
 		}.bind(this));

o2web/source/o2_core/o2/widget/Tablet.js

@@ -902,8 +902,8 @@ o2.widget.Tablet.ImageClipper = new Class({
     initialize: function(app, options){
         this.setOptions(options);
         this.app = app;
-        this.path = "/x_component_process_Xform/widget/$ImageClipper/";
-        this.cssPath = "/x_component_process_Xform/widget/$ImageClipper/"+this.options.style+"/css.wcss";
+        this.path = "../x_component_process_Xform/widget/$ImageClipper/";
+        this.cssPath = "../x_component_process_Xform/widget/$ImageClipper/"+this.options.style+"/css.wcss";
         this._loadCss();
     },
 

o2web/source/o2_core/o2/widget/monaco.js

@@ -7,12 +7,13 @@ o2.widget.monaco = {
             if (!this.isLoadding){
                 this.isLoadding = true;
                 o2.load("monaco", {"sequence": true}, function(){
-                    require.config({ paths: { "vs": "/o2_lib/vs" }});
+                    require.config({ paths: { "vs": "../o2_lib/vs" }});
                     require(["vs/editor/editor.main"], function() {
                         this.isLoadding = false;
                         while (this.callbackList.length){
                             this.callbackList.shift()();
                         }
+                        define.amd = false;
                         //if (callback) callback();
                     }.bind(this));
                 }.bind(this));

o2web/source/o2_core/o2/xAction/RestActions.js

@@ -22,7 +22,7 @@ MWF.xAction.RestActions = MWF.Actions = {
         var jaxrs = null;
         //var url = this.getHost(root)+"/"+root+"/describe/describe.json";
         var url = this.getHost(root)+"/"+root+"/describe/api.json";
-        //var url = "/o2_core/o2/xAction/temp.json";
+        //var url = "../o2_core/o2/xAction/temp.json";
         MWF.getJSON(url, function(json){jaxrs = json.jaxrs;}.bind(this), false, false, false);
         if (jaxrs){
             var actionObj = {};
@@ -147,10 +147,12 @@ MWF.xAction.RestActions = MWF.Actions = {
         var addressObj = layout.serviceAddressList[root];
         var address = "";
         if (addressObj){
+            //var mapping = layout.getAppUrlMapping();
             address = layout.config.app_protocol+"//"+addressObj.host+(addressObj.port==80 ? "" : ":"+addressObj.port);
         }else{
             var host = layout.desktop.centerServer.host || window.location.hostname;
             var port = layout.desktop.centerServer.port;
+            //var mapping = layout.getCenterUrlMapping();
             address = layout.config.app_protocol+"//"+host+(port=="80" ? "" : ":"+port);
         }
         return address;
@@ -296,13 +298,3 @@ MWF.xAction.RestActions.Action = new Class({
     }
 });
 
-Date.implement({
-    "getFromServer": function(){
-        var d;
-        o2.Actions.get("x_program_center").echo(function(json){
-            d = Date.parse(json.data.serverTime);
-        }, null, false);
-        return d;
-    }
-});
-

o2web/source/o2_core/o2/xDesktop/$Authentication/application/css.wcss

@@ -94,7 +94,7 @@
   "formNewNode": {
 	"width": "47px",
 	"height": "47px",
-	"background": "url(/x_component_Template/$Explorer/default/icon/new.png) no-repeat"
+	"background": "url(../x_component_Template/$Explorer/default/icon/new.png) no-repeat"
   },
   "formIconNode": {
 	"width": "47px",
@@ -321,7 +321,7 @@
 	"font-size": "16px",
 	"color":"#ff5c42",
 	"padding-left": "20px",
-	"background" : "url(/x_component_Template/$MForm/o2platform/icon/icon_warning.png) left center no-repeat"
+	"background" : "url(../x_component_Template/$MForm/o2platform/icon/icon_warning.png) left center no-repeat"
   },
   "noticeMessageNode" : {
 	"float" : "left",
@@ -329,7 +329,7 @@
 	"font-size": "16px",
 	"color":"#ff5c42",
 	"padding-left": "20px",
-	"background" : "url(/x_component_Template/$MForm/o2platform/icon/icon_right.png) left center no-repeat"
+	"background" : "url(../x_component_Template/$MForm/o2platform/icon/icon_right.png) left center no-repeat"
   },
   "title" : {
 	"height" : "30px",

o2web/source/o2_core/o2/xDesktop/$Authentication/default/css.wcss

@@ -87,7 +87,7 @@
   "formNewNode": {
 	"width": "47px",
 	"height": "47px",
-	"background": "url(/x_component_Template/$Explorer/default/icon/new.png) no-repeat"
+	"background": "url(../x_component_Template/$Explorer/default/icon/new.png) no-repeat"
   },
   "formIconNode": {
 	"width": "47px",
@@ -315,7 +315,7 @@
 	"font-size": "16px",
 	"color":"#ff5c42",
 	"padding-left": "20px",
-	"background" : "url(/x_component_Template/$MForm/o2platform/icon/icon_warning.png) left center no-repeat"
+	"background" : "url(../x_component_Template/$MForm/o2platform/icon/icon_warning.png) left center no-repeat"
   },
   "noticeMessageNode" : {
 	"float" : "left",
@@ -323,7 +323,7 @@
 	"font-size": "16px",
 	"color":"#ff5c42",
 	"padding-left": "20px",
-	"background" : "url(/x_component_Template/$MForm/o2platform/icon/icon_right.png) left center no-repeat"
+	"background" : "url(../x_component_Template/$MForm/o2platform/icon/icon_right.png) left center no-repeat"
   },
   "title" : {
 	"height" : "30px",

o2web/source/o2_core/o2/xDesktop/$Authentication/flat/css.wcss

@@ -89,7 +89,7 @@
   "formNewNode": {
 	"width": "47px",
 	"height": "47px",
-	"background": "url(/x_component_Template/$Explorer/default/icon/new.png) no-repeat"
+	"background": "url(../x_component_Template/$Explorer/default/icon/new.png) no-repeat"
   },
   "formIconNode": {
 	"width": "47px",
@@ -319,7 +319,7 @@
 	"font-size": "16px",
 	"color":"#ff5c42",
 	"padding-left": "20px",
-	"background" : "url(/x_component_Template/$MForm/o2platform/icon/icon_warning.png) left center no-repeat"
+	"background" : "url(../x_component_Template/$MForm/o2platform/icon/icon_warning.png) left center no-repeat"
   },
   "noticeMessageNode" : {
 	"float" : "left",
@@ -327,7 +327,7 @@
 	"font-size": "16px",
 	"color":"#ff5c42",
 	"padding-left": "20px",
-	"background" : "url(/x_component_Template/$MForm/o2platform/icon/icon_right.png) left center no-repeat"
+	"background" : "url(../x_component_Template/$MForm/o2platform/icon/icon_right.png) left center no-repeat"
   },
   "title" : {
 	"height" : "30px",

o2web/source/o2_core/o2/xDesktop/$Authentication/test/css.wcss

@@ -312,7 +312,7 @@
 	"font-size": "16px",
 	"color":"#ff5c42",
 	"padding-left": "20px",
-	"background" : "url(/x_component_Template/$MForm/o2platform/icon/icon_warning.png) left center no-repeat"
+	"background" : "url(../x_component_Template/$MForm/o2platform/icon/icon_warning.png) left center no-repeat"
   },
   "noticeMessageNode" : {
 	"float" : "left",
@@ -320,7 +320,7 @@
 	"font-size": "16px",
 	"color":"#ff5c42",
 	"padding-left": "20px",
-	"background" : "url(/x_component_Template/$MForm/o2platform/icon/icon_right.png) left center no-repeat"
+	"background" : "url(../x_component_Template/$MForm/o2platform/icon/icon_right.png) left center no-repeat"
   },
   "title" : {
 	"height" : "30px",

o2web/source/o2_core/o2/xDesktop/$Default/blue/style-skin.css

@@ -89,100 +89,100 @@
 }
 
 .logo_o2_40 {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/logo_o2_40.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/logo_o2_40.png) !important;
 }
 .icon_setting{
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_yyzk.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_yyzk.png) !important;
 }
 .icon_msg {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_xiaoxi.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_xiaoxi.png) !important;
 }
 .icon_msg_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_xiaoxi_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_xiaoxi_click.png) !important;
 }
 .icon_skin {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_pifu.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_pifu.png) !important;
 }
 .icon_skin_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_pifu_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_pifu_click.png) !important;
 }
 .icon_search {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_sousuo.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_sousuo.png) !important;
 }
 .icon_search_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_sousuo_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_sousuo_click.png) !important;
 }
 .icon_clear {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_clear.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_clear.png) !important;
 }
 .icon_loading {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/loading.gif) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/loading.gif) !important;
 }
 .logobg {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/pic_logo_sy.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/pic_logo_sy.png) !important;
 }
 .icon_startMenu_search {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_sousuo_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_sousuo_click.png) !important;
 }
 .icon_close {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_off_round_grey.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_off_round_grey.png) !important;
 }
 .icon_close_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_off_round_bai_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_off_round_bai_click.png) !important;
 }
 .icon_refresh {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/refresh.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/refresh.png) !important;
 }
 .icon_remove_badge {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_off_red.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_off_red.png) !important;
 }
 .icon_off_light {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_off_light.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_off_light.png) !important;
 }
 .icon_add_red {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_jia_red.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_jia_red.png) !important;
 }
 .icon_add {
-     background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_jia.png) !important;
+     background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_jia.png) !important;
  }
 .icon_more {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_jia.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_jia.png) !important;
 }
 .icon_notask {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_wugongzuo.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_wugongzuo.png) !important;
 }
 .icon_taskLoading {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/taskLoading.gif) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/taskLoading.gif) !important;
     background-size: 12px !important;
 }
 .icon_msg_close {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_msg_close.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_msg_close.png) !important;
 }
 .icon_up {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/taskbar_up.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/taskbar_up.png) !important;
 }
 .icon_up_gray {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/taskbar_up_gray.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/taskbar_up_gray.png) !important;
 }
 .icon_down {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/taskbar_down.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/taskbar_down.png) !important;
 }
 .icon_down_gray {
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/taskbar_down_gray.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/taskbar_down_gray.png) !important;
 }
 .icon_refresh{
-    background-image: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_shuaxin.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_shuaxin.png) !important;
 }
 
 .o2_process_AppExp_All_current {
     color: #4A90E2 !important;
     border-bottom: 2px solid #4A90E2 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/blue/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/blue/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_process_AppExp_categoryItem_current {
     color: #4A90E2 !important;
     border-bottom: 2px solid #4A90E2 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/blue/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/blue/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_process_AppExp_create {
     background-color: #4A90E2 !important;
@@ -194,12 +194,12 @@
 .o2_cms_column_all_current {
     color: #4A90E2 !important;
     border-bottom: 2px solid #4A90E2 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/blue/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/blue/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_cms_column_categoryItem_current {
     color: #4A90E2 !important;
     border-bottom: 2px solid #4A90E2 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/blue/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/blue/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_cms_column_createColumnNode {
     background-color: #4A90E2 !important;
@@ -211,12 +211,12 @@
 .o2_cms_index_all_current {
     color: #4A90E2 !important;
     border-bottom: 2px solid #4A90E2 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/blue/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/blue/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_cms_index_categoryItem_current {
     color: #4A90E2 !important;
     border-bottom: 2px solid #4A90E2 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/blue/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/blue/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_cms_index_categoryItem_text {
     color: #4A90E2 !important;
@@ -228,7 +228,7 @@
 }
 .o2_cms_index_createDocument_over {
     color: #4A90E2 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/blue/appicons/icon_createdocument_over.png) 5px center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/blue/appicons/icon_createdocument_over.png) 5px center no-repeat !important;
 }
 .current_homepage {
     background-color: #8E8E8E !important;
@@ -249,31 +249,31 @@
 
 /*个人设置---begin*/
 .formTableArea table .selectNode:hover {
-    background:url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_jia.png) center center no-repeat !important
+    background:url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_jia.png) center center no-repeat !important
 }
 .o2_profile_emPower_Add:hover .o2_profile_emPower_Btnimg {
-    background: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_jia.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_jia.png) no-repeat !important;
 }
 .o2_profile_emPower_WithDraw:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_chehui_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_chehui_click.png) no-repeat !important;
 }
 .o2_profile_empower_checkbox_checked{
-    background: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_ok2_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_ok2_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Edit .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_bianji2.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_bianji2.png) no-repeat !important;
 }
 .o2_profile_emPower_Edit:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_bianji2_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_bianji2_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Enable:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_qiyong_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_qiyong_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Disable:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_jinyong_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_jinyong_click.png) no-repeat !important;
 }
 .o2_profile_empower_radio_checked{
-    background: url(/o2_core/o2/xDesktop/$Default/blue/icons/icon_circle_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/blue/icons/icon_circle_click.png) no-repeat !important;
 }
 div:hover>.o2_profile_emPower_Btntext{
     color: #4A90E2 !important;

o2web/source/o2_core/o2/xDesktop/$Default/cyan/style-skin.css

@@ -47,100 +47,100 @@
 }
 
 .logo_o2_40 {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/logo_o2_40.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/logo_o2_40.png) !important;
 }
 .icon_setting{
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_yyzk.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_yyzk.png) !important;
 }
 .icon_msg {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_xiaoxi.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_xiaoxi.png) !important;
 }
 .icon_msg_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_xiaoxi_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_xiaoxi_click.png) !important;
 }
 .icon_skin {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_pifu.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_pifu.png) !important;
 }
 .icon_skin_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_pifu_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_pifu_click.png) !important;
 }
 .icon_search {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_sousuo.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_sousuo.png) !important;
 }
 .icon_search_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_sousuo_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_sousuo_click.png) !important;
 }
 .icon_clear {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_clear.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_clear.png) !important;
 }
 .icon_loading {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/loading.gif) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/loading.gif) !important;
 }
 .logobg {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/pic_logo_sy.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/pic_logo_sy.png) !important;
 }
 .icon_startMenu_search {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_sousuo_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_sousuo_click.png) !important;
 }
 .icon_close {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_off_round_grey.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_off_round_grey.png) !important;
 }
 .icon_close_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_off_round_bai_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_off_round_bai_click.png) !important;
 }
 .icon_refresh {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/refresh.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/refresh.png) !important;
 }
 .icon_remove_badge {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_off_red.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_off_red.png) !important;
 }
 .icon_off_light {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_off_light.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_off_light.png) !important;
 }
 .icon_add_red {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_jia_red.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_jia_red.png) !important;
 }
 .icon_add {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_jia.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_jia.png) !important;
 }
 .icon_more {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_jia.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_jia.png) !important;
 }
 .icon_notask {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_wugongzuo.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_wugongzuo.png) !important;
 }
 .icon_taskLoading {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/taskLoading.gif) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/taskLoading.gif) !important;
     background-size: 12px !important;
 }
 .icon_msg_close {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_msg_close.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_msg_close.png) !important;
 }
 .icon_up {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/taskbar_up.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/taskbar_up.png) !important;
 }
 .icon_up_gray {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/taskbar_up_gray.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/taskbar_up_gray.png) !important;
 }
 .icon_down {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/taskbar_down.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/taskbar_down.png) !important;
 }
 .icon_down_gray {
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/taskbar_down_gray.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/taskbar_down_gray.png) !important;
 }
 .icon_refresh{
-    background-image: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_shuaxin.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_shuaxin.png) !important;
 }
 
 .o2_process_AppExp_All_current {
     color: #30BFBF !important;
     border-bottom: 2px solid #30BFBF !important;
-    background: url(/o2_core/o2/xDesktop/$Default/cyan/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/cyan/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_process_AppExp_categoryItem_current {
     color: #30BFBF !important;
     border-bottom: 2px solid #30BFBF !important;
-    background: url(/o2_core/o2/xDesktop/$Default/cyan/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/cyan/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_process_AppExp_create {
     background-color: #30BFBF !important;
@@ -152,12 +152,12 @@
 .o2_cms_column_all_current {
     color: #30BFBF !important;
     border-bottom: 2px solid #30BFBF !important;
-    background: url(/o2_core/o2/xDesktop/$Default/cyan/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/cyan/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_cms_column_categoryItem_current {
     color: #30BFBF !important;
     border-bottom: 2px solid #30BFBF !important;
-    background: url(/o2_core/o2/xDesktop/$Default/cyan/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/cyan/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_cms_column_createColumnNode {
     background-color: #30BFBF !important;
@@ -169,12 +169,12 @@
 .o2_cms_index_all_current {
     color: #30BFBF !important;
     border-bottom: 2px solid #30BFBF !important;
-    background: url(/o2_core/o2/xDesktop/$Default/cyan/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/cyan/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_cms_index_categoryItem_current {
     color: #30BFBF !important;
     border-bottom: 2px solid #30BFBF !important;
-    background: url(/o2_core/o2/xDesktop/$Default/cyan/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/cyan/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_cms_index_categoryItem_text {
     color: #30BFBF !important;
@@ -186,7 +186,7 @@
 }
 .o2_cms_index_createDocument_over {
     color: #30BFBF !important;
-    background: url(/o2_core/o2/xDesktop/$Default/cyan/appicons/icon_createdocument_over.png) 5px center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/cyan/appicons/icon_createdocument_over.png) 5px center no-repeat !important;
 }
 .current_homepage {
     background-color: #8E8E8E !important;
@@ -204,31 +204,31 @@
 
 /*个人设置---begin*/
 .formTableArea table .selectNode:hover {
-    background:url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_jia.png) center center no-repeat !important
+    background:url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_jia.png) center center no-repeat !important
 }
 .o2_profile_emPower_Add:hover .o2_profile_emPower_Btnimg {
-    background: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_jia.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_jia.png) no-repeat !important;
 }
 .o2_profile_emPower_WithDraw:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_chehui_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_chehui_click.png) no-repeat !important;
 }
 .o2_profile_empower_checkbox_checked{
-    background: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_ok2_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_ok2_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Edit .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_bianji2.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_bianji2.png) no-repeat !important;
 }
 .o2_profile_emPower_Edit:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_bianji2_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_bianji2_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Enable:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_qiyong_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_qiyong_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Disable:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_jinyong_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_jinyong_click.png) no-repeat !important;
 }
 .o2_profile_empower_radio_checked{
-    background: url(/o2_core/o2/xDesktop/$Default/cyan/icons/icon_circle_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/cyan/icons/icon_circle_click.png) no-repeat !important;
 }
 div:hover>.o2_profile_emPower_Btntext{
     color: #30BFBF !important;

o2web/source/o2_core/o2/xDesktop/$Default/darkgreen/style-skin.css

@@ -46,100 +46,100 @@
 }
 
 .logo_o2_40 {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/logo_o2_40.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/logo_o2_40.png) !important;
 }
 .icon_setting{
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_yyzk.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_yyzk.png) !important;
 }
 .icon_msg {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_xiaoxi.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_xiaoxi.png) !important;
 }
 .icon_msg_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_xiaoxi_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_xiaoxi_click.png) !important;
 }
 .icon_skin {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_pifu.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_pifu.png) !important;
 }
 .icon_skin_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_pifu_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_pifu_click.png) !important;
 }
 .icon_search {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_sousuo.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_sousuo.png) !important;
 }
 .icon_search_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_sousuo_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_sousuo_click.png) !important;
 }
 .icon_clear {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_clear.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_clear.png) !important;
 }
 .icon_loading {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/loading.gif) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/loading.gif) !important;
 }
 .logobg {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/pic_logo_sy.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/pic_logo_sy.png) !important;
 }
 .icon_startMenu_search {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_sousuo_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_sousuo_click.png) !important;
 }
 .icon_close {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_off_round_grey.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_off_round_grey.png) !important;
 }
 .icon_close_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_off_round_bai_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_off_round_bai_click.png) !important;
 }
 .icon_refresh {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/refresh.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/refresh.png) !important;
 }
 .icon_remove_badge {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_off_red.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_off_red.png) !important;
 }
 .icon_off_light {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_off_light.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_off_light.png) !important;
 }
 .icon_add_red {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_jia_red.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_jia_red.png) !important;
 }
 .icon_add {
-     background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_jia.png) !important;
+     background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_jia.png) !important;
  }
 .icon_more {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_jia.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_jia.png) !important;
 }
 .icon_notask {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_wugongzuo.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_wugongzuo.png) !important;
 }
 .icon_taskLoading {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/taskLoading.gif) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/taskLoading.gif) !important;
     background-size: 12px !important;
 }
 .icon_msg_close {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_msg_close.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_msg_close.png) !important;
 }
 .icon_up {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/taskbar_up.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/taskbar_up.png) !important;
 }
 .icon_up_gray {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/taskbar_up_gray.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/taskbar_up_gray.png) !important;
 }
 .icon_down {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/taskbar_down.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/taskbar_down.png) !important;
 }
 .icon_down_gray {
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/taskbar_down_gray.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/taskbar_down_gray.png) !important;
 }
 .icon_refresh{
-    background-image: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_shuaxin.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_shuaxin.png) !important;
 }
 
 .o2_process_AppExp_All_current {
     color: #4D6240 !important;
     border-bottom: 2px solid #4D6240 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/darkgreen/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/darkgreen/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_process_AppExp_categoryItem_current {
     color: #4D6240 !important;
     border-bottom: 2px solid #4D6240 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/darkgreen/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/darkgreen/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_process_AppExp_create {
     background-color: #4D6240 !important;
@@ -151,12 +151,12 @@
 .o2_cms_column_all_current {
     color: #4D6240 !important;
     border-bottom: 2px solid #4D6240 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/darkgreen/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/darkgreen/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_cms_column_categoryItem_current {
     color: #4D6240 !important;
     border-bottom: 2px solid #4D6240 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/darkgreen/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/darkgreen/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_cms_column_createColumnNode {
     background-color: #4D6240 !important;
@@ -168,12 +168,12 @@
 .o2_cms_index_all_current {
     color: #4D6240 !important;
     border-bottom: 2px solid #4D6240 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/darkgreen/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/darkgreen/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_cms_index_categoryItem_current {
     color: #4D6240 !important;
     border-bottom: 2px solid #4D6240 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/darkgreen/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/darkgreen/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_cms_index_categoryItem_text {
     color: #4D6240 !important;
@@ -185,7 +185,7 @@
 }
 .o2_cms_index_createDocument_over {
     color: #4D6240 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/darkgreen/appicons/icon_createdocument_over.png) 5px center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/darkgreen/appicons/icon_createdocument_over.png) 5px center no-repeat !important;
 }
 .current_homepage {
     background-color: #8E8E8E !important;
@@ -203,31 +203,31 @@
 
 /*个人设置---begin*/
 .formTableArea table .selectNode:hover {
-    background:url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_jia.png) center center no-repeat !important
+    background:url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_jia.png) center center no-repeat !important
 }
 .o2_profile_emPower_Add:hover .o2_profile_emPower_Btnimg {
-    background: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_jia.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_jia.png) no-repeat !important;
 }
 .o2_profile_emPower_WithDraw:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_chehui_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_chehui_click.png) no-repeat !important;
 }
 .o2_profile_empower_checkbox_checked{
-    background: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_ok2_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_ok2_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Edit .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_bianji2.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_bianji2.png) no-repeat !important;
 }
 .o2_profile_emPower_Edit:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_bianji2_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_bianji2_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Enable:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_qiyong_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_qiyong_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Disable:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_jinyong_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_jinyong_click.png) no-repeat !important;
 }
 .o2_profile_empower_radio_checked{
-    background: url(/o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_circle_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/darkgreen/icons/icon_circle_click.png) no-repeat !important;
 }
 div:hover>.o2_profile_emPower_Btntext{
     color: #4D6240 !important;

o2web/source/o2_core/o2/xDesktop/$Default/gray/style-skin.css

@@ -45,99 +45,99 @@
     background-color: #F7F7F7 !important;
 }
 .logo_o2_40 {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/logo_o2_40.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/logo_o2_40.png) !important;
 }
 .icon_setting{
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_yyzk.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_yyzk.png) !important;
 }
 .icon_msg {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_xiaoxi.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_xiaoxi.png) !important;
 }
 .icon_msg_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_xiaoxi_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_xiaoxi_click.png) !important;
 }
 .icon_skin {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_pifu.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_pifu.png) !important;
 }
 .icon_skin_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_pifu_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_pifu_click.png) !important;
 }
 .icon_search {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_sousuo.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_sousuo.png) !important;
 }
 .icon_search_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_sousuo_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_sousuo_click.png) !important;
 }
 .icon_clear {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_clear.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_clear.png) !important;
 }
 .icon_loading {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/loading.gif) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/loading.gif) !important;
 }
 .logobg {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/pic_logo_sy.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/pic_logo_sy.png) !important;
 }
 .icon_startMenu_search {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_sousuo_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_sousuo_click.png) !important;
 }
 .icon_close {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_off_round_grey.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_off_round_grey.png) !important;
 }
 .icon_close_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_off_round_bai_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_off_round_bai_click.png) !important;
 }
 .icon_refresh {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/refresh.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/refresh.png) !important;
 }
 .icon_remove_badge {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_off_red.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_off_red.png) !important;
 }
 .icon_off_light {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_off_light.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_off_light.png) !important;
 }
 .icon_add_red {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_jia_red.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_jia_red.png) !important;
 }
 .icon_add {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_jia.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_jia.png) !important;
 }
 .icon_more {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_jia.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_jia.png) !important;
 }
 .icon_notask {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_wugongzuo.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_wugongzuo.png) !important;
 }
 .icon_taskLoading {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/taskLoading.gif) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/taskLoading.gif) !important;
     background-size: 12px !important;
 }
 .icon_msg_close {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_msg_close.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_msg_close.png) !important;
 }
 .icon_up {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/taskbar_up.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/taskbar_up.png) !important;
 }
 .icon_up_gray {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/taskbar_up_gray.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/taskbar_up_gray.png) !important;
 }
 .icon_down {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/taskbar_down.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/taskbar_down.png) !important;
 }
 .icon_down_gray {
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/taskbar_down_gray.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/taskbar_down_gray.png) !important;
 }
 .icon_refresh{
-    background-image: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_shuaxin.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_shuaxin.png) !important;
 }
 .o2_process_AppExp_All_current {
     color: #666666 !important;
     border-bottom: 2px solid #666666 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/gray/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/gray/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_process_AppExp_categoryItem_current {
     color: #666666 !important;
     border-bottom: 2px solid #666666 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/gray/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/gray/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_process_AppExp_create {
     background-color: #666666 !important;
@@ -149,12 +149,12 @@
 .o2_cms_column_all_current {
     color: #666666 !important;
     border-bottom: 2px solid #666666 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/gray/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/gray/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_cms_column_categoryItem_current {
     color: #666666 !important;
     border-bottom: 2px solid #666666 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/gray/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/gray/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_cms_column_createColumnNode {
     background-color: #666666 !important;
@@ -166,12 +166,12 @@
 .o2_cms_index_all_current {
     color: #666666 !important;
     border-bottom: 2px solid #666666 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/gray/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/gray/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_cms_index_categoryItem_current {
     color: #666666 !important;
     border-bottom: 2px solid #666666 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/gray/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/gray/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_cms_index_categoryItem_text {
     color: #666666 !important;
@@ -183,7 +183,7 @@
 }
 .o2_cms_index_createDocument_over {
     color: #666666 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/gray/appicons/icon_createdocument_over.png) 5px center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/gray/appicons/icon_createdocument_over.png) 5px center no-repeat !important;
 }
 .current_homepage {
     background-color: #8E8E8E !important;
@@ -201,31 +201,31 @@
 
 /*个人设置---begin*/
 .formTableArea table .selectNode:hover {
-    background:url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_jia.png) center center no-repeat !important
+    background:url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_jia.png) center center no-repeat !important
 }
 .o2_profile_emPower_Add:hover .o2_profile_emPower_Btnimg {
-    background: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_jia.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_jia.png) no-repeat !important;
 }
 .o2_profile_emPower_WithDraw:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_chehui_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_chehui_click.png) no-repeat !important;
 }
 .o2_profile_empower_checkbox_checked{
-    background: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_ok2_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_ok2_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Edit .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_bianji2.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_bianji2.png) no-repeat !important;
 }
 .o2_profile_emPower_Edit:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_bianji2_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_bianji2_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Enable:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_qiyong_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_qiyong_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Disable:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_jinyong_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_jinyong_click.png) no-repeat !important;
 }
 .o2_profile_empower_radio_checked{
-    background: url(/o2_core/o2/xDesktop/$Default/gray/icons/icon_circle_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/gray/icons/icon_circle_click.png) no-repeat !important;
 }
 div:hover>.o2_profile_emPower_Btntext{
     color: #666666 !important;

o2web/source/o2_core/o2/xDesktop/$Default/green/style-skin.css

@@ -45,99 +45,99 @@
     background-color: #F7FFF9 !important;
 }
 .logo_o2_40 {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/logo_o2_40.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/logo_o2_40.png) !important;
 }
 .icon_setting{
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_yyzk.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_yyzk.png) !important;
 }
 .icon_msg {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_xiaoxi.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_xiaoxi.png) !important;
 }
 .icon_msg_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_xiaoxi_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_xiaoxi_click.png) !important;
 }
 .icon_skin {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_pifu.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_pifu.png) !important;
 }
 .icon_skin_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_pifu_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_pifu_click.png) !important;
 }
 .icon_search {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_sousuo.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_sousuo.png) !important;
 }
 .icon_search_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_sousuo_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_sousuo_click.png) !important;
 }
 .icon_clear {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_clear.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_clear.png) !important;
 }
 .icon_loading {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/loading.gif) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/loading.gif) !important;
 }
 .logobg {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/pic_logo_sy.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/pic_logo_sy.png) !important;
 }
 .icon_startMenu_search {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_sousuo_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_sousuo_click.png) !important;
 }
 .icon_close {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_off_round_grey.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_off_round_grey.png) !important;
 }
 .icon_close_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_off_round_bai_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_off_round_bai_click.png) !important;
 }
 .icon_refresh {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/refresh.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/refresh.png) !important;
 }
 .icon_remove_badge {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_off_red.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_off_red.png) !important;
 }
 .icon_off_light {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_off_light.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_off_light.png) !important;
 }
 .icon_add_red {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_jia_red.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_jia_red.png) !important;
 }
 .icon_add {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_jia.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_jia.png) !important;
 }
 .icon_more {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_jia.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_jia.png) !important;
 }
 .icon_notask {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_wugongzuo.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_wugongzuo.png) !important;
 }
 .icon_taskLoading {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/taskLoading.gif) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/taskLoading.gif) !important;
     background-size: 12px !important;
 }
 .icon_msg_close {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_msg_close.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_msg_close.png) !important;
 }
 .icon_up {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/taskbar_up.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/taskbar_up.png) !important;
 }
 .icon_up_gray {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/taskbar_up_gray.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/taskbar_up_gray.png) !important;
 }
 .icon_down {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/taskbar_down.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/taskbar_down.png) !important;
 }
 .icon_down_gray {
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/taskbar_down_gray.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/taskbar_down_gray.png) !important;
 }
 .icon_refresh{
-    background-image: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_shuaxin.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_shuaxin.png) !important;
 }
 .o2_process_AppExp_All_current {
     color: #60BF78 !important;
     border-bottom: 2px solid #60BF78 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/green/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/green/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_process_AppExp_categoryItem_current {
     color: #60BF78 !important;
     border-bottom: 2px solid #60BF78 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/green/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/green/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_process_AppExp_create {
     background-color: #60BF78 !important;
@@ -149,12 +149,12 @@
 .o2_cms_column_all_current {
     color: #60BF78 !important;
     border-bottom: 2px solid #60BF78 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/green/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/green/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_cms_column_categoryItem_current {
     color: #60BF78 !important;
     border-bottom: 2px solid #60BF78 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/green/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/green/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_cms_column_createColumnNode {
     background-color: #60BF78 !important;
@@ -166,12 +166,12 @@
 .o2_cms_index_all_current {
     color: #60BF78 !important;
     border-bottom: 2px solid #60BF78 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/green/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/green/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_cms_index_categoryItem_current {
     color: #60BF78 !important;
     border-bottom: 2px solid #60BF78 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/green/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/green/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_cms_index_categoryItem_text {
     color: #60BF78 !important;
@@ -183,7 +183,7 @@
 }
 .o2_cms_index_createDocument_over {
     color: #60BF78 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/green/appicons/icon_createdocument_over.png) 5px center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/green/appicons/icon_createdocument_over.png) 5px center no-repeat !important;
 }
 .current_homepage {
     background-color: #8E8E8E !important;
@@ -201,31 +201,31 @@
 
 /*个人设置---begin*/
 .formTableArea table .selectNode:hover {
-    background:url(/o2_core/o2/xDesktop/$Default/green/icons/icon_jia.png) center center no-repeat !important
+    background:url(../o2_core/o2/xDesktop/$Default/green/icons/icon_jia.png) center center no-repeat !important
 }
 .o2_profile_emPower_Add:hover .o2_profile_emPower_Btnimg {
-    background: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_jia.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_jia.png) no-repeat !important;
 }
 .o2_profile_emPower_WithDraw:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_chehui_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_chehui_click.png) no-repeat !important;
 }
 .o2_profile_empower_checkbox_checked{
-    background: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_ok2_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_ok2_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Edit .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_bianji2.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_bianji2.png) no-repeat !important;
 }
 .o2_profile_emPower_Edit:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_bianji2_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_bianji2_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Enable:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_qiyong_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_qiyong_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Disable:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_jinyong_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_jinyong_click.png) no-repeat !important;
 }
 .o2_profile_empower_radio_checked{
-    background: url(/o2_core/o2/xDesktop/$Default/green/icons/icon_circle_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/green/icons/icon_circle_click.png) no-repeat !important;
 }
 div:hover>.o2_profile_emPower_Btntext{
     color: #60BF78 !important;

o2web/source/o2_core/o2/xDesktop/$Default/navy/style-skin.css

@@ -46,100 +46,100 @@
 }
 
 .logo_o2_40 {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/logo_o2_40.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/logo_o2_40.png) !important;
 }
 .icon_setting{
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_yyzk.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_yyzk.png) !important;
 }
 .icon_msg {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_xiaoxi.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_xiaoxi.png) !important;
 }
 .icon_msg_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_xiaoxi_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_xiaoxi_click.png) !important;
 }
 .icon_skin {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_pifu.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_pifu.png) !important;
 }
 .icon_skin_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_pifu_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_pifu_click.png) !important;
 }
 .icon_search {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_sousuo.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_sousuo.png) !important;
 }
 .icon_search_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_sousuo_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_sousuo_click.png) !important;
 }
 .icon_clear {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_clear.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_clear.png) !important;
 }
 .icon_loading {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/loading.gif) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/loading.gif) !important;
 }
 .logobg {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/pic_logo_sy.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/pic_logo_sy.png) !important;
 }
 .icon_startMenu_search {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_sousuo_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_sousuo_click.png) !important;
 }
 .icon_close {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_off_round_grey.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_off_round_grey.png) !important;
 }
 .icon_close_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_off_round_bai_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_off_round_bai_click.png) !important;
 }
 .icon_refresh {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/refresh.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/refresh.png) !important;
 }
 .icon_remove_badge {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_off_red.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_off_red.png) !important;
 }
 .icon_off_light {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_off_light.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_off_light.png) !important;
 }
 .icon_add_red {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_jia_red.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_jia_red.png) !important;
 }
 .icon_add {
-     background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_jia.png) !important;
+     background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_jia.png) !important;
  }
 .icon_more {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_jia.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_jia.png) !important;
 }
 .icon_notask {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_wugongzuo.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_wugongzuo.png) !important;
 }
 .icon_taskLoading {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/taskLoading.gif) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/taskLoading.gif) !important;
     background-size: 12px !important;
 }
 .icon_msg_close {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_msg_close.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_msg_close.png) !important;
 }
 .icon_up {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/taskbar_up.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/taskbar_up.png) !important;
 }
 .icon_up_gray {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/taskbar_up_gray.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/taskbar_up_gray.png) !important;
 }
 .icon_down {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/taskbar_down.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/taskbar_down.png) !important;
 }
 .icon_down_gray {
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/taskbar_down_gray.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/taskbar_down_gray.png) !important;
 }
 .icon_refresh{
-    background-image: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_shuaxin.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_shuaxin.png) !important;
 }
 
 .o2_process_AppExp_All_current {
     color: #323159 !important;
     border-bottom: 2px solid #323159 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/navy/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/navy/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_process_AppExp_categoryItem_current {
     color: #323159 !important;
     border-bottom: 2px solid #323159 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/navy/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/navy/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_process_AppExp_create {
     background-color: #323159 !important;
@@ -151,12 +151,12 @@
 .o2_cms_column_all_current {
     color: #323159 !important;
     border-bottom: 2px solid #323159 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/navy/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/navy/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_cms_column_categoryItem_current {
     color: #323159 !important;
     border-bottom: 2px solid #323159 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/navy/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/navy/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_cms_column_createColumnNode {
     background-color: #323159 !important;
@@ -168,12 +168,12 @@
 .o2_cms_index_all_current {
     color: #323159 !important;
     border-bottom: 2px solid #323159 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/navy/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/navy/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_cms_index_categoryItem_current {
     color: #323159 !important;
     border-bottom: 2px solid #323159 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/navy/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/navy/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_cms_index_categoryItem_text {
     color: #323159 !important;
@@ -185,7 +185,7 @@
 }
 .o2_cms_index_createDocument_over {
     color: #323159 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/navy/appicons/icon_createdocument_over.png) 5px center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/navy/appicons/icon_createdocument_over.png) 5px center no-repeat !important;
 }
 .current_homepage {
     background-color: #8E8E8E !important;
@@ -203,31 +203,31 @@
 
 /*个人设置---begin*/
 .formTableArea table .selectNode:hover {
-    background:url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_jia.png) center center no-repeat !important
+    background:url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_jia.png) center center no-repeat !important
 }
 .o2_profile_emPower_Add:hover .o2_profile_emPower_Btnimg {
-    background: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_jia.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_jia.png) no-repeat !important;
 }
 .o2_profile_emPower_WithDraw:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_chehui_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_chehui_click.png) no-repeat !important;
 }
 .o2_profile_empower_checkbox_checked{
-    background: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_ok2_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_ok2_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Edit .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_bianji2.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_bianji2.png) no-repeat !important;
 }
 .o2_profile_emPower_Edit:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_bianji2_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_bianji2_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Enable:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_qiyong_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_qiyong_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Disable:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_jinyong_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_jinyong_click.png) no-repeat !important;
 }
 .o2_profile_empower_radio_checked{
-    background: url(/o2_core/o2/xDesktop/$Default/navy/icons/icon_circle_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/navy/icons/icon_circle_click.png) no-repeat !important;
 }
 div:hover>.o2_profile_emPower_Btntext{
     color: #323159 !important;

o2web/source/o2_core/o2/xDesktop/$Default/orange/style-skin.css

@@ -45,99 +45,99 @@
     background-color: #FFFBF7 !important;
 }
 .logo_o2_40 {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/logo_o2_40.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/logo_o2_40.png) !important;
 }
 .icon_setting{
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_yyzk.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_yyzk.png) !important;
 }
 .icon_msg {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_xiaoxi.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_xiaoxi.png) !important;
 }
 .icon_msg_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_xiaoxi_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_xiaoxi_click.png) !important;
 }
 .icon_skin {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_pifu.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_pifu.png) !important;
 }
 .icon_skin_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_pifu_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_pifu_click.png) !important;
 }
 .icon_search {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_sousuo.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_sousuo.png) !important;
 }
 .icon_search_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_sousuo_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_sousuo_click.png) !important;
 }
 .icon_clear {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_clear.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_clear.png) !important;
 }
 .icon_loading {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/loading.gif) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/loading.gif) !important;
 }
 .logobg {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/pic_logo_sy.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/pic_logo_sy.png) !important;
 }
 .icon_startMenu_search {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_sousuo_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_sousuo_click.png) !important;
 }
 .icon_close {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_off_round_grey.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_off_round_grey.png) !important;
 }
 .icon_close_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_off_round_bai_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_off_round_bai_click.png) !important;
 }
 .icon_refresh {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/refresh.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/refresh.png) !important;
 }
 .icon_remove_badge {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_off_red.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_off_red.png) !important;
 }
 .icon_off_light {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_off_light.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_off_light.png) !important;
 }
 .icon_add_red {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_jia_red.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_jia_red.png) !important;
 }
 .icon_add {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_jia.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_jia.png) !important;
 }
 .icon_more {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_jia.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_jia.png) !important;
 }
 .icon_notask {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_wugongzuo.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_wugongzuo.png) !important;
 }
 .icon_taskLoading {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/taskLoading.gif) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/taskLoading.gif) !important;
     background-size: 12px !important;
 }
 .icon_msg_close {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_msg_close.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_msg_close.png) !important;
 }
 .icon_up {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/taskbar_up.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/taskbar_up.png) !important;
 }
 .icon_up_gray {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/taskbar_up_gray.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/taskbar_up_gray.png) !important;
 }
 .icon_down {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/taskbar_down.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/taskbar_down.png) !important;
 }
 .icon_down_gray {
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/taskbar_down_gray.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/taskbar_down_gray.png) !important;
 }
 .icon_refresh{
-    background-image: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_shuaxin.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_shuaxin.png) !important;
 }
 .o2_process_AppExp_All_current {
     color: #ED8824 !important;
     border-bottom: 2px solid #ED8824 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/orange/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/orange/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_process_AppExp_categoryItem_current {
     color: #ED8824 !important;
     border-bottom: 2px solid #ED8824 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/orange/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/orange/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_process_AppExp_create {
     background-color: #ED8824 !important;
@@ -149,12 +149,12 @@
 .o2_cms_column_all_current {
     color: #ED8824 !important;
     border-bottom: 2px solid #ED8824 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/orange/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/orange/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_cms_column_categoryItem_current {
     color: #ED8824 !important;
     border-bottom: 2px solid #ED8824 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/orange/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/orange/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_cms_column_createColumnNode {
     background-color: #ED8824 !important;
@@ -166,12 +166,12 @@
 .o2_cms_index_all_current {
     color: #ED8824 !important;
     border-bottom: 2px solid #ED8824 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/orange/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/orange/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_cms_index_categoryItem_current {
     color: #ED8824 !important;
     border-bottom: 2px solid #ED8824 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/orange/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/orange/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_cms_index_categoryItem_text {
     color: #ED8824 !important;
@@ -183,7 +183,7 @@
 }
 .o2_cms_index_createDocument_over {
     color: #ED8824 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/orange/appicons/icon_createdocument_over.png) 5px center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/orange/appicons/icon_createdocument_over.png) 5px center no-repeat !important;
 }
 .current_homepage {
     background-color: #8E8E8E !important;
@@ -201,31 +201,31 @@
 
 /*个人设置---begin*/
 .formTableArea table .selectNode:hover {
-    background:url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_jia.png) center center no-repeat !important
+    background:url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_jia.png) center center no-repeat !important
 }
 .o2_profile_emPower_Add:hover .o2_profile_emPower_Btnimg {
-    background: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_jia.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_jia.png) no-repeat !important;
 }
 .o2_profile_emPower_WithDraw:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_chehui_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_chehui_click.png) no-repeat !important;
 }
 .o2_profile_empower_checkbox_checked{
-    background: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_ok2_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_ok2_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Edit .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_bianji2.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_bianji2.png) no-repeat !important;
 }
 .o2_profile_emPower_Edit:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_bianji2_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_bianji2_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Enable:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_qiyong_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_qiyong_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Disable:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_jinyong_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_jinyong_click.png) no-repeat !important;
 }
 .o2_profile_empower_radio_checked{
-    background: url(/o2_core/o2/xDesktop/$Default/orange/icons/icon_circle_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/orange/icons/icon_circle_click.png) no-repeat !important;
 }
 div:hover>.o2_profile_emPower_Btntext{
     color: #ED8824 !important;

o2web/source/o2_core/o2/xDesktop/$Default/purple/style-skin.css

@@ -45,99 +45,99 @@
     background-color: #FFF7FC !important;
 }
 .logo_o2_40 {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/logo_o2_40.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/logo_o2_40.png) !important;
 }
 .icon_setting{
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_yyzk.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_yyzk.png) !important;
 }
 .icon_msg {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_xiaoxi.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_xiaoxi.png) !important;
 }
 .icon_msg_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_xiaoxi_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_xiaoxi_click.png) !important;
 }
 .icon_skin {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_pifu.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_pifu.png) !important;
 }
 .icon_skin_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_pifu_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_pifu_click.png) !important;
 }
 .icon_search {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_sousuo.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_sousuo.png) !important;
 }
 .icon_search_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_sousuo_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_sousuo_click.png) !important;
 }
 .icon_clear {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_clear.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_clear.png) !important;
 }
 .icon_loading {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/loading.gif) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/loading.gif) !important;
 }
 .logobg {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/pic_logo_sy.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/pic_logo_sy.png) !important;
 }
 .icon_startMenu_search {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_sousuo_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_sousuo_click.png) !important;
 }
 .icon_close {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_off_round_grey.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_off_round_grey.png) !important;
 }
 .icon_close_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_off_round_bai_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_off_round_bai_click.png) !important;
 }
 .icon_refresh {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/refresh.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/refresh.png) !important;
 }
 .icon_remove_badge {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_off_red.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_off_red.png) !important;
 }
 .icon_off_light {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_off_light.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_off_light.png) !important;
 }
 .icon_add_red {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_jia_red.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_jia_red.png) !important;
 }
 .icon_add {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_jia.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_jia.png) !important;
 }
 .icon_more {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_jia.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_jia.png) !important;
 }
 .icon_notask {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_wugongzuo.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_wugongzuo.png) !important;
 }
 .icon_taskLoading {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/taskLoading.gif) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/taskLoading.gif) !important;
     background-size: 12px !important;
 }
 .icon_msg_close {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_msg_close.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_msg_close.png) !important;
 }
 .icon_up {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/taskbar_up.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/taskbar_up.png) !important;
 }
 .icon_up_gray {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/taskbar_up_gray.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/taskbar_up_gray.png) !important;
 }
 .icon_down {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/taskbar_down.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/taskbar_down.png) !important;
 }
 .icon_down_gray {
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/taskbar_down_gray.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/taskbar_down_gray.png) !important;
 }
 .icon_refresh{
-    background-image: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_shuaxin.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_shuaxin.png) !important;
 }
 .o2_process_AppExp_All_current {
     color: #BF3995 !important;
     border-bottom: 2px solid #BF3995 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/purple/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/purple/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_process_AppExp_categoryItem_current {
     color: #BF3995 !important;
     border-bottom: 2px solid #BF3995 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/purple/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/purple/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_process_AppExp_create {
     background-color: #BF3995 !important;
@@ -149,12 +149,12 @@
 .o2_cms_column_all_current {
     color: #BF3995 !important;
     border-bottom: 2px solid #BF3995 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/purple/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/purple/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_cms_column_categoryItem_current {
     color: #BF3995 !important;
     border-bottom: 2px solid #BF3995 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/purple/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/purple/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_cms_column_createColumnNode {
     background-color: #BF3995 !important;
@@ -166,12 +166,12 @@
 .o2_cms_index_all_current {
     color: #BF3995 !important;
     border-bottom: 2px solid #BF3995 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/purple/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/purple/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_cms_index_categoryItem_current {
     color: #BF3995 !important;
     border-bottom: 2px solid #BF3995 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/purple/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/purple/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_cms_index_categoryItem_text {
     color: #BF3995 !important;
@@ -183,7 +183,7 @@
 }
 .o2_cms_index_createDocument_over {
     color: #BF3995 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/purple/appicons/icon_createdocument_over.png) 5px center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/purple/appicons/icon_createdocument_over.png) 5px center no-repeat !important;
 }
 .current_homepage {
     background-color: #8E8E8E !important;
@@ -201,31 +201,31 @@
 
 /*个人设置---begin*/
 .formTableArea table .selectNode:hover {
-    background:url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_jia.png) center center no-repeat !important
+    background:url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_jia.png) center center no-repeat !important
 }
 .o2_profile_emPower_Add:hover .o2_profile_emPower_Btnimg {
-    background: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_jia.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_jia.png) no-repeat !important;
 }
 .o2_profile_emPower_WithDraw:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_chehui_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_chehui_click.png) no-repeat !important;
 }
 .o2_profile_empower_checkbox_checked{
-    background: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_ok2_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_ok2_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Edit .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_bianji2.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_bianji2.png) no-repeat !important;
 }
 .o2_profile_emPower_Edit:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_bianji2_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_bianji2_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Enable:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_qiyong_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_qiyong_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Disable:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_jinyong_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_jinyong_click.png) no-repeat !important;
 }
 .o2_profile_empower_radio_checked{
-    background: url(/o2_core/o2/xDesktop/$Default/purple/icons/icon_circle_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/purple/icons/icon_circle_click.png) no-repeat !important;
 }
 div:hover>.o2_profile_emPower_Btntext{
     color: #BF3995 !important;

o2web/source/o2_core/o2/xDesktop/$Default/red/icons/style-skin.css

@@ -39,56 +39,56 @@
     border-color: #66CC80;
 }
 .logo_o2_40 {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/logo_o2_40.png);
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/logo_o2_40.png);
 }
 .icon_setting{
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_yyzk.png);
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_yyzk.png);
 }
 .icon_msg {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_xiaoxi.png);
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_xiaoxi.png);
 }
 .icon_msg_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_xiaoxi_click.png);
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_xiaoxi_click.png);
 }
 .icon_skin {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_pifu.png);
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_pifu.png);
 }
 .icon_skin_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_pifu_click.png);
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_pifu_click.png);
 }
 .icon_search {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_sousuo.png);
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_sousuo.png);
 }
 .icon_search_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_sousuo_click.png);
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_sousuo_click.png);
 }
 .icon_clear {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_clear.png);
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_clear.png);
 }
 .icon_loading {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/loading.gif);
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/loading.gif);
 }
 .logobg {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/pic_logo_sy.png);
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/pic_logo_sy.png);
 }
 .icon_startMenu_search {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_sousuo_click.png);
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_sousuo_click.png);
 }
 .icon_close {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_off_round_grey.png);
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_off_round_grey.png);
 }
 .icon_close_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_off_round_bai_click.png);
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_off_round_bai_click.png);
 }
 .icon_refresh {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/refresh.png);
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/refresh.png);
 }
 .icon_remove_badge {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_off_red.png);
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_off_red.png);
 }
 .icon_off_light {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_off_light.png);
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_off_light.png);
 }
 .icon_add_red {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_jia_red.png);
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_jia_red.png);
 }

o2web/source/o2_core/o2/xDesktop/$Default/red/style-skin.css

@@ -45,99 +45,99 @@
     background-color: #FFF7F7 !important;
 }
 .logo_o2_40 {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/logo_o2_40.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/logo_o2_40.png) !important;
 }
 .icon_setting{
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_yyzk.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_yyzk.png) !important;
 }
 .icon_msg {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_xiaoxi.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_xiaoxi.png) !important;
 }
 .icon_msg_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_xiaoxi_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_xiaoxi_click.png) !important;
 }
 .icon_skin {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_pifu.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_pifu.png) !important;
 }
 .icon_skin_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_pifu_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_pifu_click.png) !important;
 }
 .icon_search {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_sousuo.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_sousuo.png) !important;
 }
 .icon_search_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_sousuo_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_sousuo_click.png) !important;
 }
 .icon_clear {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_clear.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_clear.png) !important;
 }
 .icon_loading {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/loading.gif) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/loading.gif) !important;
 }
 .logobg {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/pic_logo_sy.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/pic_logo_sy.png) !important;
 }
 .icon_startMenu_search {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_sousuo_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_sousuo_click.png) !important;
 }
 .icon_close {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_off_round_grey.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_off_round_grey.png) !important;
 }
 .icon_close_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_off_round_bai_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_off_round_bai_click.png) !important;
 }
 .icon_refresh {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/refresh.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/refresh.png) !important;
 }
 .icon_remove_badge {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_off_red.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_off_red.png) !important;
 }
 .icon_off_light {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_off_light.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_off_light.png) !important;
 }
 .icon_add_red {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_jia_red.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_jia_red.png) !important;
 }
 .icon_add {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_jia.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_jia.png) !important;
 }
 .icon_more {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_jia.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_jia.png) !important;
 }
 .icon_notask {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_wugongzuo.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_wugongzuo.png) !important;
 }
 .icon_taskLoading {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/taskLoading.gif) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/taskLoading.gif) !important;
     background-size: 12px !important;
 }
 .icon_msg_close {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_msg_close.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_msg_close.png) !important;
 }
 .icon_up {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/taskbar_up.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/taskbar_up.png) !important;
 }
 .icon_up_gray {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/taskbar_up_gray.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/taskbar_up_gray.png) !important;
 }
 .icon_down {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/taskbar_down.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/taskbar_down.png) !important;
 }
 .icon_down_gray {
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/taskbar_down_gray.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/taskbar_down_gray.png) !important;
 }
 .icon_refresh{
-    background-image: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_shuaxin.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_shuaxin.png) !important;
 }
 .o2_process_AppExp_All_current {
     color: #D94141 !important;
     border-bottom: 2px solid #D94141 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/red/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/red/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_process_AppExp_categoryItem_current {
     color: #D94141 !important;
     border-bottom: 2px solid #D94141 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/red/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/red/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_process_AppExp_create {
     background-color: #D94141 !important;
@@ -149,12 +149,12 @@
 .o2_cms_column_all_current {
     color: #D94141 !important;
     border-bottom: 2px solid #D94141 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/red/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/red/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_cms_column_categoryItem_current {
     color: #D94141 !important;
     border-bottom: 2px solid #D94141 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/red/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/red/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_cms_column_createColumnNode {
     background-color: #D94141 !important;
@@ -166,12 +166,12 @@
 .o2_cms_index_all_current {
     color: #D94141 !important;
     border-bottom: 2px solid #D94141 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/red/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/red/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_cms_index_categoryItem_current {
     color: #D94141 !important;
     border-bottom: 2px solid #D94141 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/red/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/red/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_cms_index_categoryItem_text {
     color: #D94141 !important;
@@ -183,7 +183,7 @@
 }
 .o2_cms_index_createDocument_over {
     color: #D94141 !important;
-    background: url(/o2_core/o2/xDesktop/$Default/red/appicons/icon_createdocument_over.png) 5px center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/red/appicons/icon_createdocument_over.png) 5px center no-repeat !important;
 }
 .current_homepage {
     background-color: #8E8E8E !important;
@@ -200,31 +200,31 @@
 }
 /*个人设置---begin*/
 .formTableArea table .selectNode:hover {
-    background:url(/o2_core/o2/xDesktop/$Default/red/icons/icon_jia.png) center center no-repeat !important
+    background:url(../o2_core/o2/xDesktop/$Default/red/icons/icon_jia.png) center center no-repeat !important
 }
 .o2_profile_emPower_Add:hover .o2_profile_emPower_Btnimg {
-    background: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_jia.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_jia.png) no-repeat !important;
 }
 .o2_profile_emPower_WithDraw:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_chehui_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_chehui_click.png) no-repeat !important;
 }
 .o2_profile_empower_checkbox_checked{
-    background: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_ok2_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_ok2_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Edit .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_bianji2.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_bianji2.png) no-repeat !important;
 }
 .o2_profile_emPower_Edit:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_bianji2_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_bianji2_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Enable:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_qiyong_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_qiyong_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Disable:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_jinyong_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_jinyong_click.png) no-repeat !important;
 }
 .o2_profile_empower_radio_checked{
-    background: url(/o2_core/o2/xDesktop/$Default/red/icons/icon_circle_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/red/icons/icon_circle_click.png) no-repeat !important;
 }
 
 div:hover>.o2_profile_emPower_Btntext{

o2web/source/o2_core/o2/xDesktop/$Default/tan/style-skin.css

@@ -46,100 +46,100 @@
 }
 
 .logo_o2_40 {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/logo_o2_40.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/logo_o2_40.png) !important;
 }
 .icon_setting{
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_yyzk.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_yyzk.png) !important;
 }
 .icon_msg {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_xiaoxi.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_xiaoxi.png) !important;
 }
 .icon_msg_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_xiaoxi_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_xiaoxi_click.png) !important;
 }
 .icon_skin {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_pifu.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_pifu.png) !important;
 }
 .icon_skin_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_pifu_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_pifu_click.png) !important;
 }
 .icon_search {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_sousuo.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_sousuo.png) !important;
 }
 .icon_search_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_sousuo_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_sousuo_click.png) !important;
 }
 .icon_clear {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_clear.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_clear.png) !important;
 }
 .icon_loading {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/loading.gif) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/loading.gif) !important;
 }
 .logobg {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/pic_logo_sy.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/pic_logo_sy.png) !important;
 }
 .icon_startMenu_search {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_sousuo_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_sousuo_click.png) !important;
 }
 .icon_close {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_off_round_grey.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_off_round_grey.png) !important;
 }
 .icon_close_focus {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_off_round_bai_click.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_off_round_bai_click.png) !important;
 }
 .icon_refresh {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/refresh.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/refresh.png) !important;
 }
 .icon_remove_badge {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_off_red.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_off_red.png) !important;
 }
 .icon_off_light {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_off_light.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_off_light.png) !important;
 }
 .icon_add_red {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_jia_red.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_jia_red.png) !important;
 }
 .icon_add {
-     background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_jia.png) !important;
+     background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_jia.png) !important;
  }
 .icon_more {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_jia.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_jia.png) !important;
 }
 .icon_notask {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_wugongzuo.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_wugongzuo.png) !important;
 }
 .icon_taskLoading {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/taskLoading.gif) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/taskLoading.gif) !important;
     background-size: 12px !important;
 }
 .icon_msg_close {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_msg_close.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_msg_close.png) !important;
 }
 .icon_up {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/taskbar_up.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/taskbar_up.png) !important;
 }
 .icon_up_gray {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/taskbar_up_gray.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/taskbar_up_gray.png) !important;
 }
 .icon_down {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/taskbar_down.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/taskbar_down.png) !important;
 }
 .icon_down_gray {
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/taskbar_down_gray.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/taskbar_down_gray.png) !important;
 }
 .icon_refresh{
-    background-image: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_shuaxin.png) !important;
+    background-image: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_shuaxin.png) !important;
 }
 
 .o2_process_AppExp_All_current {
     color: #995E2E !important;
     border-bottom: 2px solid #995E2E !important;
-    background: url(/o2_core/o2/xDesktop/$Default/tan/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/tan/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_process_AppExp_categoryItem_current {
     color: #995E2E !important;
     border-bottom: 2px solid #995E2E !important;
-    background: url(/o2_core/o2/xDesktop/$Default/tan/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/tan/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_process_AppExp_create {
     background-color: #995E2E !important;
@@ -151,12 +151,12 @@
 .o2_cms_column_all_current {
     color: #995E2E !important;
     border-bottom: 2px solid #995E2E !important;
-    background: url(/o2_core/o2/xDesktop/$Default/tan/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/tan/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_cms_column_categoryItem_current {
     color: #995E2E !important;
     border-bottom: 2px solid #995E2E !important;
-    background: url(/o2_core/o2/xDesktop/$Default/tan/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/tan/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_cms_column_createColumnNode {
     background-color: #995E2E !important;
@@ -168,12 +168,12 @@
 .o2_cms_index_all_current {
     color: #995E2E !important;
     border-bottom: 2px solid #995E2E !important;
-    background: url(/o2_core/o2/xDesktop/$Default/tan/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/tan/appicons/icon_quanbu_click.png) 0 center no-repeat !important;
 }
 .o2_cms_index_categoryItem_current {
     color: #995E2E !important;
     border-bottom: 2px solid #995E2E !important;
-    background: url(/o2_core/o2/xDesktop/$Default/tan/appicons/icon_files_click.png) 0 center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/tan/appicons/icon_files_click.png) 0 center no-repeat !important;
 }
 .o2_cms_index_categoryItem_text {
     color: #995E2E !important;
@@ -185,7 +185,7 @@
 }
 .o2_cms_index_createDocument_over {
     color: #995E2E !important;
-    background: url(/o2_core/o2/xDesktop/$Default/tan/appicons/icon_createdocument_over.png) 5px center no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/tan/appicons/icon_createdocument_over.png) 5px center no-repeat !important;
 }
 .current_homepage {
     background-color: #8E8E8E !important;
@@ -203,31 +203,31 @@
 
 /*个人设置---begin*/
 .formTableArea table .selectNode:hover {
-    background:url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_jia.png) center center no-repeat !important
+    background:url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_jia.png) center center no-repeat !important
 }
 .o2_profile_emPower_Add:hover .o2_profile_emPower_Btnimg {
-    background: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_jia.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_jia.png) no-repeat !important;
 }
 .o2_profile_emPower_WithDraw:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_chehui_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_chehui_click.png) no-repeat !important;
 }
 .o2_profile_empower_checkbox_checked{
-    background: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_ok2_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_ok2_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Edit .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_bianji2.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_bianji2.png) no-repeat !important;
 }
 .o2_profile_emPower_Edit:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_bianji2_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_bianji2_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Enable:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_qiyong_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_qiyong_click.png) no-repeat !important;
 }
 .o2_profile_emPower_Disable:hover .o2_profile_emPower_Btnimg{
-    background: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_jinyong_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_jinyong_click.png) no-repeat !important;
 }
 .o2_profile_empower_radio_checked{
-    background: url(/o2_core/o2/xDesktop/$Default/tan/icons/icon_circle_click.png) no-repeat !important;
+    background: url(../o2_core/o2/xDesktop/$Default/tan/icons/icon_circle_click.png) no-repeat !important;
 }
 div:hover>.o2_profile_emPower_Btntext{
     color: #995E2E !important;

o2web/source/o2_core/o2/xDesktop/Actions/RestActions.js

@@ -14,7 +14,6 @@ MWF.xDesktop.Actions.RestActions = new Class({
 		var callback = new MWF.xApplication.Common.Actions.RestActions.Callback(success, failure);
 		MWF.getJSON(url, callback);
 	},
-	
 	getAddress: function(success, failure){
 //		var name = "x_processplatform_core_designer";
 //		var url = this.actions.getAddress.replace(/{id}/g, name);
@@ -26,13 +25,16 @@ MWF.xDesktop.Actions.RestActions = new Class({
 //		MWF.getJSON(url, callback);
 		
 		//this.address = "http://xa02.zoneland.net:8080/"+this.serviceName;
+        debugger;
         var addressObj = layout.serviceAddressList[this.serviceName];
-
         if (addressObj){
+            //var mapping = layout.getAppUrlMapping(layout.config.app_protocol+"//"+addressObj.host+(addressObj.port==80 ? "" : ":"+addressObj.port)+addressObj.context);
             this.address = layout.config.app_protocol+"//"+addressObj.host+(addressObj.port==80 ? "" : ":"+addressObj.port)+addressObj.context;
         }else{
             var host = layout.desktop.centerServer.host || window.location.hostname;
             var port = layout.desktop.centerServer.port;
+
+            //var mapping = layout.getCenterUrlMapping(layout.config.app_protocol+"//"+host+(port=="80" ? "" : ":"+port)+"/x_program_center");
             this.address = layout.config.app_protocol+"//"+host+(port=="80" ? "" : ":"+port)+"/x_program_center";
         }
 
@@ -100,7 +102,7 @@ MWF.xDesktop.Actions.RestActions = new Class({
                 res = MWF.restful(method, uri, data, callback, async, credentials, option.cache);
             }
         }.bind(this));
-        return res
+        return res;
 	},
 	formDataUpdateProgress: function(){
 		

o2web/source/o2_core/o2/xDesktop/Authentication.js

@@ -162,7 +162,7 @@ MWF.xDesktop.Authentication.LoginForm = new Class({
 
         if (this.faceLogin) {
             if (navigator.mediaDevices && navigator.mediaDevices.getUserMedia) {
-                COMMON.AjaxModule.loadDom("/o2_lib/adapter/adapter.js", function () {
+                COMMON.AjaxModule.loadDom("../o2_lib/adapter/adapter.js", function () {
                     if (navigator.mediaDevices && navigator.mediaDevices.getUserMedia) {
                         //暂时隐藏此功能
                         this.cameraLoginIcon = new Element("div", { "styles": this.explorer.css.cameraLoginIcon }).inject(this.formTopContentNode);
@@ -392,7 +392,7 @@ MWF.xDesktop.Authentication.LoginForm = new Class({
     },
 
     cameraLoginSuccess: function () {
-        COMMON.AjaxModule.loadDom(["/o2_lib/CryptoJS/tripledes.js", "/o2_lib/CryptoJS/mode-ecb.js"], function () {
+        COMMON.AjaxModule.loadDom(["../o2_lib/CryptoJS/tripledes.js", "../o2_lib/CryptoJS/mode-ecb.js"], function () {
             //COMMON.AjaxModule.loadDom(, function(){
 
             var addressObj = layout.serviceAddressList["x_organization_assemble_authentication"];
@@ -821,7 +821,7 @@ MWF.xDesktop.Authentication.LoginForm = new Class({
             styles: this.css.oauthItemNode,
             events: {
                 click: function () {
-                    var url = "/x_desktop/oauth.html?oauth=" + encodeURIComponent(this.name);
+                    var url = "../x_desktop/oauth.html?oauth=" + encodeURIComponent(this.name);
                     if (this.qywx) {
                         url += "&qywx=" + this.qywx;
                     }

o2web/source/o2_core/o2/xDesktop/Common.js

@@ -429,7 +429,7 @@ MWF.xDesktop.getServiceAddress = function(config, callback){
         ((loadingNode) ? loadingNode.getFirst() : contentNode).empty();
         var html= "<div style='width: 800px; color: #ffffff; margin: 30px auto'>" +
             "<div style='height: 40px;'>" +
-            "   <div style='height: 40px; width: 40px; float: left; background: url(/x_desktop/img/error.png)'></div>" +
+            "   <div style='height: 40px; width: 40px; float: left; background: url(../x_desktop/img/error.png)'></div>" +
             "   <div style='margin-left: 50px; font-size: 20px; line-height: 40px;'>"+MWF.LP.desktop.notice.errorConnectCenter1+"</div>" +
             "</div><div style='margin-left: 0px;'>";
         if (typeOf(config.center)==="array"){

o2web/source/o2_core/o2/xDesktop/Default.js

@@ -1294,7 +1294,7 @@ o2.xDesktop.Default.StartMenu.Item = new Class({
                     icon = this.layout.path+"appicons/"+this.layout.iconsJson["Url"].icon;
                     bgcolor = this.layout.iconsJson["Url"].color;
                 }else{
-                    icon = "/x_component_Setting/$Main/default/icon/site.png";
+                    icon = "../x_component_Setting/$Main/default/icon/site.png";
                     bgcolor = "";
                 }
             }
@@ -1303,7 +1303,7 @@ o2.xDesktop.Default.StartMenu.Item = new Class({
                 icon = this.layout.path+"appicons/"+this.layout.iconsJson[this.data.path].icon;
                 bgcolor = this.layout.iconsJson[this.data.path].color;
             }else{
-                icon = "/x_component_"+this.data.path.replace(/\./g, "_")+"/$Main/"+this.data.iconPath;
+                icon = "../x_component_"+this.data.path.replace(/\./g, "_")+"/$Main/"+this.data.iconPath;
                 bgcolor = "";
             }
         }
@@ -1484,7 +1484,7 @@ o2.xDesktop.Default.StartMenu.PortalItem = new Class({
                 icon = this.layout.path+"appicons/"+this.layout.iconsJson[p].icon;
                 bgcolor = this.layout.iconsJson[p].color;
             }else{
-                icon = "/x_component_portal_PortalExplorer/$Main/default/icon/application.png";
+                icon = "../x_component_portal_PortalExplorer/$Main/default/icon/application.png";
                 bgcolor = "";
             }
         }
@@ -1536,7 +1536,7 @@ o2.xDesktop.Default.StartMenu.ProcessItem = new Class({
                 icon = this.layout.path+"appicons/"+this.layout.iconsJson[p].icon;
                 bgcolor = this.layout.iconsJson[p].color;
             }else{
-                icon = "/x_component_process_ApplicationExplorer/$Main/default/icon/application.png";
+                icon = "../x_component_process_ApplicationExplorer/$Main/default/icon/application.png";
                 bgcolor = "";
             }
         }
@@ -1584,7 +1584,7 @@ o2.xDesktop.Default.StartMenu.InforItem = new Class({
                 icon = this.layout.path+"appicons/"+this.layout.iconsJson[p].icon;
                 bgcolor = this.layout.iconsJson[p].color;
             }else{
-                icon = "/x_component_cms_Index/$Main/default/icon/column.png";
+                icon = "../x_component_cms_Index/$Main/default/icon/column.png";
                 bgcolor = "";
             }
         }
@@ -1633,7 +1633,7 @@ o2.xDesktop.Default.StartMenu.QueryItem = new Class({
                 icon = this.layout.path+"appicons/"+this.layout.iconsJson[p].icon;
                 bgcolor = this.layout.iconsJson[p].color;
             }else{
-                icon = "/x_component_query_Query/$Main/appicon.png";
+                icon = "../x_component_query_Query/$Main/appicon.png";
                 bgcolor = "";
             }
 
@@ -1997,7 +1997,7 @@ o2.xDesktop.Default.Lnk = new Class({
                 if (this.layout.iconsJson[p] && this.layout.iconsJson[p].icon){
                     icon = this.layout.path+"appicons/"+this.layout.iconsJson[p].icon;
                 }else{
-                    icon = "/x_component_"+this.data.name.replace(/\./g, "_")+"/$Main/appicon.png";
+                    icon = "../x_component_"+this.data.name.replace(/\./g, "_")+"/$Main/appicon.png";
                 }
             }
         }

o2web/source/o2_core/o2/xDesktop/Layout.js

@@ -1436,7 +1436,7 @@ MWF.xDesktop.Layout.Top = new Class({
         if (app.appIcon){
             icon = "url(data:image/png;base64,"+app.appIcon+")";
         }else{
-            icon = "url(/x_component_cms_Index/$Main/default/icon/column.png)";
+            icon = "url(../x_component_cms_Index/$Main/default/icon/column.png)";
         }
         applicationMenuIconNode.setStyle("background-image", icon);
 
@@ -1484,7 +1484,7 @@ MWF.xDesktop.Layout.Top = new Class({
         if (app.icon){
             icon = "url(data:image/png;base64,"+app.icon+")";
         }else{
-            icon = "url(/x_component_portal_PortalExplorer/$Main/default/icon/application.png)";
+            icon = "url(../x_component_portal_PortalExplorer/$Main/default/icon/application.png)";
         }
         applicationMenuIconNode.setStyle("background-image", icon);
 
@@ -1527,7 +1527,7 @@ MWF.xDesktop.Layout.Top = new Class({
         if (app.icon){
             icon = "url(data:image/png;base64,"+app.icon+")";
         }else{
-            icon = "url(/x_component_query_Query/$Main/appicon.png)";
+            icon = "url(../x_component_query_Query/$Main/appicon.png)";
         }
         applicationMenuIconNode.setStyle("background-image", icon);
 
@@ -1570,7 +1570,7 @@ MWF.xDesktop.Layout.Top = new Class({
         if (app.icon){
             icon = "url(data:image/png;base64,"+app.icon+")";
         }else{
-            icon = "url(/x_component_process_ApplicationExplorer/$Main/default/icon/application.png)";
+            icon = "url(../x_component_process_ApplicationExplorer/$Main/default/icon/application.png)";
         }
         applicationMenuIconNode.setStyle("background-image", icon);
 
@@ -1616,10 +1616,10 @@ MWF.xDesktop.Layout.Top = new Class({
             if (value.iconPath){
                 icon = value.iconPath;
             }else{
-                icon = "/x_component_Setting/$Main/default/icon/site.png";
+                icon = "../x_component_Setting/$Main/default/icon/site.png";
             }
         }else{
-            icon = "/x_component_"+value.path.replace(/\./g, "_")+"/$Main/"+value.iconPath;
+            icon = "../x_component_"+value.path.replace(/\./g, "_")+"/$Main/"+value.iconPath;
         }
         applicationMenuIconNode.setStyle("background-image", "url("+icon+")");
 
@@ -1668,7 +1668,7 @@ MWF.xDesktop.Layout.Top = new Class({
             "styles": this.layout.css.widgetMenuIconNode
         }).inject(applicationMenuNode);
 
-        var icon = "/x_component_"+appName.replace(/\./g, "_")+"/$"+name+"/"+icon;
+        var icon = "../x_component_"+appName.replace(/\./g, "_")+"/$"+name+"/"+icon;
         applicationMenuIconNode.setStyle("background-image", "url("+icon+")");
 
         new Element("div", {

o2web/source/o2_core/o2/xDesktop/WebSocket.js

@@ -12,6 +12,8 @@ MWF.xDesktop.WebSocket = new Class({
         var wsScheme = (scheme.toString().toLowerCase()==="https") ? "wss" : "ws";
         this.ws = wsScheme+"://"+addressObj.host+(addressObj.port==80 ? "" : ":"+addressObj.port)+addressObj.context+"/ws/collaboration";
 
+
+
         this.reConnect = true;
         this.checking = false;
         this.heartTimeout = 60000;

o2web/source/o2_core/o2/xScript/CMSEnvironment.js

@@ -993,7 +993,7 @@ MWF.xScript.CMSEnvironment = function(ev){
                                     "padding": "10px 10px"
                                 }
                             }).inject(node);
-                            var html = "<div style='height: 40px; width: 40px; float: left; background: url(/x_component_process_Xform/$Form/default/icon/work.png) no-repeat center center'></div>" +
+                            var html = "<div style='height: 40px; width: 40px; float: left; background: url(../x_component_process_Xform/$Form/default/icon/work.png) no-repeat center center'></div>" +
                                 "<div style='height: 40px; width: 40px; float: right'><div class='MWFAction' style='height: 20px; width: 40px; margin-top: 10px; border: 1px solid #999999; border-radius: 5px;text-align: center; cursor: pointer'>"+o2.LP.widget.open+"</div></div>"+
                                 "<div style='height: 20px; line-height: 20px; margin: 0px 40px'>"+work.title+"</div>" +
                                 "<div style='margin: 0px 40px'><div style='color:#999999; float: left; margin-right: 10px'>"+work.activityName+"</div>" +
@@ -1020,7 +1020,7 @@ MWF.xScript.CMSEnvironment = function(ev){
                                     "padding": "10px 10px"
                                 }
                             }).inject(node);
-                            var html = "<div style='height: 40px; width: 40px; float: left; background: url(/x_component_process_Xform/$Form/default/icon/work.png) no-repeat center center'></div>" +
+                            var html = "<div style='height: 40px; width: 40px; float: left; background: url(../x_component_process_Xform/$Form/default/icon/work.png) no-repeat center center'></div>" +
                                 "<div style='height: 40px; width: 40px; float: right'><div class='MWFAction' style='height: 20px; width: 40px; margin-top: 10px; border: 1px solid #999999; border-radius: 5px;text-align: center; cursor: pointer'>"+o2.LP.widget.open+"</div></div>"+
                                 "<div style='height: 20px; line-height: 20px; margin: 0px 40px'>"+work.title+"</div>" +
                                 "<div style='margin: 0px 40px'><div style='color:#999999; float: left; margin-right: 10px'>"+o2.LP.widget.workcompleted+"</div>" +

o2web/source/o2_core/o2/xScript/Environment.js

@@ -1087,7 +1087,7 @@ MWF.xScript.Environment = function(ev){
                                     "padding": "10px 10px"
                                 }
                             }).inject(node);
-                            var html = "<div style='height: 40px; width: 40px; float: left; background: url(/x_component_process_Xform/$Form/default/icon/work.png) no-repeat center center'></div>" +
+                            var html = "<div style='height: 40px; width: 40px; float: left; background: url(../x_component_process_Xform/$Form/default/icon/work.png) no-repeat center center'></div>" +
                                 "<div style='height: 40px; width: 40px; float: right'><div class='MWFAction' style='height: 20px; width: 40px; margin-top: 10px; border: 1px solid #999999; border-radius: 5px;text-align: center; cursor: pointer'>"+o2.LP.widget.open+"</div></div>"+
                                 "<div style='height: 20px; line-height: 20px; margin: 0px 40px'>"+work.title+"</div>" +
                                 "<div style='margin: 0px 40px'><div style='color:#999999; float: left; margin-right: 10px'>"+work.activityName+"</div>" +
@@ -1114,7 +1114,7 @@ MWF.xScript.Environment = function(ev){
                                     "padding": "10px 10px"
                                 }
                             }).inject(node);
-                            var html = "<div style='height: 40px; width: 40px; float: left; background: url(/x_component_process_Xform/$Form/default/icon/work.png) no-repeat center center'></div>" +
+                            var html = "<div style='height: 40px; width: 40px; float: left; background: url(../x_component_process_Xform/$Form/default/icon/work.png) no-repeat center center'></div>" +
                                 "<div style='height: 40px; width: 40px; float: right'><div class='MWFAction' style='height: 20px; width: 40px; margin-top: 10px; border: 1px solid #999999; border-radius: 5px;text-align: center; cursor: pointer'>"+o2.LP.widget.open+"</div></div>"+
                                 "<div style='height: 20px; line-height: 20px; margin: 0px 40px'>"+work.title+"</div>" +
                                 "<div style='margin: 0px 40px'><div style='color:#999999; float: left; margin-right: 10px'>"+o2.LP.widget.workcompleted+"</div>" +

o2web/source/o2_core/o2/xScript/PageEnvironment.js

@@ -935,7 +935,7 @@ MWF.xScript.PageEnvironment = function (ev) {
                                     "padding": "10px 10px"
                                 }
                             }).inject(node);
-                            var html = "<div style='height: 40px; width: 40px; float: left; background: url(/x_component_process_Xform/$Form/default/icon/work.png) no-repeat center center'></div>" +
+                            var html = "<div style='height: 40px; width: 40px; float: left; background: url(../x_component_process_Xform/$Form/default/icon/work.png) no-repeat center center'></div>" +
                                 "<div style='height: 40px; width: 40px; float: right'><div class='MWFAction' style='height: 20px; width: 40px; margin-top: 10px; border: 1px solid #999999; border-radius: 5px;text-align: center; cursor: pointer'>" + o2.LP.widget.open + "</div></div>" +
                                 "<div style='height: 20px; line-height: 20px; margin: 0px 40px'>" + work.title + "</div>" +
                                 "<div style='margin: 0px 40px'><div style='color:#999999; float: left; margin-right: 10px'>" + work.activityName + "</div>" +
@@ -962,7 +962,7 @@ MWF.xScript.PageEnvironment = function (ev) {
                                     "padding": "10px 10px"
                                 }
                             }).inject(node);
-                            var html = "<div style='height: 40px; width: 40px; float: left; background: url(/x_component_process_Xform/$Form/default/icon/work.png) no-repeat center center'></div>" +
+                            var html = "<div style='height: 40px; width: 40px; float: left; background: url(../x_component_process_Xform/$Form/default/icon/work.png) no-repeat center center'></div>" +
                                 "<div style='height: 40px; width: 40px; float: right'><div class='MWFAction' style='height: 20px; width: 40px; margin-top: 10px; border: 1px solid #999999; border-radius: 5px;text-align: center; cursor: pointer'>" + o2.LP.widget.open + "</div></div>" +
                                 "<div style='height: 20px; line-height: 20px; margin: 0px 40px'>" + work.title + "</div>" +
                                 "<div style='margin: 0px 40px'><div style='color:#999999; float: left; margin-right: 10px'>" + o2.LP.widget.workcompleted + "</div>" +

o2web/source/o2_core/o2/xScript/ViewEnvironment.js

@@ -849,7 +849,7 @@ MWF.xScript.ViewEnvironment = function (ev) {
                                     "padding": "10px 10px"
                                 }
                             }).inject(node);
-                            var html = "<div style='height: 40px; width: 40px; float: left; background: url(/x_component_process_Xform/$Form/default/icon/work.png) no-repeat center center'></div>" +
+                            var html = "<div style='height: 40px; width: 40px; float: left; background: url(../x_component_process_Xform/$Form/default/icon/work.png) no-repeat center center'></div>" +
                                 "<div style='height: 40px; width: 40px; float: right'><div class='MWFAction' style='height: 20px; width: 40px; margin-top: 10px; border: 1px solid #999999; border-radius: 5px;text-align: center; cursor: pointer'>" + o2.LP.widget.open + "</div></div>" +
                                 "<div style='height: 20px; line-height: 20px; margin: 0px 40px'>" + work.title + "</div>" +
                                 "<div style='margin: 0px 40px'><div style='color:#999999; float: left; margin-right: 10px'>" + work.activityName + "</div>" +
@@ -876,7 +876,7 @@ MWF.xScript.ViewEnvironment = function (ev) {
                                     "padding": "10px 10px"
                                 }
                             }).inject(node);
-                            var html = "<div style='height: 40px; width: 40px; float: left; background: url(/x_component_process_Xform/$Form/default/icon/work.png) no-repeat center center'></div>" +
+                            var html = "<div style='height: 40px; width: 40px; float: left; background: url(../x_component_process_Xform/$Form/default/icon/work.png) no-repeat center center'></div>" +
                                 "<div style='height: 40px; width: 40px; float: right'><div class='MWFAction' style='height: 20px; width: 40px; margin-top: 10px; border: 1px solid #999999; border-radius: 5px;text-align: center; cursor: pointer'>" + o2.LP.widget.open + "</div></div>" +
                                 "<div style='height: 20px; line-height: 20px; margin: 0px 40px'>" + work.title + "</div>" +
                                 "<div style='margin: 0px 40px'><div style='color:#999999; float: left; margin-right: 10px'>" + o2.LP.widget.workcompleted + "</div>" +

o2web/source/o2_lib/officecontrol/5040/config.json

@@ -3,11 +3,11 @@
   "makerKey": "E138DABB4AC26C2D8E09FAE59AB3BDE87AFB9D7B",
   "version": "5.0.4.0",
   "clsid": "A64E3073-2016-4baf-A89D-FFE1FAA10EC0",
-  "codeBase": "/o2_lib/officecontrol/5040/OfficeControl.cab",
+  "codeBase": "../o2_lib/officecontrol/5040/OfficeControl.cab",
   "clsid64": "A64E3073-2016-4baf-A89D-FFE1FAA10EE1",
-  "codeBase64": "/o2_lib/officecontrol/5040/ofctnewclsid.cab",
+  "codeBase64": "../o2_lib/officecontrol/5040/ofctnewclsid.cab",
   "pdfType": "PDF.NtkoDocument",
   "pdfVersion": "4.0.0.3",
-  "pdfCodeBase": "/o2_lib/officecontrol/5040/ntkooledocall.cab",
-  "pdfCodeBase64": "/o2_lib/officecontrol/5040/ntkooledocall64.cab"
+  "pdfCodeBase": "../o2_lib/officecontrol/5040/ntkooledocall.cab",
+  "pdfCodeBase64": "../o2_lib/officecontrol/5040/ntkooledocall64.cab"
 }

o2web/source/o2_lib/officecontrol/config.json

@@ -3,11 +3,11 @@
   "makerKey": "E138DABB4AC26C2D8E09FAE59AB3BDE87AFB9D7B",
   "version": "5.0.4.0",
   "clsid": "A64E3073-2016-4baf-A89D-FFE1FAA10EC0",
-  "codeBase": "/o2_lib/officecontrol/5040/OfficeControl.cab",
+  "codeBase": "../o2_lib/officecontrol/5040/OfficeControl.cab",
   "clsid64": "A64E3073-2016-4baf-A89D-FFE1FAA10EE1",
-  "codeBase64": "/o2_lib/officecontrol/5040/ofctnewclsid.cab",
+  "codeBase64": "../o2_lib/officecontrol/5040/ofctnewclsid.cab",
   "pdfType": "PDF.NtkoDocument",
   "pdfVersion": "4.0.1.0",
-  "pdfCodeBase": "/o2_lib/officecontrol/5040/ntkooledocall.cab",
-  "pdfCodeBase64": "/o2_lib/officecontrol/5040/ntkooledocall64.cab"
+  "pdfCodeBase": "../o2_lib/officecontrol/5040/ntkooledocall.cab",
+  "pdfCodeBase64": "../o2_lib/officecontrol/5040/ntkooledocall64.cab"
 }

o2web/source/x_component_ANN/$Main/default/content.html

@@ -1,15 +1,15 @@
 <div class="o2_ann_modelContext_node">
     <div class="o2_ann_modelContext_toolbar">
 
-        <span MWFnodetype="MWFToolBarButton" MWFButtonImage="/x_component_ANN/$Main/default/tools/edit.png" title="编辑" MWFButtonAction="edit" MWFButtonText="编辑"></span>
-        <span MWFnodetype="MWFToolBarButton" MWFButtonImage="/x_component_ANN/$Main/default/tools/save.png" title="保存" MWFButtonAction="save" MWFButtonText="保存"></span>
-        <span MWFnodetype="MWFToolBarButton" MWFButtonImage="/x_component_ANN/$Main/default/tools/generate.png" title="生成训练集" MWFButtonAction="generate" MWFButtonText="生成训练集"></span>
-        <span MWFnodetype="MWFToolBarButton" MWFButtonImage="/x_component_ANN/$Main/default/tools/learn.png" title="开始训练" MWFButtonAction="learn" MWFButtonText="开始训练"></span>
-        <span MWFnodetype="MWFToolBarButton" MWFButtonImage="/x_component_ANN/$Main/default/tools/stop.png" title="停止生成训练集" MWFButtonAction="stopGenerate" MWFButtonText="停止生成训练集"></span>
-        <span MWFnodetype="MWFToolBarButton" MWFButtonImage="/x_component_ANN/$Main/default/tools/stop.png" title="停止训练" MWFButtonAction="stopLearn" MWFButtonText="停止训练"></span>
-        <span MWFnodetype="MWFToolBarButton" MWFButtonImage="/x_component_ANN/$Main/default/tools/reset.png" title="重置状态" MWFButtonAction="reset" MWFButtonText="重置状态"></span>
-        <span MWFnodetype="MWFToolBarButton" MWFButtonImage="/x_component_ANN/$Main/default/tools/close.png" title="关闭" MWFButtonAction="close" MWFButtonText="关闭"></span>
-        <span MWFnodetype="MWFToolBarButton" MWFButtonImage="/x_component_ANN/$Main/default/tools/remove.png" title="删除" MWFButtonAction="remove" MWFButtonText="删除"></span>
+        <span MWFnodetype="MWFToolBarButton" MWFButtonImage="../x_component_ANN/$Main/default/tools/edit.png" title="编辑" MWFButtonAction="edit" MWFButtonText="编辑"></span>
+        <span MWFnodetype="MWFToolBarButton" MWFButtonImage="../x_component_ANN/$Main/default/tools/save.png" title="保存" MWFButtonAction="save" MWFButtonText="保存"></span>
+        <span MWFnodetype="MWFToolBarButton" MWFButtonImage="../x_component_ANN/$Main/default/tools/generate.png" title="生成训练集" MWFButtonAction="generate" MWFButtonText="生成训练集"></span>
+        <span MWFnodetype="MWFToolBarButton" MWFButtonImage="../x_component_ANN/$Main/default/tools/learn.png" title="开始训练" MWFButtonAction="learn" MWFButtonText="开始训练"></span>
+        <span MWFnodetype="MWFToolBarButton" MWFButtonImage="../x_component_ANN/$Main/default/tools/stop.png" title="停止生成训练集" MWFButtonAction="stopGenerate" MWFButtonText="停止生成训练集"></span>
+        <span MWFnodetype="MWFToolBarButton" MWFButtonImage="../x_component_ANN/$Main/default/tools/stop.png" title="停止训练" MWFButtonAction="stopLearn" MWFButtonText="停止训练"></span>
+        <span MWFnodetype="MWFToolBarButton" MWFButtonImage="../x_component_ANN/$Main/default/tools/reset.png" title="重置状态" MWFButtonAction="reset" MWFButtonText="重置状态"></span>
+        <span MWFnodetype="MWFToolBarButton" MWFButtonImage="../x_component_ANN/$Main/default/tools/close.png" title="关闭" MWFButtonAction="close" MWFButtonText="关闭"></span>
+        <span MWFnodetype="MWFToolBarButton" MWFButtonImage="../x_component_ANN/$Main/default/tools/remove.png" title="删除" MWFButtonAction="remove" MWFButtonText="删除"></span>
 
     </div>
     <div class="o2_ann_modelContext_content">

o2web/source/x_component_ANN/$Main/default/model.html

@@ -1,6 +1,6 @@
 <div class="o2_ann_model_node">
     <div class="o2_ann_model_nodeIcon icon"></div>
-    <div class="o2_ann_model_nodeRight" title="{{ $.lp.status[$.data.status||'idle'] }}" style="background-image: url(/x_component_ANN/$Main/default/icon/{{$.data.status || 'idle'}}.png)"></div>
+    <div class="o2_ann_model_nodeRight" title="{{ $.lp.status[$.data.status||'idle'] }}" style="background-image: url(../x_component_ANN/$Main/default/icon/{{$.data.status || 'idle'}}.png)"></div>
     <div class="o2_ann_model_nodeContent">
         <div class="o2_ann_model_nodeContentName name">{{ $.data.name }}</div>
         <div class="o2_ann_model_nodeContentDate date">{{ $.data.updateTime }}</div>

o2web/source/x_component_ANN/$Main/default/style.css

@@ -13,7 +13,7 @@
     float: left;
     cursor: pointer;
     border-right: 0px solid #ffffff;
-    background: url(/x_component_ANN/$Main/default/icon/create.png) center center no-repeat;
+    background: url(../x_component_ANN/$Main/default/icon/create.png) center center no-repeat;
 }
 .o2_ann_topText {
     height: 50px;
@@ -34,7 +34,7 @@
     float: left;
     background-color: #484848;
     overflow: auto;
-    /*background-image: url(/x_component_ANN/$Main/default/icon/bg.jpg);*/
+    /*background-image: url(../x_component_ANN/$Main/default/icon/bg.jpg);*/
     /*background-size: cover;*/
     /*background-repeat: no-repeat;*/
 }
@@ -60,13 +60,13 @@
     /*width: 60px;*/
     /*height: 60px;*/
     /*float: left;*/
-    /*background: url(/x_component_ANN/$Main/default/icon/logo.png) center center no-repeat;*/
+    /*background: url(../x_component_ANN/$Main/default/icon/logo.png) center center no-repeat;*/
 /*}*/
 /*.o2_ann_leftTitleAction {*/
     /*width: 60px;*/
     /*height: 60px;*/
     /*float: right;*/
-    /*background: url(/x_component_ANN/$Main/default/icon/add.png) center center no-repeat;*/
+    /*background: url(../x_component_ANN/$Main/default/icon/add.png) center center no-repeat;*/
     /*cursor: pointer;*/
 /*}*/
 /*.o2_ann_leftTitleText {*/
@@ -90,7 +90,7 @@
     background-color: #333333;
 }
 .o2_ann_model_node .icon {
-    background: url(/x_component_ANN/$Main/default/icon/itemlogo.png) center right no-repeat;
+    background: url(../x_component_ANN/$Main/default/icon/itemlogo.png) center right no-repeat;
     width: 50px;
     height: 60px;
     float: left;
@@ -115,7 +115,7 @@
     background-color: #eeeeee;
 }
 .o2_ann_model_node_selected .icon {
-    background: url(/x_component_ANN/$Main/default/icon/itemlogo_selected.png) center right no-repeat;
+    background: url(../x_component_ANN/$Main/default/icon/itemlogo_selected.png) center right no-repeat;
     width: 50px;
     height: 60px;
     float: left;

o2web/source/x_component_ANN/Main.js

@@ -19,7 +19,7 @@ MWF.xApplication.ANN.Main = new Class({
         this.setOptions(options);
         this.desktop = desktop;
 
-        this.path = "/x_component_"+this.options.name.replace(/\./g, "_")+"/$Main/";
+        this.path = "../x_component_"+this.options.name.replace(/\./g, "_")+"/$Main/";
         this.options.icon = this.path+this.options.style+"/"+this.options.icon;
 
         //this.cssPath =this.path+this.options.style+"/css.wcss";
@@ -115,7 +115,7 @@ MWF.xApplication.ANN.Model = new Class({
             this.node.getElement(".o2_ann_model_nodeContentDate").set("text", this.data.updateTime);
             var rightIcon = this.node.getElement(".o2_ann_model_nodeRight");
             rightIcon.set("title", this.lp.status[this.data.status||'idle']);
-            rightIcon.setStyle("background-image", "url(/x_component_ANN/$Main/default/icon/"+(this.data.status || 'idle')+".png")
+            rightIcon.setStyle("background-image", "url(../x_component_ANN/$Main/default/icon/"+(this.data.status || 'idle')+".png")
         }.bind(this));
     },
 	load: function(){
@@ -133,7 +133,7 @@ MWF.xApplication.ANN.Model = new Class({
 			this.node = this.listNode.getLast();
             // var rightIcon = this.node.getElement(".o2_ann_model_nodeRight");
             // rightIcon.set("title", this.lp.status[this.data.status||'idle']);
-            // rightIcon.setStyle("background-image", "url(/x_component_ANN/$Main/default/icon/"+(this.data.status || 'idle')+".png")
+            // rightIcon.setStyle("background-image", "url(../x_component_ANN/$Main/default/icon/"+(this.data.status || 'idle')+".png")
 			if (callback) callback();
 		}.bind(this));
 	},
@@ -220,7 +220,7 @@ MWF.xApplication.ANN.Model.Context = new Class({
             this.lines = this.content.getElements(".o2_ann_modelContext_line");
 
             o2.widget.ace.load(function(){
-                o2.load("/o2_lib/ace/src-min-noconflict/ext-static_highlight.js", function(){
+                o2.load("../o2_lib/ace/src-min-noconflict/ext-static_highlight.js", function(){
                     this.loadContent();
                     this.loadToolbar();
 

o2web/source/x_component_AppCenter/$Main/default/css.wcss

@@ -29,7 +29,7 @@
         "float": "left",
         "width": "50px",
         "height": "50px",
-        "background": "url(/x_component_AppCenter/$Main/default/icon/create.png) no-repeat center center",
+        "background": "url(../x_component_AppCenter/$Main/default/icon/create.png) no-repeat center center",
         "cursor": "pointer",
         "border-right": "1px solid #EEE",
         "border-left": "0px solid #EEE"
@@ -38,7 +38,7 @@
         "float": "left",
         "width": "50px",
         "height": "50px",
-        "background": "url(/x_component_AppCenter/$Main/default/icon/setup.png) no-repeat center center",
+        "background": "url(../x_component_AppCenter/$Main/default/icon/setup.png) no-repeat center center",
         "cursor": "pointer",
         "border-right": "1px solid #EEE",
         "border-left": "0px solid #EEE"
@@ -57,7 +57,7 @@
         "width": "100px",
         "height": "100px",
         "float": "left",
-        "background": "url(/x_component_AppMarket/$Main/default/icon/default.png) center center no-repeat"
+        "background": "url(../x_component_AppMarket/$Main/default/icon/default.png) center center no-repeat"
     },
     "moduleSetupContentNode": {
         "width": "90%",
@@ -363,7 +363,7 @@
     "moduleSetupIconNode": {
         "width": "130px",
         "height": "130px",
-        "background": "url(/x_component_AppMarket/$Main/default/icon/logo1.png) center center no-repeat"
+        "background": "url(../x_component_AppMarket/$Main/default/icon/logo1.png) center center no-repeat"
     },
     "moduleSetupIconAreaNode": {
         "width": "130px",

o2web/source/x_component_AppMarket/$Main/default/css.wcss

@@ -46,7 +46,7 @@
     "moduleIconNode": {
         "width": "160px",
         "height": "160px",
-        "background-image": "url(/x_component_AppMarket/$Main/default/icon/logo1.png)",
+        "background-image": "url(../x_component_AppMarket/$Main/default/icon/logo1.png)",
         "background-repeat": "no-repeat",
         "background-position": "center"
     },
@@ -128,7 +128,7 @@
     "moduleSetupIconNode": {
         "width": "130px",
         "height": "130px",
-        "background": "url(/x_component_AppMarket/$Main/default/icon/logo1.png) center center no-repeat"
+        "background": "url(../x_component_AppMarket/$Main/default/icon/logo1.png) center center no-repeat"
     },
 
     "moduleSetupTitleContentNode": {