|
|
|
@@ -23,7 +23,7 @@ public class ActionEnter { |
|
|
|
this.configManager = configManager; |
|
|
|
} |
|
|
|
|
|
|
|
public String exec(HttpServletRequest request) { |
|
|
|
public Object exec(HttpServletRequest request) { |
|
|
|
this.request = request; |
|
|
|
this.actionType = request.getParameter("action"); |
|
|
|
String callbackName = this.request.getParameter("callback"); |
|
|
|
@@ -34,7 +34,8 @@ public class ActionEnter { |
|
|
|
return new BaseState(false, AppInfo.ILLEGAL).toJSONString(); |
|
|
|
} |
|
|
|
|
|
|
|
return callbackName + "(" + this.invoke() + ");"; |
|
|
|
//return callbackName + "(" + this.invoke() + ");"; |
|
|
|
return this.invoke(); |
|
|
|
|
|
|
|
} else { |
|
|
|
return this.invoke(); |
|
|
|
@@ -42,7 +43,7 @@ public class ActionEnter { |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
public String invoke() { |
|
|
|
public Object invoke() { |
|
|
|
|
|
|
|
if (actionType == null || !ActionMap.mapping.containsKey(actionType)) { |
|
|
|
return new BaseState(false, AppInfo.INVALID_ACTION).toJSONString(); |
|
|
|
@@ -61,7 +62,7 @@ public class ActionEnter { |
|
|
|
switch (actionCode) { |
|
|
|
|
|
|
|
case ActionMap.CONFIG: |
|
|
|
return this.configManager.getAllConfig().toString(); |
|
|
|
return this.configManager.getAllConfig(); |
|
|
|
|
|
|
|
case ActionMap.UPLOAD_IMAGE: |
|
|
|
case ActionMap.UPLOAD_SCRAWL: |
|
|
|
|