Quellcode durchsuchen

cms_clear_proxy2

o2sword vor 5 Jahren
Ursprung
Commit
e0b77c7f43
21 geänderte Dateien mit 113 neuen und 190 gelöschten Zeilen
  1. 0 6
      o2server/pom.xml
  2. 2 6
      o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoAnonymousAction.java
  3. 2 5
      o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoConfigAction.java
  4. 1 4
      o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoExportAction.java
  5. 1 4
      o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoImportAction.java
  6. 15 18
      o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/CategoryInfoAction.java
  7. 6 9
      o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/CategoryInfoAnonymousAction.java
  8. 2 5
      o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/commend/DocumentCommendAction.java
  9. 8 11
      o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/DocumentCommentInfoAction.java
  10. 12 15
      o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/FileInfoAction.java
  11. 11 14
      o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/FormAction.java
  12. 2 5
      o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/image/ImageAction.java
  13. 2 4
      o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/output/OutputAction.java
  14. 14 15
      o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/PermissionAction.java
  15. 1 4
      o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/PermissionForDocumentAction.java
  16. 0 3
      o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/PermissionManagerAction.java
  17. 4 8
      o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryview/QueryViewAction.java
  18. 9 13
      o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/QueryViewDesignAction.java
  19. 12 18
      o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ScriptAction.java
  20. 6 10
      o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ScriptAnonymousAction.java
  21. 3 13
      o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/search/SearchFilterAction.java

+ 0 - 6
o2server/pom.xml

@@ -447,12 +447,6 @@
 				<artifactId>maven-jxr-plugin</artifactId>
 				<version>2.3</version>
 			</plugin>
-			<plugin>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 	<dependencyManagement>

+ 2 - 6
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoAnonymousAction.java

@@ -9,10 +9,8 @@ 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.jaxrs.proxy.StandardJaxrsActionProxy;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
-import com.x.cms.assemble.control.ThisApplication;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.*;
@@ -26,7 +24,6 @@ import java.util.List;
 @Path("anonymous/appinfo")
 public class AppInfoAnonymousAction extends StandardJaxrsAction {
 
-	private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
 	private static Logger logger = LoggerFactory.getLogger(AppInfoAnonymousAction.class);
 
 	@JaxrsMethodDescribe(value = "根据标识获取信息栏目信息对象.", action = ActionGetAnonymous.class)
@@ -38,7 +35,7 @@ public class AppInfoAnonymousAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<BaseAction.Wo> result = new ActionResult<>();
 		try {
-			result = ((ActionGetAnonymous)proxy.getProxy(ActionGetAnonymous.class)).execute( request, effectivePerson, flag );
+			result = new ActionGetAnonymous().execute( request, effectivePerson, flag );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionAppInfoProcess(e, "根据指定ID查询应用栏目信息对象时发生异常。flag:" + flag );
@@ -60,8 +57,7 @@ public class AppInfoAnonymousAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<List<ActionListNextWithFilterAnonymous.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListNextWithFilterAnonymous)proxy.getProxy(ActionListNextWithFilterAnonymous.class))
-					.execute(request, effectivePerson, id, count, jsonElement );
+			result = new ActionListNextWithFilterAnonymous().execute(request, effectivePerson, id, count, jsonElement );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionAppInfoProcess(e, "查询栏目信息对象时发生异常");

+ 2 - 5
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoConfigAction.java

