'ras'

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

@@ -28,14 +28,13 @@ public class ActionCommand extends BaseAction {
 	
 	
 	private static Logger logger = LoggerFactory.getLogger(ActionCommand.class);
-	ActionResult<Wo> execute(EffectivePerson effectivePerson,HttpServletRequest request, JsonElement jsonElement) throws Exception {
+	ActionResult<Wo> execute(HttpServletRequest request, 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());
 		String curServer = request.getLocalAddr();
-		
 		Wo wo = null;
 		if(nodeName.equalsIgnoreCase("*")) {
 			Nodes nodes = Config.nodes();

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

@@ -29,7 +29,7 @@ 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,HttpServletRequest request, String ctl, String nodeName , String nodePort, InputStream fileInputStream, FormDataContentDisposition disposition) throws Exception {
+	ActionResult<Wo> execute(HttpServletRequest request ,EffectivePerson effectivePerson, String ctl, String nodeName , String nodePort, InputStream fileInputStream, FormDataContentDisposition disposition) throws Exception {
 			ActionResult<Wo> result = new ActionResult<>();	
 			Wo wo  = null;
 			String curServer = request.getLocalAddr();
@@ -49,6 +49,7 @@ public class ActionUploadFile  extends BaseAction {
 						}
 					}
 				}
+				
 				logger.info("后当前服务器");
 				for(String node : nodes.keySet()) {
 					   //后当前服务器
@@ -107,7 +108,6 @@ public class ActionUploadFile  extends BaseAction {
 			}
 		} 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()));

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

@@ -45,7 +45,8 @@ public class CommandAction<Wo> extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<ActionCommand.Wo> result = new ActionResult<>();
 		try {
-			result = new ActionCommand().execute(effectivePerson,request, jsonElement);
+			
+			result = new ActionCommand().execute(request,effectivePerson, jsonElement);
 		} catch (Exception e) {
 			e.printStackTrace();
 			result.error(e);
@@ -85,7 +86,7 @@ public class CommandAction<Wo> extends StandardJaxrsAction {
 		ActionResult<ActionUploadFile.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = new ActionUploadFile().execute(effectivePerson, request ,ctl, nodeName, nodePort, fileInputStream, disposition);
+			result = new ActionUploadFile().execute(request , effectivePerson, ctl, nodeName, nodePort, fileInputStream, disposition);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);