@@ -10,10 +10,8 @@ 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.jaxrs.WoText;
-import com.x.base.core.project.jaxrs.proxy.StandardJaxrsActionProxy;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
-import com.x.cms.assemble.control.ThisApplication;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.*;
@@ -26,7 +24,6 @@ import javax.ws.rs.core.MediaType;
 @JaxrsDescribe("信息发布(CMS)-栏目配置支持信息(APPINFOCONFIG)管理服务")
 public class AppInfoConfigAction extends StandardJaxrsAction {
 
-	private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
 	private static  Logger logger = LoggerFactory.getLogger(AppInfoConfigAction.class);
 
 	@JaxrsMethodDescribe(value = "更新栏目配置支持信息,JSON格式。", action = ActionSaveConfig.class)
@@ -42,7 +39,7 @@ public class AppInfoConfigAction extends StandardJaxrsAction {
 		Boolean check = true;
 		if (check) {
 			try {
-				result = ((ActionSaveConfig)proxy.getProxy(ActionSaveConfig.class)).execute( request, effectivePerson, appId, jsonElement );
+				result = new ActionSaveConfig().execute( request, effectivePerson, appId, jsonElement );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				Exception exception = new ExceptionAppInfoProcess(e, "栏目信息保存时发生异常。");
@@ -63,7 +60,7 @@ public class AppInfoConfigAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<WoText> result = new ActionResult<>();
 		try {
-			result = ((ActionGetConfig)proxy.getProxy(ActionGetConfig.class)).execute( request, effectivePerson, id );
+			result = new ActionGetConfig().execute( request, effectivePerson, id );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionAppInfoProcess(e, "根据指定ID查询应用栏目配置支持信息时发生异常。id:" + id );

+ 1 - 4
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoExportAction.java

@@ -8,10 +8,8 @@ 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.jaxrs.proxy.StandardJaxrsActionProxy;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
-import com.x.cms.assemble.control.ThisApplication;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.*;
@@ -24,7 +22,6 @@ import javax.ws.rs.core.MediaType;
 @JaxrsDescribe("信息发布栏目导出服务")
 public class AppInfoExportAction extends StandardJaxrsAction {
 
-    private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
 	private static  Logger logger = LoggerFactory.getLogger(AppInfoExportAction.class);
 
     @JaxrsMethodDescribe(value = "根据ID导出栏目信息对象所有设计.", action = ActionAppInfoExport.class)
@@ -36,7 +33,7 @@ public class AppInfoExportAction extends StandardJaxrsAction {
         EffectivePerson effectivePerson = this.effectivePerson(request);
         ActionResult<ActionAppInfoExport.Wo> result = new ActionResult<>();
         try {
-            result = ((ActionAppInfoExport)proxy.getProxy(ActionAppInfoExport.class)).execute( request, effectivePerson, id );
+            result = new ActionAppInfoExport().execute( request, effectivePerson, id );
         } catch (Exception e) {
             result = new ActionResult<>();
             Exception exception = new ExceptionAppInfoProcess(e, "根据指定ID导出栏目信息对象时发生异常。ID:" + id );

+ 1 - 4
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoImportAction.java

@@ -8,10 +8,8 @@ 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.jaxrs.proxy.StandardJaxrsActionProxy;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
-import com.x.cms.assemble.control.ThisApplication;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.*;
@@ -24,7 +22,6 @@ import javax.ws.rs.core.MediaType;
 @JaxrsDescribe("信息发布栏目导入服务")
 public class AppInfoImportAction extends StandardJaxrsAction {
 
-    private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
 	private static  Logger logger = LoggerFactory.getLogger(AppInfoImportAction.class);
 
     @JaxrsMethodDescribe(value = "根据别名获取信息栏目信息对象.", action = ActionGetByAlias.class)
@@ -36,7 +33,7 @@ public class AppInfoImportAction extends StandardJaxrsAction {
         EffectivePerson effectivePerson = this.effectivePerson(request);
         ActionResult<BaseAction.Wo> result = new ActionResult<>();
         try {
-            result = ((ActionGetByAlias)proxy.getProxy(ActionGetByAlias.class)).execute(request, effectivePerson, id);
+            result = new ActionGetByAlias().execute(request, effectivePerson, id);
         } catch (Exception e) {
             result = new ActionResult<>();
             Exception exception = new ExceptionAppInfoProcess(e, "根据指定应用唯一标识查询应用栏目信息对象时发生异常。ALIAS:" + id);

+ 15 - 18
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/CategoryInfoAction.java

@@ -9,10 +9,8 @@ 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.jaxrs.proxy.StandardJaxrsActionProxy;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
-import com.x.cms.assemble.control.ThisApplication;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.*;
@@ -27,7 +25,6 @@ import java.util.List;
 @JaxrsDescribe("信息发布内容分类管理")
 public class CategoryInfoAction extends StandardJaxrsAction{
 
-	private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
 	private static  Logger logger = LoggerFactory.getLogger( CategoryInfoAction.class );
 	
 	@JaxrsMethodDescribe(value = "创建或者更新信息分类信息对象.", action = ActionSave.class)
@@ -40,7 +37,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionSave)proxy.getProxy(ActionSave.class)).execute( request, effectivePerson, jsonElement );
+				result = new ActionSave().execute( request, effectivePerson, jsonElement );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				Exception exception = new ExceptionCategoryInfoProcess( e, "分类信息在保存时发生异常." );
@@ -62,7 +59,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<ActionSaveImportView.Wo> result = null;
 		try {
-			result = ((ActionSaveImportView)proxy.getProxy(ActionSaveImportView.class)).execute( request, effectivePerson, categoryId, jsonElement );
+			result = new ActionSaveImportView().execute( request, effectivePerson, categoryId, jsonElement );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionCategoryInfoProcess( e, "为分类绑定导入数据的列表ID时发生异常。categoryId:"+ categoryId );
@@ -83,7 +80,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionSaveExtContent)proxy.getProxy(ActionSaveExtContent.class)).execute( request, effectivePerson, jsonElement );
+				result = new ActionSaveExtContent().execute( request, effectivePerson, jsonElement );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				Exception exception = new ExceptionCategoryInfoProcess( e, "分类扩展信息在保存时发生异常." );
@@ -104,7 +101,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<ActionDelete.Wo> result = new ActionResult<>();
 		try {
-			result = ((ActionDelete)proxy.getProxy(ActionDelete.class)).execute( request, id, effectivePerson );
+			result = new ActionDelete().execute( request, id, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionCategoryInfoProcess( e, "分类信息在删除时发生异常。ID:" + id );
@@ -124,7 +121,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<ActionEraseDocumentWithCategory.Wo> result = new ActionResult<>();
 		try {
-			result = ((ActionEraseDocumentWithCategory)proxy.getProxy(ActionEraseDocumentWithCategory.class)).execute(request, id, effectivePerson );
+			result = new ActionEraseDocumentWithCategory().execute(request, id, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionCategoryInfoProcess(e, "根据分类ID删除所有的信息文档发生未知异常,ID:" + id);
@@ -144,7 +141,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<List<ActionListWhatICanView_Article.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListWhatICanView_Article)proxy.getProxy(ActionListWhatICanView_Article.class)).execute( request, appId, effectivePerson );
+			result = new ActionListWhatICanView_Article().execute( request, appId, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionCategoryInfoProcess( e, "根据指定应用栏目ID查询分类信息列表时发生异常。ID:" + appId );
@@ -164,7 +161,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<List<ActionListWhatICanView_Data.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListWhatICanView_Data)proxy.getProxy(ActionListWhatICanView_Data.class)).execute( request, appId, effectivePerson );
+			result = new ActionListWhatICanView_Data().execute( request, appId, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionCategoryInfoProcess( e, "根据指定应用栏目ID查询分类信息列表时发生异常。ID:" + appId );
@@ -184,7 +181,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<List<ActionListWhatICanView_AllType.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListWhatICanView_AllType)proxy.getProxy(ActionListWhatICanView_AllType.class)).execute( request, appId, effectivePerson );
+			result = new ActionListWhatICanView_AllType().execute( request, appId, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionCategoryInfoProcess( e, "根据指定应用栏目ID查询分类信息列表时发生异常。ID:" + appId );
@@ -204,7 +201,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<List<ActionListWhatICanPublish.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListWhatICanPublish)proxy.getProxy(ActionListWhatICanPublish.class)).execute( request, appId, effectivePerson );
+			result = new ActionListWhatICanPublish().execute( request, appId, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionCategoryInfoProcess( e, "根据应用栏目ID查询分类信息对象时发生异常。AppId:" + appId );
@@ -223,7 +220,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<List<ActionListAll.Wo>> result = null;
 		try {
-			result = ((ActionListAll)proxy.getProxy(ActionListAll.class)).execute( request, effectivePerson );
+			result = new ActionListAll().execute( request, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionCategoryInfoProcess( e, "查询所有分类信息对象时发生异常。" );
@@ -243,7 +240,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<ActionGet.Wo> result = null;
 		try {
-			result = ((ActionGet)proxy.getProxy(ActionGet.class)).execute( request, flag, effectivePerson );
+			result = new ActionGet().execute( request, flag, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionCategoryInfoProcess( e, "根据ID查询分类信息对象时发生异常。flag:" + flag );
@@ -265,7 +262,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionQueryGetControl)proxy.getProxy(ActionQueryGetControl.class)).execute( request, id, effectivePerson );
+				result = new ActionQueryGetControl().execute( request, id, effectivePerson );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				result.error( e );
@@ -285,7 +282,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<ActionGetByAlias.Wo> result = null;
 		try {
-			result = ((ActionGetByAlias)proxy.getProxy(ActionGetByAlias.class)).execute( request, alias, effectivePerson );
+			result = new ActionGetByAlias().execute( request, alias, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionCategoryInfoProcess( e, "根据标识查询分类信息对象时发生异常。ALIAS:"+ alias );
@@ -308,7 +305,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<List<ActionListNextWithFilter.Wo>> result = null;
 		try {
-			result = ((ActionListNextWithFilter)proxy.getProxy(ActionListNextWithFilter.class)).execute( request, effectivePerson, id, count, jsonElement);
+			result = new ActionListNextWithFilter().execute( request, effectivePerson, id, count, jsonElement);
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionCategoryInfoProcess( e, "列示根据过滤条件的信息分类时发生异常。" );
@@ -331,7 +328,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<List<ActionListPrevWithFilter.Wo>> result = null;
 		try {
-			result = ((ActionListPrevWithFilter)proxy.getProxy(ActionListPrevWithFilter.class)).execute( request, effectivePerson, id, count, jsonElement);
+			result = new ActionListPrevWithFilter().execute( request, effectivePerson, id, count, jsonElement);
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionCategoryInfoProcess( e, "列示根据过滤条件的信息分类时发生异常。" );

+ 6 - 9
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/CategoryInfoAnonymousAction.java

@@ -9,10 +9,8 @@ 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.jaxrs.proxy.StandardJaxrsActionProxy;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
-import com.x.cms.assemble.control.ThisApplication;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.*;
@@ -27,7 +25,6 @@ import java.util.List;
 @JaxrsDescribe("可匿名访问的信息发布内容分类管理服务")
 public class CategoryInfoAnonymousAction extends StandardJaxrsAction{
 
-	private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
 	private static  Logger logger = LoggerFactory.getLogger( CategoryInfoAnonymousAction.class );
 	
 	@JaxrsMethodDescribe(value = "根据Flag获取分类信息对象.", action = ActionGetAnonymous.class)
@@ -40,7 +37,7 @@ public class CategoryInfoAnonymousAction extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<ActionGetAnonymous.Wo> result = null;
 		try {
-			result = ((ActionGetAnonymous)proxy.getProxy(ActionGetAnonymous.class)).execute( request, flag, effectivePerson );
+			result = new ActionGetAnonymous().execute( request, flag, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionCategoryInfoProcess( e, "根据ID查询分类信息对象时发生异常。flag:" + flag );
@@ -63,7 +60,7 @@ public class CategoryInfoAnonymousAction extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<List<ActionListNextWithFilterAnonymous.Wo>> result = null;
 		try {
-			result = ((ActionListNextWithFilterAnonymous)proxy.getProxy(ActionListNextWithFilterAnonymous.class)).execute( request, effectivePerson, id, count, jsonElement);
+			result = new ActionListNextWithFilterAnonymous().execute( request, effectivePerson, id, count, jsonElement);
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionCategoryInfoProcess( e, "列示根据过滤条件的信息分类时发生异常。" );
@@ -83,7 +80,7 @@ public class CategoryInfoAnonymousAction extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<List<ActionListWhatICanView_Article.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListWhatICanView_Article)proxy.getProxy(ActionListWhatICanView_Article.class)).execute( request, appId, effectivePerson );
+			result = new ActionListWhatICanView_Article().execute( request, appId, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionCategoryInfoProcess( e, "根据指定应用栏目ID查询分类信息列表时发生异常。ID:" + appId );
@@ -103,7 +100,7 @@ public class CategoryInfoAnonymousAction extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<List<ActionListWhatICanView_Data.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListWhatICanView_Data)proxy.getProxy(ActionListWhatICanView_Data.class)).execute( request, appId, effectivePerson );
+			result = new ActionListWhatICanView_Data().execute( request, appId, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionCategoryInfoProcess( e, "根据指定应用栏目ID查询分类信息列表时发生异常。ID:" + appId );
@@ -123,7 +120,7 @@ public class CategoryInfoAnonymousAction extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<List<ActionListWhatICanView_AllType.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListWhatICanView_AllType)proxy.getProxy(ActionListWhatICanView_AllType.class)).execute( request, appId, effectivePerson );
+			result = new ActionListWhatICanView_AllType().execute( request, appId, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionCategoryInfoProcess( e, "根据指定应用栏目ID查询分类信息列表时发生异常。ID:" + appId );
@@ -143,7 +140,7 @@ public class CategoryInfoAnonymousAction extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<List<ActionListWhatICanPublish.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListWhatICanPublish)proxy.getProxy(ActionListWhatICanPublish.class)).execute( request, appId, effectivePerson );
+			result = new ActionListWhatICanPublish().execute( request, appId, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionCategoryInfoProcess( e, "根据应用栏目ID查询分类信息对象时发生异常。AppId:" + appId );

+ 2 - 5
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/commend/DocumentCommendAction.java

@@ -9,10 +9,8 @@ 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.jaxrs.proxy.StandardJaxrsActionProxy;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
-import com.x.cms.assemble.control.ThisApplication;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.*;
@@ -26,7 +24,6 @@ import java.util.List;
 @JaxrsDescribe("点赞信息管理")
 public class DocumentCommendAction extends StandardJaxrsAction {
 
-	private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
 	private Logger logger = LoggerFactory.getLogger(DocumentCommendAction.class);
 
 	@JaxrsMethodDescribe(value = "根据标识获取点赞对象.", action = ActionGet.class)
@@ -38,7 +35,7 @@ public class DocumentCommendAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<ActionGet.Wo> result = new ActionResult<>();
 		try {
-			result = ((ActionGet)proxy.getProxy(ActionGet.class)).execute( request, effectivePerson, id );
+			result = new ActionGet().execute( request, effectivePerson, id );
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -57,7 +54,7 @@ public class DocumentCommendAction extends StandardJaxrsAction {
 		ActionResult<List<ActionListPaging.Wo>> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionListPaging)proxy.getProxy(ActionListPaging.class)).execute(effectivePerson, page, size, jsonElement);
+			result = new ActionListPaging().execute(effectivePerson, page, size, jsonElement);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, jsonElement);
 			result.error(e);

+ 8 - 11
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/DocumentCommentInfoAction.java

@@ -9,10 +9,8 @@ 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.jaxrs.proxy.StandardJaxrsActionProxy;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
-import com.x.cms.assemble.control.ThisApplication;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.*;
@@ -26,7 +24,6 @@ import java.util.List;
 @JaxrsDescribe("评论信息管理")
 public class DocumentCommentInfoAction extends StandardJaxrsAction {
 
-	private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
 	private Logger logger = LoggerFactory.getLogger(DocumentCommentInfoAction.class);
 
 	@JaxrsMethodDescribe(value = "根据标识获取评论信息对象.", action = ActionGet.class)
@@ -38,7 +35,7 @@ public class DocumentCommentInfoAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<ActionGet.Wo> result = new ActionResult<>();
 		try {
-			result = ((ActionGet)proxy.getProxy(ActionGet.class)).execute( request, effectivePerson, id );
+			result = new ActionGet().execute( request, effectivePerson, id );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionCommentQuery(e, "根据指定ID查询评论信息对象时发生异常。id:" + id );
@@ -60,7 +57,7 @@ public class DocumentCommentInfoAction extends StandardJaxrsAction {
 		ActionResult<List<ActionListPageWithFilter.Wo>> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionListPageWithFilter)proxy.getProxy(ActionListPageWithFilter.class)).execute(request, effectivePerson, page, size, jsonElement );
+			result = new ActionListPageWithFilter().execute(request, effectivePerson, page, size, jsonElement );
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -80,7 +77,7 @@ public class DocumentCommentInfoAction extends StandardJaxrsAction {
 		ActionResult<List<ActionListPrevWithFilter.Wo>> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionListPrevWithFilter)proxy.getProxy(ActionListPrevWithFilter.class)).execute(request, effectivePerson, id, count, jsonElement);
+			result = new ActionListPrevWithFilter().execute(request, effectivePerson, id, count, jsonElement);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -100,7 +97,7 @@ public class DocumentCommentInfoAction extends StandardJaxrsAction {
 		ActionResult<List<ActionListNextWithFilter.Wo>> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionListNextWithFilter)proxy.getProxy(ActionListNextWithFilter.class)).execute(request, effectivePerson, id, count, jsonElement);
+			result = new ActionListNextWithFilter().execute(request, effectivePerson, id, count, jsonElement);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -118,7 +115,7 @@ public class DocumentCommentInfoAction extends StandardJaxrsAction {
 		ActionResult<ActionSave.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionSave)proxy.getProxy(ActionSave.class)).execute(request, effectivePerson, jsonElement);
+			result = new ActionSave().execute(request, effectivePerson, jsonElement);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -137,7 +134,7 @@ public class DocumentCommentInfoAction extends StandardJaxrsAction {
 		ActionResult<ActionDelete.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionDelete)proxy.getProxy(ActionDelete.class)).execute(request, effectivePerson, id);
+			result = new ActionDelete().execute(request, effectivePerson, id);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -157,7 +154,7 @@ public class DocumentCommentInfoAction extends StandardJaxrsAction {
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionPersistCommend)proxy.getProxy(ActionPersistCommend.class)).execute( request, id, effectivePerson );
+				result = new ActionPersistCommend().execute( request, id, effectivePerson );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				result.error( e );
@@ -179,7 +176,7 @@ public class DocumentCommentInfoAction extends StandardJaxrsAction {
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionPersistUnCommend)proxy.getProxy(ActionPersistUnCommend.class)).execute( request, id, effectivePerson );
+				result = new ActionPersistUnCommend().execute( request, id, effectivePerson );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				result.error( e );

+ 12 - 15
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/FileInfoAction.java

@@ -10,10 +10,8 @@ import com.x.base.core.project.http.HttpMediaType;
 import com.x.base.core.project.http.WrapOutString;
 import com.x.base.core.project.jaxrs.ResponseFactory;
 import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-import com.x.base.core.project.jaxrs.proxy.StandardJaxrsActionProxy;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
-import com.x.cms.assemble.control.ThisApplication;
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.glassfish.jersey.media.multipart.FormDataParam;
 
@@ -29,7 +27,6 @@ import java.util.List;
 @JaxrsDescribe("附件信息管理")
 public class FileInfoAction extends StandardJaxrsAction{
 
-	private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
 	private static  Logger logger = LoggerFactory.getLogger( FileInfoAction.class );
 	
 	@JaxrsMethodDescribe(value = "获取全部的文件或者附件列表.", action = ActionListAll.class)
@@ -41,7 +38,7 @@ public class FileInfoAction extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<List<ActionListAll.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListAll)proxy.getProxy(ActionListAll.class)).execute( request, effectivePerson );
+			result = new ActionListAll().execute( request, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			result.error( e );
@@ -60,7 +57,7 @@ public class FileInfoAction extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<List<ActionListByDocId.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListByDocId)proxy.getProxy(ActionListByDocId.class)).execute( request, effectivePerson, documentId );
+			result = new ActionListByDocId().execute( request, effectivePerson, documentId );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			result.error( e );
@@ -80,7 +77,7 @@ public class FileInfoAction extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<ActionGet.Wo> result = new ActionResult<>();
 		try {
-			result = ((ActionGet)proxy.getProxy(ActionGet.class)).execute( request, effectivePerson, id, documentId );
+			result = new ActionGet().execute( request, effectivePerson, id, documentId );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			result.error( e );
@@ -99,7 +96,7 @@ public class FileInfoAction extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<ActionDelete.Wo> result = new ActionResult<>();
 		try {
-			result = ((ActionDelete)proxy.getProxy(ActionDelete.class)).execute( request, effectivePerson, id );
+			result = new ActionDelete().execute( request, effectivePerson, id );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			result.error( e );
@@ -119,7 +116,7 @@ public class FileInfoAction extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<WrapOutString> result = new ActionResult<>();
 		try {
-			result = ((ActionImageToBase64)proxy.getProxy(ActionImageToBase64.class)).execute( request, effectivePerson, id, size );
+			result = new ActionImageToBase64().execute( request, effectivePerson, id, size );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			result.error( e );
@@ -138,7 +135,7 @@ public class FileInfoAction extends StandardJaxrsAction{
 		ActionResult<ActionFileDownload.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionFileDownload)proxy.getProxy(ActionFileDownload.class)).execute(request, effectivePerson, id);
+			result = new ActionFileDownload().execute(request, effectivePerson, id);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -156,7 +153,7 @@ public class FileInfoAction extends StandardJaxrsAction{
 		ActionResult<ActionFileDownloadStream.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionFileDownloadStream)proxy.getProxy(ActionFileDownloadStream.class)).execute(request, effectivePerson, id );
+			result = new ActionFileDownloadStream().execute(request, effectivePerson, id );
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -175,7 +172,7 @@ public class FileInfoAction extends StandardJaxrsAction{
 		ActionResult<ActionFileEdit.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionFileEdit)proxy.getProxy(ActionFileEdit.class)).execute( request, effectivePerson, id, docId, jsonElement);
+			result = new ActionFileEdit().execute( request, effectivePerson, id, docId, jsonElement);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -198,7 +195,7 @@ public class FileInfoAction extends StandardJaxrsAction{
 		ActionResult<ActionFileUpload.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionFileUpload)proxy.getProxy(ActionFileUpload.class)).execute(request, effectivePerson, docId, site, fileName, bytes, disposition);
+			result = new ActionFileUpload().execute(request, effectivePerson, docId, site, fileName, bytes, disposition);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -222,7 +219,7 @@ public class FileInfoAction extends StandardJaxrsAction{
 		ActionResult<ActionFileUpdate.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionFileUpdate)proxy.getProxy(ActionFileUpdate.class)).execute(request, effectivePerson, docId, id, site, fileName, bytes, disposition);
+			result = new ActionFileUpdate().execute(request, effectivePerson, docId, id, site, fileName, bytes, disposition);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -245,7 +242,7 @@ public class FileInfoAction extends StandardJaxrsAction{
 		ActionResult<ActionFileUploadCallback.Wo<ActionFileUploadCallback.WoObject>> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionFileUploadCallback)proxy.getProxy(ActionFileUploadCallback.class)).execute(request, effectivePerson, docId, callback, site, fileName, bytes, disposition);
+			result = new ActionFileUploadCallback().execute(request, effectivePerson, docId, callback, site, fileName, bytes, disposition);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -270,7 +267,7 @@ public class FileInfoAction extends StandardJaxrsAction{
 		ActionResult<ActionFileUpdateCallback.Wo<ActionFileUpdateCallback.WoObject>> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionFileUpdateCallback)proxy.getProxy(ActionFileUpdateCallback.class)).execute(request, effectivePerson, docId, id, callback, site, fileName, bytes, disposition);
+			result = new ActionFileUpdateCallback().execute(request, effectivePerson, docId, id, callback, site, fileName, bytes, disposition);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);

+ 11 - 14
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/FormAction.java

@@ -7,10 +7,8 @@ import com.x.base.core.project.annotation.JaxrsParameterDescribe;
 import com.x.base.core.project.http.*;
 import com.x.base.core.project.jaxrs.ResponseFactory;
 import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-import com.x.base.core.project.jaxrs.proxy.StandardJaxrsActionProxy;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
-import com.x.cms.assemble.control.ThisApplication;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.*;
@@ -24,7 +22,6 @@ import java.util.List;
 @JaxrsDescribe("表单信息管理")
 public class FormAction extends StandardJaxrsAction {
 
-	private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
 	private static  Logger logger = LoggerFactory.getLogger( FormAction.class );
 
 	@JaxrsMethodDescribe(value = "获取全部的表单模板列表.", action = ActionListAll.class)
@@ -36,7 +33,7 @@ public class FormAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<List<ActionListAll.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListAll)proxy.getProxy(ActionListAll.class)).execute( request, effectivePerson );
+			result = new ActionListAll().execute( request, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionServiceLogic( e, "系统在查询所有CMS表单时发生异常。" );
@@ -56,7 +53,7 @@ public class FormAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<List<ActionListByApp.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListByApp)proxy.getProxy(ActionListByApp.class)).execute( request, effectivePerson, appId );
+			result = new ActionListByApp().execute( request, effectivePerson, appId );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionServiceLogic( e, "系统在根据栏目ID查询表单时发生异常。" );
@@ -76,7 +73,7 @@ public class FormAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<ActionGet.Wo> result = new ActionResult<>();
 		try {
-			result = ((ActionGet)proxy.getProxy(ActionGet.class)).execute( request, effectivePerson, id );
+			result = new ActionGet().execute( request, effectivePerson, id );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionServiceLogic( e, "系统在根据ID查询表单时发生异常。" );
@@ -97,7 +94,7 @@ public class FormAction extends StandardJaxrsAction {
 		ActionResult<ActionGetWithAppInfo.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionGetWithAppInfo)proxy.getProxy(ActionGetWithAppInfo.class)).execute(request, effectivePerson, appFlag, formFlag);
+			result = new ActionGetWithAppInfo().execute(request, effectivePerson, appFlag, formFlag);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -116,7 +113,7 @@ public class FormAction extends StandardJaxrsAction {
 		
 		if( check ){
 			try {
-				result = ((ActionSave)proxy.getProxy(ActionSave.class)).execute( request, effectivePerson, null, jsonElement );
+				result = new ActionSave().execute( request, effectivePerson, null, jsonElement );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				result.error( e );
@@ -139,7 +136,7 @@ public class FormAction extends StandardJaxrsAction {
 
 		if( check ){
 			try {
-				result = ((ActionSave)proxy.getProxy(ActionSave.class)).execute( request, effectivePerson, id, jsonElement );
+				result = new ActionSave().execute( request, effectivePerson, id, jsonElement );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				result.error( e );
@@ -159,7 +156,7 @@ public class FormAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<WrapOutId> result = new ActionResult<>();
 		try {
-			result = ((ActionDelete)proxy.getProxy(ActionDelete.class)).execute( request, effectivePerson, id );
+			result = new ActionDelete().execute( request, effectivePerson, id );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionServiceLogic( e, "系统在根据ID删除表单时发生异常。" );
@@ -182,7 +179,7 @@ public class FormAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<List<ActionListNextWithFilter.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListNextWithFilter)proxy.getProxy(ActionListNextWithFilter.class)).execute( request, effectivePerson, id, count, appId, jsonElement );
+			result = new ActionListNextWithFilter().execute( request, effectivePerson, id, count, appId, jsonElement );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionServiceLogic( e, "系统在查询所有CMS表单时发生异常。" );
@@ -205,7 +202,7 @@ public class FormAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<List<ActionListPrevWithFilter.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListPrevWithFilter)proxy.getProxy(ActionListPrevWithFilter.class)).execute( request, effectivePerson, id, count, appId, jsonElement );
+			result = new ActionListPrevWithFilter().execute( request, effectivePerson, id, count, appId, jsonElement );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionServiceLogic( e, "系统在查询所有CMS表单时发生异常。" );
@@ -226,7 +223,7 @@ public class FormAction extends StandardJaxrsAction {
 		ActionResult<WrapOutMap> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionListFormFieldWithAppInfo)proxy.getProxy(ActionListFormFieldWithAppInfo.class)).execute(applicationId);
+			result = new ActionListFormFieldWithAppInfo().execute(applicationId);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -244,7 +241,7 @@ public class FormAction extends StandardJaxrsAction {
 		ActionResult<WrapOutMap> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionListFormFieldWithForm)proxy.getProxy(ActionListFormFieldWithForm.class)).execute(id);
+			result = new ActionListFormFieldWithForm().execute(id);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);

+ 2 - 5
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/image/ImageAction.java

@@ -9,10 +9,8 @@ import com.x.base.core.project.http.HttpMediaType;
 import com.x.base.core.project.http.WrapOutString;
 import com.x.base.core.project.jaxrs.ResponseFactory;
 import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-import com.x.base.core.project.jaxrs.proxy.StandardJaxrsActionProxy;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
-import com.x.cms.assemble.control.ThisApplication;
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.glassfish.jersey.media.multipart.FormDataParam;
 
@@ -27,7 +25,6 @@ import javax.ws.rs.core.MediaType;
 @JaxrsDescribe("附件信息管理")
 public class ImageAction extends StandardJaxrsAction{
 
-	private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
 	private static  Logger logger = LoggerFactory.getLogger( ImageAction.class );
 	
 	@JaxrsMethodDescribe(value = "将上传的图片传为base64.", action = ActionImageBase64Encode.class)
@@ -43,7 +40,7 @@ public class ImageAction extends StandardJaxrsAction{
 		ActionResult<WrapOutString> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionImageBase64Encode)proxy.getProxy(ActionImageBase64Encode.class)).execute(request, effectivePerson, size, bytes, disposition);
+			result = new ActionImageBase64Encode().execute(request, effectivePerson, size, bytes, disposition);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -64,7 +61,7 @@ public class ImageAction extends StandardJaxrsAction{
 		ActionResult<ActionImageChangeSize.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionImageChangeSize)proxy.getProxy(ActionImageChangeSize.class)).execute(request, effectivePerson, id, width, height);
+			result = new ActionImageChangeSize().execute(request, effectivePerson, id, width, height);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);

+ 2 - 4
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/output/OutputAction.java

@@ -26,8 +26,6 @@ import java.util.List;
 @JaxrsDescribe("导出CMS")
 public class OutputAction extends StandardJaxrsAction {
 
-	private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
-
 	private static Logger logger = LoggerFactory.getLogger(OutputAction.class);
 
 	@JaxrsMethodDescribe(value = "选择栏目结构.", action = ActionSelect.class)
@@ -41,7 +39,7 @@ public class OutputAction extends StandardJaxrsAction {
 		ActionResult<ActionSelect.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionSelect)proxy.getProxy(ActionSelect.class)).execute(effectivePerson, appInfoFlag, jsonElement);
+			result = new ActionSelect().execute(effectivePerson, appInfoFlag, jsonElement);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, jsonElement);
 			result.error(e);
@@ -58,7 +56,7 @@ public class OutputAction extends StandardJaxrsAction {
 		ActionResult<List<ActionList.Wo>> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionList)proxy.getProxy(ActionList.class)).execute(effectivePerson);
+			result = new ActionList().execute(effectivePerson);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);

+ 14 - 15
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/PermissionAction.java

@@ -25,7 +25,6 @@ import javax.ws.rs.core.MediaType;
 @JaxrsDescribe("栏目分类权限配置操作")
 public class PermissionAction extends StandardJaxrsAction {
 
-	private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
 	private static  Logger logger = LoggerFactory.getLogger( PermissionAction.class );
 
 	@JaxrsMethodDescribe(value = "查询登录用户是否指定栏目的管理员.", action = ActionIsAppInfoManager.class)
@@ -40,7 +39,7 @@ public class PermissionAction extends StandardJaxrsAction {
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionIsAppInfoManager)proxy.getProxy(ActionIsAppInfoManager.class)).execute( request, effectivePerson, id );
+				result = new ActionIsAppInfoManager().execute( request, effectivePerson, id );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				Exception exception = new ExceptionAppCategoryAdminProcess( e, "查询登录用户是否指定栏目的管理员时发生异常。" );
@@ -63,7 +62,7 @@ public class PermissionAction extends StandardJaxrsAction {
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionIsCategoryInfoManager)proxy.getProxy(ActionIsCategoryInfoManager.class)).execute( request, effectivePerson, id );
+				result = new ActionIsCategoryInfoManager().execute( request, effectivePerson, id );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				Exception exception = new ExceptionAppCategoryAdminProcess( e, "查询登录用户是否指定分类的管理员时发生异常。" );
@@ -86,7 +85,7 @@ public class PermissionAction extends StandardJaxrsAction {
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionListAppInfoManagers)proxy.getProxy(ActionListAppInfoManagers.class)).execute( request, effectivePerson, id );
+				result = new ActionListAppInfoManagers().execute( request, effectivePerson, id );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				Exception exception = new ExceptionAppCategoryAdminProcess( e, "查询栏目管理员信息列表时发生异常。" );
@@ -109,7 +108,7 @@ public class PermissionAction extends StandardJaxrsAction {
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionListAppInfoPublishers)proxy.getProxy(ActionListAppInfoPublishers.class)).execute( request, effectivePerson, id );
+				result = new ActionListAppInfoPublishers().execute( request, effectivePerson, id );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				Exception exception = new ExceptionAppCategoryAdminProcess( e, "查询栏目发布者信息列表时发生异常。" );
@@ -132,7 +131,7 @@ public class PermissionAction extends StandardJaxrsAction {
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionListAppInfoViewers)proxy.getProxy(ActionListAppInfoViewers.class)).execute( request, effectivePerson, id );
+				result = new ActionListAppInfoViewers().execute( request, effectivePerson, id );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				Exception exception = new ExceptionAppCategoryAdminProcess( e, "查询栏目可见范围信息时发生异常。" );
@@ -155,7 +154,7 @@ public class PermissionAction extends StandardJaxrsAction {
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionListCategoryInfoManagers)proxy.getProxy(ActionListCategoryInfoManagers.class)).execute( request, effectivePerson, id );
+				result = new ActionListCategoryInfoManagers().execute( request, effectivePerson, id );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				Exception exception = new ExceptionAppCategoryAdminProcess( e, "查询分类管理员信息列表时发生异常。" );
@@ -178,7 +177,7 @@ public class PermissionAction extends StandardJaxrsAction {
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionListCategoryInfoPublishers)proxy.getProxy(ActionListCategoryInfoPublishers.class)).execute( request, effectivePerson, id );
+				result = new ActionListCategoryInfoPublishers().execute( request, effectivePerson, id );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				Exception exception = new ExceptionAppCategoryAdminProcess( e, "查询分类发布者信息列表时发生异常。" );
@@ -201,7 +200,7 @@ public class PermissionAction extends StandardJaxrsAction {
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionListCategoryInfoViewers)proxy.getProxy(ActionListCategoryInfoViewers.class)).execute( request, effectivePerson, id );
+				result = new ActionListCategoryInfoViewers().execute( request, effectivePerson, id );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				Exception exception = new ExceptionAppCategoryAdminProcess( e, "查询分类发布范围信息时发生异常。" );
@@ -224,7 +223,7 @@ public class PermissionAction extends StandardJaxrsAction {
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionAppInfoManagerSave)proxy.getProxy(ActionAppInfoManagerSave.class)).execute( request, effectivePerson, id, jsonElement );
+				result = new ActionAppInfoManagerSave().execute( request, effectivePerson, id, jsonElement );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				Exception exception = new ExceptionAppCategoryAdminProcess( e, "栏目管理员权限更新时发生异常。" );
@@ -247,7 +246,7 @@ public class PermissionAction extends StandardJaxrsAction {
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionAppInfoPublisherSave)proxy.getProxy(ActionAppInfoPublisherSave.class)).execute( request, effectivePerson, id, jsonElement );
+				result = new ActionAppInfoPublisherSave().execute( request, effectivePerson, id, jsonElement );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				Exception exception = new ExceptionAppCategoryAdminProcess( e, "栏目发布者权限更新时发生异常。" );
@@ -270,7 +269,7 @@ public class PermissionAction extends StandardJaxrsAction {
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionAppInfoViewerSave)proxy.getProxy(ActionAppInfoViewerSave.class)).execute( request, effectivePerson, id, jsonElement );
+				result = new ActionAppInfoViewerSave().execute( request, effectivePerson, id, jsonElement );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				Exception exception = new ExceptionAppCategoryAdminProcess( e, "栏目可见范围权限更新时发生异常。" );
@@ -293,7 +292,7 @@ public class PermissionAction extends StandardJaxrsAction {
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionCategoryInfoManagerSave)proxy.getProxy(ActionCategoryInfoManagerSave.class)).execute( request, effectivePerson, id, jsonElement );
+				result = new ActionCategoryInfoManagerSave().execute( request, effectivePerson, id, jsonElement );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				Exception exception = new ExceptionAppCategoryAdminProcess( e, "分类管理员权限更新时发生异常。" );
@@ -316,7 +315,7 @@ public class PermissionAction extends StandardJaxrsAction {
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionCategoryInfoPublisherSave)proxy.getProxy(ActionCategoryInfoPublisherSave.class)).execute( request, effectivePerson, id, jsonElement );
+				result = new ActionCategoryInfoPublisherSave().execute( request, effectivePerson, id, jsonElement );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				Exception exception = new ExceptionAppCategoryAdminProcess( e, "分类发布者权限更新时发生异常。" );
@@ -339,7 +338,7 @@ public class PermissionAction extends StandardJaxrsAction {
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionCategoryInfoViewerSave)proxy.getProxy(ActionCategoryInfoViewerSave.class)).execute( request, effectivePerson, id, jsonElement );
+				result = new ActionCategoryInfoViewerSave().execute( request, effectivePerson, id, jsonElement );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				Exception exception = new ExceptionAppCategoryAdminProcess( e, "分类可见范围权限更新时发生异常。" );

+ 1 - 4
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/PermissionForDocumentAction.java

@@ -8,10 +8,8 @@ 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.jaxrs.proxy.StandardJaxrsActionProxy;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
-import com.x.cms.assemble.control.ThisApplication;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.Consumes;
@@ -27,7 +25,6 @@ import javax.ws.rs.core.MediaType;
 @JaxrsDescribe("信息文档发布权限管理")
 public class PermissionForDocumentAction extends StandardJaxrsAction{
 
-	private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
 	private static  Logger logger = LoggerFactory.getLogger( PermissionForDocumentAction.class );
 	
 	@JaxrsMethodDescribe(value = "刷新信息文档发布权限.", action = ActionRefreshDocumentPermission.class)
@@ -41,7 +38,7 @@ public class PermissionForDocumentAction extends StandardJaxrsAction{
 
 		if(check){
 			try {
-				result = ((ActionRefreshDocumentPermission)proxy.getProxy(ActionRefreshDocumentPermission.class)).execute( request, effectivePerson, jsonElement );
+				result = new ActionRefreshDocumentPermission().execute( request, effectivePerson, jsonElement );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				Exception exception = new ExceptionServiceLogic( e, "系统在更新文档的访问和管理权限过程中发生异常!" );

+ 0 - 3
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/PermissionManagerAction.java

@@ -7,10 +7,8 @@ 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.jaxrs.proxy.StandardJaxrsActionProxy;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
-import com.x.cms.assemble.control.ThisApplication;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.*;
@@ -23,7 +21,6 @@ import javax.ws.rs.core.MediaType;
 @JaxrsDescribe("文档权限操作服务(管理员)")
 public class PermissionManagerAction extends StandardJaxrsAction {
 
-	private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
 	private static  Logger logger = LoggerFactory.getLogger( PermissionManagerAction.class );
 
 	@JaxrsMethodDescribe(value = "重新计算所有文档的权限信息.", action = ActionRefreshAllDocumentPermission.class)

+ 4 - 8
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryview/QueryViewAction.java

@@ -8,8 +8,6 @@ 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.proxy.StandardJaxrsActionProxy;
-import com.x.cms.assemble.control.ThisApplication;
 import com.x.cms.core.entity.query.Query;
 
 import javax.servlet.http.HttpServletRequest;
@@ -25,8 +23,6 @@ import java.util.List;
 @JaxrsDescribe("数据视图信息管理")
 public class QueryViewAction extends BaseAction {
 
-	private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
-
 	@JaxrsMethodDescribe(value = "列示所有栏目中的数据视图信息.", action = ActionListAll.class)
 	@GET
 	@Path("list/all")
@@ -36,7 +32,7 @@ public class QueryViewAction extends BaseAction {
 		ActionResult<List<ActionListAll.Wo>> result = new ActionResult<>();
 		try {
 			EffectivePerson effectivePerson = this.effectivePerson( request );
-			result = ((ActionListAll)proxy.getProxy(ActionListAll.class)).execute( request, effectivePerson);
+			result = new ActionListAll().execute( request, effectivePerson);
 		} catch (Throwable th) {
 			th.printStackTrace();
 			result.error(th);
@@ -53,7 +49,7 @@ public class QueryViewAction extends BaseAction {
 		ActionResult<List<ActionList.Wo>> result = new ActionResult<>();
 		try {
 			EffectivePerson effectivePerson = this.effectivePerson( request );
-			result = ((ActionList)proxy.getProxy(ActionList.class)).execute( request, effectivePerson);
+			result = new ActionList().execute( request, effectivePerson);
 		} catch (Throwable th) {
 			th.printStackTrace();
 			result.error(th);
@@ -71,7 +67,7 @@ public class QueryViewAction extends BaseAction {
 		ActionResult<ActionFlag.Wo> result = new ActionResult<>();
 		try {
 			EffectivePerson effectivePerson = this.effectivePerson(request);
-			result = ((ActionFlag)proxy.getProxy(ActionFlag.class)).execute( request, effectivePerson, flag);
+			result = new ActionFlag().execute( request, effectivePerson, flag);
 		} catch (Throwable th) {
 			th.printStackTrace();
 			result.error(th);
@@ -94,7 +90,7 @@ public class QueryViewAction extends BaseAction {
 		
 		if( check ){
 			try {
-				result = ((ActionExecute)proxy.getProxy(ActionExecute.class)).execute( request, effectivePerson, flag, appId, jsonElement);
+				result = new ActionExecute().execute( request, effectivePerson, flag, appId, jsonElement);
 			} catch (Throwable th) {
 				th.printStackTrace();
 				result.error(th);

+ 9 - 13
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/QueryViewDesignAction.java

@@ -8,9 +8,7 @@ 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.proxy.StandardJaxrsActionProxy;
 import com.x.cms.assemble.control.ExceptionWrapInConvert;
-import com.x.cms.assemble.control.ThisApplication;
 import com.x.cms.core.entity.query.Query;
 
 import javax.servlet.http.HttpServletRequest;
@@ -25,8 +23,6 @@ import java.util.List;
 @JaxrsDescribe("数据视图设计信息管理")
 public class QueryViewDesignAction extends BaseAction {
 
-	private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
-
 	@JaxrsMethodDescribe(value = "列示数据视图设计信息对象,下一页.", action = ActionListNext.class)
 	@GET
 	@Path("list/{id}/next/{count}")
@@ -38,7 +34,7 @@ public class QueryViewDesignAction extends BaseAction {
 			) {
 		ActionResult<List<ActionListNext.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListNext)proxy.getProxy(ActionListNext.class)).execute(id, count);
+			result = new ActionListNext().execute(id, count);
 		} catch (Throwable th) {
 			th.printStackTrace();
 			result.error(th);
@@ -57,7 +53,7 @@ public class QueryViewDesignAction extends BaseAction {
 			) {
 		ActionResult<List<ActionListPrev.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListPrev)proxy.getProxy(ActionListPrev.class)).execute(id, count);
+			result = new ActionListPrev().execute(id, count);
 		} catch (Throwable th) {
 			th.printStackTrace();
 			result.error(th);
@@ -75,7 +71,7 @@ public class QueryViewDesignAction extends BaseAction {
 		ActionResult<ActionFlag.Wo> result = new ActionResult<>();
 		try {
 			EffectivePerson effectivePerson = this.effectivePerson(request);
-			result = ((ActionFlag)proxy.getProxy(ActionFlag.class)).execute(effectivePerson, flag);
+			result = new ActionFlag().execute(effectivePerson, flag);
 		} catch (Throwable th) {
 			th.printStackTrace();
 			result.error(th);
@@ -93,7 +89,7 @@ public class QueryViewDesignAction extends BaseAction {
 		ActionResult<ActionGet.Wo> result = new ActionResult<>();
 		try {
 			EffectivePerson effectivePerson = this.effectivePerson(request);
-			result = ((ActionGet)proxy.getProxy(ActionGet.class)).execute(effectivePerson, id);
+			result = new ActionGet().execute(effectivePerson, id);
 		} catch (Throwable th) {
 			th.printStackTrace();
 			result.error(th);
@@ -112,7 +108,7 @@ public class QueryViewDesignAction extends BaseAction {
 
 		if( check ){
 			try {
-				result = ((ActionCreate)proxy.getProxy(ActionCreate.class)).execute( request, effectivePerson, jsonElement );
+				result = new ActionCreate().execute( request, effectivePerson, jsonElement );
 			} catch (Throwable th) {
 				th.printStackTrace();
 				result.error(th);
@@ -136,7 +132,7 @@ public class QueryViewDesignAction extends BaseAction {
 
 		if( check ){
 			try {
-				result = ((ActionUpdate)proxy.getProxy(ActionUpdate.class)).execute(effectivePerson, id, jsonElement );
+				result = new ActionUpdate().execute(effectivePerson, id, jsonElement );
 			} catch (Throwable th) {
 				th.printStackTrace();
 				result.error(th);
@@ -155,7 +151,7 @@ public class QueryViewDesignAction extends BaseAction {
 		ActionResult<ActionDelete.Wo> result = new ActionResult<>();
 		try {
 			EffectivePerson effectivePerson = this.effectivePerson(request);
-			result = ((ActionDelete)proxy.getProxy(ActionDelete.class)).execute( effectivePerson, id );
+			result = new ActionDelete().execute( effectivePerson, id );
 		} catch (Throwable th) {
 			th.printStackTrace();
 			result.error(th);
@@ -173,7 +169,7 @@ public class QueryViewDesignAction extends BaseAction {
 		ActionResult<List<ActionListWithApplication.Wo>> result = new ActionResult<>();
 		try {
 			EffectivePerson effectivePerson = this.effectivePerson(request);
-			result = ((ActionListWithApplication)proxy.getProxy(ActionListWithApplication.class)).execute(effectivePerson, applicationId);
+			result = new ActionListWithApplication().execute(effectivePerson, applicationId);
 		} catch (Throwable th) {
 			th.printStackTrace();
 			result.error(th);
@@ -203,7 +199,7 @@ public class QueryViewDesignAction extends BaseAction {
 		}
 		if( check ){
 			try {
-				result = ((ActionSimulate)proxy.getProxy(ActionSimulate.class)).execute(effectivePerson, flag, wrapIn);
+				result = new ActionSimulate().execute(effectivePerson, flag, wrapIn);
 			} catch (Throwable th) {
 				th.printStackTrace();
 				result.error(th);

+ 12 - 18
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ScriptAction.java

@@ -25,16 +25,13 @@ 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.jaxrs.proxy.StandardJaxrsActionProxy;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
-import com.x.cms.assemble.control.ThisApplication;
 
 @Path("script")
 @JaxrsDescribe("脚本信息管理")
 public class ScriptAction extends StandardJaxrsAction {
 
-	private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
 	private static Logger logger = LoggerFactory.getLogger(ScriptAction.class);
 
 	@JaxrsMethodDescribe(value = "根据ID获取指定的脚本信息.", action = ActionGet.class)
@@ -47,7 +44,7 @@ public class ScriptAction extends StandardJaxrsAction {
 		ActionResult<ActionGet.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionGet) proxy.getProxy(ActionGet.class)).execute(effectivePerson, id);
+			result = new ActionGet().execute(effectivePerson, id);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -64,7 +61,7 @@ public class ScriptAction extends StandardJaxrsAction {
 		ActionResult<ActionCreate.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionCreate) proxy.getProxy(ActionCreate.class)).execute(request, effectivePerson, jsonElement);
+			result = new ActionCreate().execute(request, effectivePerson, jsonElement);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, jsonElement);
 			result.error(e);
@@ -82,7 +79,7 @@ public class ScriptAction extends StandardJaxrsAction {
 		ActionResult<ActionUpdate.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionUpdate) proxy.getProxy(ActionUpdate.class)).execute(effectivePerson, id, jsonElement);
+			result = new ActionUpdate().execute(effectivePerson, id, jsonElement);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, jsonElement);
 			result.error(e);
@@ -100,7 +97,7 @@ public class ScriptAction extends StandardJaxrsAction {
 		ActionResult<ActionDelete.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionDelete) proxy.getProxy(ActionDelete.class)).execute(effectivePerson, id);
+			result = new ActionDelete().execute(effectivePerson, id);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -118,8 +115,7 @@ public class ScriptAction extends StandardJaxrsAction {
 		ActionResult<List<ActionListWithApplication.Wo>> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionListWithApplication) proxy.getProxy(ActionListWithApplication.class))
-					.execute(effectivePerson, flag);
+			result = new ActionListWithApplication().execute(effectivePerson, flag);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -138,8 +134,7 @@ public class ScriptAction extends StandardJaxrsAction {
 		ActionResult<ActionGetWithAppAndName.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionGetWithAppAndName) proxy.getProxy(ActionGetWithAppAndName.class)).execute(effectivePerson,
-					appId, name);
+			result = new ActionGetWithAppAndName().execute(effectivePerson, appId, name);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -158,7 +153,7 @@ public class ScriptAction extends StandardJaxrsAction {
 		ActionResult<List<ActionListNext.Wo>> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionListNext) proxy.getProxy(ActionListNext.class)).execute(effectivePerson, id, count);
+			result = new ActionListNext().execute(effectivePerson, id, count);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -177,7 +172,7 @@ public class ScriptAction extends StandardJaxrsAction {
 		ActionResult<List<ActionListPrev.Wo>> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionListPrev) proxy.getProxy(ActionListPrev.class)).execute(effectivePerson, id, count);
+			result = new ActionListPrev().execute(effectivePerson, id, count);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -196,7 +191,7 @@ public class ScriptAction extends StandardJaxrsAction {
 		ActionResult<ActionPostScriptNested.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionPostScriptNested) proxy.getProxy(ActionPostScriptNested.class)).execute(request,
+			result = new ActionPostScriptNested().execute(request,
 					effectivePerson, uniqueName, flag, jsonElement);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, jsonElement);
@@ -217,8 +212,7 @@ public class ScriptAction extends StandardJaxrsAction {
 		ActionResult<ActionGetScriptNestedImported.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionGetScriptNestedImported) proxy.getProxy(ActionGetScriptNestedImported.class))
-					.execute(request, effectivePerson, uniqueName, flag);
+			result = new ActionGetScriptNestedImported().execute(request, effectivePerson, uniqueName, flag);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -237,7 +231,7 @@ public class ScriptAction extends StandardJaxrsAction {
 		ActionResult<ActionLoad.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionLoad) proxy.getProxy(ActionLoad.class)).execute(effectivePerson, flag, applicationFlag,
+			result = new ActionLoad().execute(effectivePerson, flag, applicationFlag,
 					jsonElement);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, jsonElement);
@@ -257,7 +251,7 @@ public class ScriptAction extends StandardJaxrsAction {
 		ActionResult<List<ActionListPaging.Wo>> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionListPaging)proxy.getProxy(ActionListPaging.class)).execute(effectivePerson, page, size);
+			result = new ActionListPaging().execute(effectivePerson, page, size);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);

+ 6 - 10
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ScriptAnonymousAction.java

@@ -8,8 +8,6 @@ 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.jaxrs.proxy.StandardJaxrsActionProxy;
-import com.x.cms.assemble.control.ThisApplication;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.*;
@@ -23,8 +21,6 @@ import java.util.List;
 @JaxrsDescribe("可匿名访问的脚本信息管理服务")
 public class ScriptAnonymousAction extends StandardJaxrsAction {
 
-	private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
-
 	@JaxrsMethodDescribe(value = "根据ID获取指定的脚本信息.", action = ActionGet.class)
 	@GET
 	@Path("{id}")
@@ -35,7 +31,7 @@ public class ScriptAnonymousAction extends StandardJaxrsAction {
 		ActionResult<ActionGet.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionGet)proxy.getProxy(ActionGet.class)).execute( effectivePerson, id );
+			result = new ActionGet().execute( effectivePerson, id );
 		} catch (Throwable th) {
 			th.printStackTrace();
 			result.error(th);
@@ -53,7 +49,7 @@ public class ScriptAnonymousAction extends StandardJaxrsAction {
 		ActionResult<List<ActionListWithApplication.Wo>> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionListWithApplication)proxy.getProxy(ActionListWithApplication.class)).execute( effectivePerson, appId );
+			result = new ActionListWithApplication().execute( effectivePerson, appId );
 		} catch (Throwable th) {
 			th.printStackTrace();
 			result.error(th);
@@ -72,7 +68,7 @@ public class ScriptAnonymousAction extends StandardJaxrsAction {
 		ActionResult<ActionGetWithAppAndName.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionGetWithAppAndName)proxy.getProxy(ActionGetWithAppAndName.class)).execute( effectivePerson, appId, name );
+			result = new ActionGetWithAppAndName().execute( effectivePerson, appId, name );
 		} catch (Throwable th) {
 			th.printStackTrace();
 			result.error(th);
@@ -92,7 +88,7 @@ public class ScriptAnonymousAction extends StandardJaxrsAction {
 		ActionResult<List<ActionListNext.Wo>> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionListNext)proxy.getProxy(ActionListNext.class)).execute( effectivePerson, id, count );
+			result = new ActionListNext().execute( effectivePerson, id, count );
 		} catch (Throwable th) {
 			th.printStackTrace();
 			result.error(th);
@@ -112,7 +108,7 @@ public class ScriptAnonymousAction extends StandardJaxrsAction {
 		ActionResult<List<ActionListPrev.Wo>> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionListPrev)proxy.getProxy(ActionListPrev.class)).execute( effectivePerson, id, count );
+			result = new ActionListPrev().execute( effectivePerson, id, count );
 		} catch (Throwable th) {
 			th.printStackTrace();
 			result.error(th);
@@ -131,7 +127,7 @@ public class ScriptAnonymousAction extends StandardJaxrsAction {
 		ActionResult<List<ActionListPaging.Wo>> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionListPaging)proxy.getProxy(ActionListPaging.class)).execute(effectivePerson, page, size);
+			result = new ActionListPaging().execute(effectivePerson, page, size);
 		} catch (Throwable th) {
 			th.printStackTrace();
 			result.error(th);

+ 3 - 13
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/search/SearchFilterAction.java

@@ -8,8 +8,6 @@ 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.jaxrs.proxy.StandardJaxrsActionProxy;
-import com.x.cms.assemble.control.ThisApplication;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.*;
@@ -22,8 +20,6 @@ import javax.ws.rs.core.MediaType;
 @JaxrsDescribe("信息文档搜索服务")
 public class SearchFilterAction extends StandardJaxrsAction {
 
-	private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
-
 	@JaxrsMethodDescribe(value = "获取用户有权限访问的所有已发布文档分类列表.", action = ActionListAppSearchFilterForDocStatus.class)
 	@GET
 	@Path("list/publish/filter/category/{categoryId}")
@@ -33,9 +29,7 @@ public class SearchFilterAction extends StandardJaxrsAction {
 			@JaxrsParameterDescribe("分类ID") @PathParam("categoryId") String categoryId) {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<ActionListAppSearchFilterForDocStatus.Wo> result =
-				((ActionListAppSearchFilterForDocStatus)proxy
-						.getProxy(ActionListAppSearchFilterForDocStatus.class))
-						.execute(request, effectivePerson, "published", categoryId);
+				new ActionListAppSearchFilterForDocStatus().execute(request, effectivePerson, "published", categoryId);
 		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
 	}
 
@@ -48,9 +42,7 @@ public class SearchFilterAction extends StandardJaxrsAction {
 			@JaxrsParameterDescribe("分类ID") @PathParam("categoryId") String categoryId) {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<ActionListAppSearchFilterForDocStatus.Wo> result =
-				((ActionListAppSearchFilterForDocStatus)proxy
-						.getProxy(ActionListAppSearchFilterForDocStatus.class))
-						.execute(request, effectivePerson, "draft", categoryId);
+				new ActionListAppSearchFilterForDocStatus().execute(request, effectivePerson, "draft", categoryId);
 		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
 	}
 
@@ -63,9 +55,7 @@ public class SearchFilterAction extends StandardJaxrsAction {
 			@JaxrsParameterDescribe("分类ID") @PathParam("categoryId") String categoryId) {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<ActionListAppSearchFilterForDocStatus.Wo> result =
-				((ActionListAppSearchFilterForDocStatus)proxy
-						.getProxy(ActionListAppSearchFilterForDocStatus.class))
-						.execute(request, effectivePerson, "archived", categoryId);
+				new ActionListAppSearchFilterForDocStatus().execute(request, effectivePerson, "archived", categoryId);
 		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
 	}	
 }