o2sword 5 лет назад
Родитель
Сommit
352b8fc0eb

+ 23 - 29
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoAction.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 org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.glassfish.jersey.media.multipart.FormDataParam;
 
@@ -28,7 +26,6 @@ import java.util.List;
 @JaxrsDescribe("信息发布(CMS)-栏目(APPINFO)管理服务")
 public class AppInfoAction extends StandardJaxrsAction {
 
-	private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
 	private static  Logger logger = LoggerFactory.getLogger(AppInfoAction.class);
 
 	@JaxrsMethodDescribe(value = "创建新的栏目信息或者更新已存在的栏目信息。", action = ActionSave.class)
@@ -41,7 +38,7 @@ public class AppInfoAction 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 ExceptionAppInfoProcess(e, "栏目信息保存时发生异常。");
@@ -62,7 +59,7 @@ public class AppInfoAction 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<>();
 			Exception exception = new ExceptionAppInfoProcess(e, "根据ID删除CMS应用信息对象发生未知异常,ID:" + id);
@@ -84,7 +81,7 @@ public class AppInfoAction 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 );
@@ -104,7 +101,7 @@ public class AppInfoAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<ActionEraseDocumentWithAppInfo.Wo> result = new ActionResult<>();
 		try {
-			result = ((ActionEraseDocumentWithAppInfo)proxy.getProxy(ActionEraseDocumentWithAppInfo.class)).execute(request, id, effectivePerson );
+			result = new ActionEraseDocumentWithAppInfo().execute(request, id, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionAppInfoProcess(e, "根据栏目ID删除所有的信息文档发生未知异常,ID:" + id);
@@ -124,7 +121,7 @@ public class AppInfoAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<BaseAction.Wo> result = new ActionResult<>();
 		try {
-			result = ((ActionGet)proxy.getProxy(ActionGet.class)).execute( request, effectivePerson, flag );
+			result = new ActionGet().execute( request, effectivePerson, flag );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionAppInfoProcess(e, "根据指定ID查询应用栏目信息对象时发生异常。flag:" + flag );
@@ -143,7 +140,7 @@ public class AppInfoAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<BaseAction.Wo> result = new ActionResult<>();
 		try {
-			result = ((ActionGetByAlias)proxy.getProxy(ActionGetByAlias.class)).execute(request, effectivePerson, alias);
+			result = new ActionGetByAlias().execute(request, effectivePerson, alias);
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionAppInfoProcess(e, "根据指定应用唯一标识查询应用栏目信息对象时发生异常。ALIAS:" + alias);
@@ -163,7 +160,7 @@ public class AppInfoAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<List<ActionListWhatICanViewArticle_WithAppType.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListWhatICanViewArticle_WithAppType)proxy.getProxy(ActionListWhatICanViewArticle_WithAppType.class)).execute(request, effectivePerson, appType );
+			result = new ActionListWhatICanViewArticle_WithAppType().execute(request, effectivePerson, appType );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionAppInfoProcess(e,
@@ -183,7 +180,7 @@ public class AppInfoAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<List<ActionListWhatICanViewArticle.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListWhatICanViewArticle)proxy.getProxy(ActionListWhatICanViewArticle.class)).execute(request, effectivePerson);
+			result = new ActionListWhatICanViewArticle().execute(request, effectivePerson);
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionAppInfoProcess(e,
@@ -203,7 +200,7 @@ public class AppInfoAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<List<ActionListWhatICanViewData.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListWhatICanViewData)proxy.getProxy(ActionListWhatICanViewData.class)).execute(request, effectivePerson);
+			result = new ActionListWhatICanViewData().execute(request, effectivePerson);
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionAppInfoProcess(e,
@@ -224,7 +221,7 @@ public class AppInfoAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<List<ActionListWhatICanViewData.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListWhatICanViewData_WithAppType)proxy.getProxy(ActionListWhatICanViewData_WithAppType.class)).execute(request, effectivePerson, appType );
+			result = new ActionListWhatICanViewData_WithAppType().execute(request, effectivePerson, appType );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionAppInfoProcess(e,
@@ -245,7 +242,7 @@ public class AppInfoAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<List<ActionListWhatICanViewAllDocType.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListWhatICanViewAllDocType_WithAppType)proxy.getProxy(ActionListWhatICanViewAllDocType_WithAppType.class)).execute( request, effectivePerson, appType );
+			result = new ActionListWhatICanViewAllDocType_WithAppType().execute( request, effectivePerson, appType );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionAppInfoProcess(e,
@@ -265,7 +262,7 @@ public class AppInfoAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<List<ActionListWhatICanViewAllDocType.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListWhatICanViewAllDocType)proxy.getProxy(ActionListWhatICanViewAllDocType.class)).execute(request, effectivePerson);
+			result = new ActionListWhatICanViewAllDocType().execute(request, effectivePerson);
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionAppInfoProcess(e,
@@ -285,7 +282,7 @@ public class AppInfoAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<List<BaseAction.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListWhatICanPublish)proxy.getProxy(ActionListWhatICanPublish.class)).execute(request, effectivePerson);
+			result = new ActionListWhatICanPublish().execute(request, effectivePerson);
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionAppInfoProcess(e,
@@ -306,8 +303,7 @@ public class AppInfoAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<List<BaseAction.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListWhatICanPublish_WithAppType)proxy.getProxy(ActionListWhatICanPublish_WithAppType.class))
-					.execute(request, effectivePerson, appType );
+			result = new ActionListWhatICanPublish_WithAppType().execute(request, effectivePerson, appType );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionAppInfoProcess(e,
@@ -328,7 +324,7 @@ public class AppInfoAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<BaseAction.Wo> result = new ActionResult<>();
 		try {
-			result = ((ActionGetPublishableAppInfo)proxy.getProxy(ActionGetPublishableAppInfo.class)).execute(request, effectivePerson, appId );
+			result = new ActionGetPublishableAppInfo().execute(request, effectivePerson, appId );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionAppInfoProcess(e,
@@ -348,7 +344,7 @@ public class AppInfoAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<List<ActionListAllAppType.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListAllAppType)proxy.getProxy(ActionListAllAppType.class)).execute(request, effectivePerson);
+			result = new ActionListAllAppType().execute(request, effectivePerson);
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionAppInfoProcess(e,
@@ -368,7 +364,7 @@ public class AppInfoAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<List<ActionListAllManageableAppType.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListAllManageableAppType)proxy.getProxy(ActionListAllManageableAppType.class)).execute(request, effectivePerson);
+			result = new ActionListAllManageableAppType().execute(request, effectivePerson);
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionAppInfoProcess(e,
@@ -388,8 +384,7 @@ public class AppInfoAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<List<BaseAction.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListWhatICanManage)proxy.getProxy(ActionListWhatICanManage.class))
-					.execute(request, effectivePerson);
+			result = new ActionListWhatICanManage().execute(request, effectivePerson);
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionAppInfoProcess(e,
@@ -410,8 +405,7 @@ public class AppInfoAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<List<BaseAction.Wo>> result = new ActionResult<>();
 		try {
-			result = ((ActionListWhatICanManage_WithAppType)proxy.getProxy(ActionListWhatICanManage_WithAppType.class))
-					.execute(request, effectivePerson, appType);
+			result = new ActionListWhatICanManage_WithAppType().execute(request, effectivePerson, appType);
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionAppInfoProcess(e,
@@ -431,7 +425,7 @@ public class AppInfoAction extends StandardJaxrsAction {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<List<BaseAction.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 ExceptionAppInfoProcess(e, "查询所有应用栏目信息对象时发生异常");
@@ -453,7 +447,7 @@ public class AppInfoAction 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, jsonElement );
+			result = new ActionListNextWithFilter().execute(request, effectivePerson, id, count, jsonElement );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionAppInfoProcess(e, "查询栏目信息对象时发生异常");
@@ -475,7 +469,7 @@ public class AppInfoAction 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, jsonElement);
+			result = new ActionListPrevWithFilter().execute(request, effectivePerson, id, count, jsonElement);
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			Exception exception = new ExceptionAppInfoProcess(e, "查询栏目信息对象时发生异常");
@@ -499,7 +493,7 @@ public class AppInfoAction extends StandardJaxrsAction {
 		ActionResult<ActionAppIconUpload.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionAppIconUpload)proxy.getProxy(ActionAppIconUpload.class)).execute(request, effectivePerson, appId, size, bytes, disposition );
+			result = new ActionAppIconUpload().execute(request, effectivePerson, appId, size, bytes, disposition );
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);

+ 0 - 3
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/DocumentAction.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 com.x.cms.assemble.control.queue.DataImportStatus;
 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 DocumentAction extends StandardJaxrsAction {
 
-	private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
 	private static Logger logger = LoggerFactory.getLogger(DocumentAction.class);
 
 	@JaxrsMethodDescribe(value = "变更指定文档的分类信息.", action = ActionPersistChangeCategory.class)

+ 30 - 33
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/DocumentAction2.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 com.x.cms.assemble.control.queue.DataImportStatus;
 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 DocumentAction2 extends StandardJaxrsAction{
 
-	private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
 	private static  Logger logger = LoggerFactory.getLogger( DocumentAction2.class );
 
 	@JaxrsMethodDescribe(value = "变更指定文档的分类信息.", action = ActionPersistChangeCategory.class)
@@ -44,7 +41,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 		
 		if( check ){
 			try {
-				result = ((ActionPersistChangeCategory)proxy.getProxy(ActionPersistChangeCategory.class)).execute( request, jsonElement, effectivePerson );
+				result = new ActionPersistChangeCategory().execute( request, jsonElement, effectivePerson );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				result.error( e );
@@ -66,7 +63,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionPersistBatchModifyData)proxy.getProxy(ActionPersistBatchModifyData.class)).execute( request, jsonElement, effectivePerson );
+				result = new ActionPersistBatchModifyData().execute( request, jsonElement, effectivePerson );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				result.error( e );
@@ -86,7 +83,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<DataImportStatus> result = new ActionResult<>();
 		try {
-			result = ((ActionQueryImportStatusWithName)proxy.getProxy(ActionQueryImportStatusWithName.class)).execute( request, effectivePerson, batchName );
+			result = new ActionQueryImportStatusWithName().execute( request, effectivePerson, batchName );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			result.error( e );
@@ -104,7 +101,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<List<DataImportStatus>> result = new ActionResult<>();
 		try {
-			result = ((ActionQueryAllImportStatus)proxy.getProxy(ActionQueryAllImportStatus.class)).execute( request, effectivePerson );
+			result = new ActionQueryAllImportStatus().execute( request, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			result.error( e );
@@ -123,7 +120,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<ActionQueryGetDocument.Wo> result = new ActionResult<>();
 		try {
-			result = ((ActionQueryGetDocument)proxy.getProxy(ActionQueryGetDocument.class)).execute( request, id, effectivePerson );
+			result = new ActionQueryGetDocument().execute( request, id, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			result.error( e );
@@ -141,7 +138,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<ActionQueryListDocumentFields.Wo> result = new ActionResult<>();
 		try {
-			result = ((ActionQueryListDocumentFields)proxy.getProxy(ActionQueryListDocumentFields.class)).execute( request );
+			result = new ActionQueryListDocumentFields().execute( request );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			result.error( e );
@@ -161,7 +158,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<ActionQueryViewDocument.Wo> result = new ActionResult<>();
 		try {
-			result = ((ActionQueryViewDocument)proxy.getProxy(ActionQueryViewDocument.class)).execute( request, id, effectivePerson );
+			result = new ActionQueryViewDocument().execute( request, id, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			result.error( e );
@@ -180,7 +177,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<ActionQueryCountViewTimes.Wo> result = new ActionResult<>();
 		try {
-			result = ((ActionQueryCountViewTimes)proxy.getProxy(ActionQueryCountViewTimes.class)).execute( request, id, effectivePerson );
+			result = new ActionQueryCountViewTimes().execute( request, id, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			result.error( e );
@@ -201,7 +198,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 
 		if( check ){
 			try {
-				result = ((ActionQueryCountWithFilter)proxy.getProxy(ActionQueryCountWithFilter.class)).execute( request,  jsonElement, effectivePerson );
+				result = new ActionQueryCountWithFilter().execute( request,  jsonElement, effectivePerson );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				result.error( e );
@@ -221,7 +218,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<ActionPersistDeleteDocument.Wo> result = new ActionResult<>();
 		try {
-			result = ((ActionPersistDeleteDocument)proxy.getProxy(ActionPersistDeleteDocument.class)).execute( request, id, effectivePerson );
+			result = new ActionPersistDeleteDocument().execute( request, id, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			result.error( e );
@@ -240,7 +237,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<ActionPersistDeleteWithBatch.Wo> result = new ActionResult<>();
 		try {
-			result = ((ActionPersistDeleteWithBatch)proxy.getProxy(ActionPersistDeleteWithBatch.class)).execute( request, batchId, effectivePerson );
+			result = new ActionPersistDeleteWithBatch().execute( request, batchId, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			result.error( e );
@@ -259,7 +256,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<ActionPersistArchive.Wo> result = new ActionResult<>();
 		try {
-			result = ((ActionPersistArchive)proxy.getProxy(ActionPersistArchive.class)).execute( request, id, effectivePerson );
+			result = new ActionPersistArchive().execute( request, id, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			result.error( e );
@@ -281,7 +278,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 
 		if( check ){
 			try {
-				result = ((ActionPersistPublishAndNotify)proxy.getProxy(ActionPersistPublishAndNotify.class)).execute( request, id, effectivePerson, jsonElement );
+				result = new ActionPersistPublishAndNotify().execute( request, id, effectivePerson, jsonElement );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				result.error( e );
@@ -305,7 +302,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 		if( check ){
 			System.out.println( "please wait, system try to publish content......" );
 			try {
-				result = ((ActionPersistPublishContent)proxy.getProxy(ActionPersistPublishContent.class)).execute( request, jsonElement, effectivePerson );
+				result = new ActionPersistPublishContent().execute( request, jsonElement, effectivePerson );
 				System.out.println( "system publish content successful!" );
 			} catch (Exception e) {
 				result = new ActionResult<>();
@@ -326,7 +323,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 		EffectivePerson effectivePerson = this.effectivePerson( request );
 		ActionResult<ActionPersistPublishCancel.Wo> result = new ActionResult<>();
 		try {
-			result = ((ActionPersistPublishCancel)proxy.getProxy(ActionPersistPublishCancel.class)).execute( request, id, effectivePerson );
+			result = new ActionPersistPublishCancel().execute( request, id, effectivePerson );
 		} catch (Exception e) {
 			result = new ActionResult<>();
 			result.error( e );
@@ -350,7 +347,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 
 		if( check ){
 			try {
-				result = ((ActionQueryListNextWithFilter)proxy.getProxy(ActionQueryListNextWithFilter.class)).execute( request, id, count, jsonElement, effectivePerson );
+				result = new ActionQueryListNextWithFilter().execute( request, id, count, jsonElement, effectivePerson );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				result.error( e );
@@ -375,7 +372,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 
 		if( check ){
 			try {
-				result = ((ActionQueryListPrevWithFilter)proxy.getProxy(ActionQueryListPrevWithFilter.class)).execute( request, id, count, jsonElement, effectivePerson );
+				result = new ActionQueryListPrevWithFilter().execute( request, id, count, jsonElement, effectivePerson );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				result.error( e );
@@ -400,7 +397,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 
 		if( check ){
 			try {
-				result = ((ActionQueryListDraftNextWithFilter)proxy.getProxy(ActionQueryListDraftNextWithFilter.class)).execute( request, id, count, jsonElement, effectivePerson );
+				result = new ActionQueryListDraftNextWithFilter().execute( request, id, count, jsonElement, effectivePerson );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				result.error( e );
@@ -422,7 +419,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionQueryGetFirstPicture)proxy.getProxy(ActionQueryGetFirstPicture.class)).execute( request, id, effectivePerson );
+				result = new ActionQueryGetFirstPicture().execute( request, id, effectivePerson );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				result.error( e );
@@ -444,7 +441,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionQueryListAllPictures)proxy.getProxy(ActionQueryListAllPictures.class)).execute( request, id, effectivePerson );
+				result = new ActionQueryListAllPictures().execute( request, id, effectivePerson );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				result.error( e );
@@ -468,7 +465,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 		ActionResult<ActionPersistImportDataExcel.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionPersistImportDataExcel)proxy.getProxy(ActionPersistImportDataExcel.class)).execute(request, effectivePerson, categoryId, bytes,  json_data, disposition);
+			result = new ActionPersistImportDataExcel().execute(request, effectivePerson, categoryId, bytes,  json_data, disposition);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -487,7 +484,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 		
 		if( check ){
 			try {
-				result = ((ActionPersistSaveDocument)proxy.getProxy(ActionPersistSaveDocument.class)).execute( request, jsonElement, effectivePerson );
+				result = new ActionPersistSaveDocument().execute( request, jsonElement, effectivePerson );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				result.error( e );
@@ -510,7 +507,7 @@ public class DocumentAction2 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 );
@@ -532,7 +529,7 @@ public class DocumentAction2 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 );
@@ -554,7 +551,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionPersistTopDocument)proxy.getProxy(ActionPersistTopDocument.class)).execute( request, id, effectivePerson );
+				result = new ActionPersistTopDocument().execute( request, id, effectivePerson );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				result.error( e );
@@ -576,7 +573,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionPersistUnTopDocument)proxy.getProxy(ActionPersistUnTopDocument.class)).execute( request, id, effectivePerson );
+				result = new ActionPersistUnTopDocument().execute( request, id, effectivePerson );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				result.error( e );
@@ -600,7 +597,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 
 		if( check ){
 			try {
-				result = ((ActionQueryListWithFilterPaging)proxy.getProxy(ActionQueryListWithFilterPaging.class)).execute( request, page, size, jsonElement, effectivePerson );
+				result = new ActionQueryListWithFilterPaging().execute( request, page, size, jsonElement, effectivePerson );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				result.error( e );
@@ -622,7 +619,7 @@ public class DocumentAction2 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 );
@@ -644,7 +641,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 		Boolean check = true;
 		if( check ){
 			try {
-				result = ((ActionQueryListVisiblePersons)proxy.getProxy(ActionQueryListVisiblePersons.class)).execute( request, id, effectivePerson );
+				result = new ActionQueryListVisiblePersons().execute( request, id, effectivePerson );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				result.error( e );
@@ -687,7 +684,7 @@ public class DocumentAction2 extends StandardJaxrsAction{
 		ActionResult<List<ActionQueryListDocumentData.Wo>> result = new ActionResult<>();
 
 		try {
-			result = ((ActionQueryListDocumentData)proxy.getProxy(ActionQueryListDocumentData.class)).execute( request, effectivePerson, jsonElement );
+			result = new ActionQueryListDocumentData().execute( request, effectivePerson, jsonElement );
 		} catch (Exception e) {
 			result.error( e );
 			logger.error( e, effectivePerson, request, jsonElement);

+ 13 - 16
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/file/FileAction.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 org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.glassfish.jersey.media.multipart.FormDataParam;
 
@@ -28,7 +26,6 @@ import java.util.List;
 @JaxrsDescribe("资源文件管理")
 public class FileAction extends StandardJaxrsAction {
 
-	private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
 	private static Logger logger = LoggerFactory.getLogger(FileAction.class);
 
 	@JaxrsMethodDescribe(value = "列示文件对象,下一页.", action = ActionListNext.class)
@@ -42,7 +39,7 @@ public class FileAction extends StandardJaxrsAction {
 		ActionResult<List<ActionListNext.Wo>> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionListNext)proxy.getProxy(ActionListNext.class)).execute(id, count);
+			result = new ActionListNext().execute(id, count);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -61,7 +58,7 @@ public class FileAction extends StandardJaxrsAction {
 		ActionResult<List<ActionListPrev.Wo>> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionListPrev)proxy.getProxy(ActionListPrev.class)).execute(id, count);
+			result = new ActionListPrev().execute(id, count);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -79,7 +76,7 @@ public class FileAction extends StandardJaxrsAction {
 		ActionResult<ActionGet.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionGet)proxy.getProxy(ActionGet.class)).execute(effectivePerson, flag);
+			result = new ActionGet().execute(effectivePerson, flag);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -96,7 +93,7 @@ public class FileAction extends StandardJaxrsAction {
 		ActionResult<ActionCreate.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionCreate)proxy.getProxy(ActionCreate.class)).execute(effectivePerson, jsonElement);
+			result = new ActionCreate().execute(effectivePerson, jsonElement);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, jsonElement);
 			result.error(e);
@@ -114,7 +111,7 @@ public class FileAction extends StandardJaxrsAction {
 		ActionResult<ActionEdit.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionEdit)proxy.getProxy(ActionEdit.class)).execute(effectivePerson, id, jsonElement);
+			result = new ActionEdit().execute(effectivePerson, id, jsonElement);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, jsonElement);
 			result.error(e);
@@ -132,7 +129,7 @@ public class FileAction extends StandardJaxrsAction {
 		ActionResult<ActionDelete.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionDelete)proxy.getProxy(ActionDelete.class)).execute(effectivePerson, flag);
+			result = new ActionDelete().execute(effectivePerson, flag);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -150,7 +147,7 @@ public class FileAction extends StandardJaxrsAction {
 		ActionResult<List<ActionListWithApp.Wo>> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionListWithApp)proxy.getProxy(ActionListWithApp.class)).execute(effectivePerson, appInfoFlag);
+			result = new ActionListWithApp().execute(effectivePerson, appInfoFlag);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -171,7 +168,7 @@ public class FileAction extends StandardJaxrsAction {
 		ActionResult<ActionUpload.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionUpload)proxy.getProxy(ActionUpload.class)).execute(effectivePerson, id, fileName, bytes, disposition);
+			result = new ActionUpload().execute(effectivePerson, id, fileName, bytes, disposition);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -188,7 +185,7 @@ public class FileAction extends StandardJaxrsAction {
 		ActionResult<ActionDownload.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionDownload)proxy.getProxy(ActionDownload.class)).execute(effectivePerson, id);
+			result = new ActionDownload().execute(effectivePerson, id);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -205,7 +202,7 @@ public class FileAction extends StandardJaxrsAction {
 		ActionResult<ActionContent.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionContent)proxy.getProxy(ActionContent.class)).execute(effectivePerson, id);
+			result = new ActionContent().execute(effectivePerson, id);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -223,7 +220,7 @@ public class FileAction extends StandardJaxrsAction {
 		ActionResult<ActionCopy.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionCopy)proxy.getProxy(ActionCopy.class)).execute(effectivePerson, flag, appInfoFlag);
+			result = new ActionCopy().execute(effectivePerson, flag, appInfoFlag);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -241,7 +238,7 @@ public class FileAction extends StandardJaxrsAction {
 		ActionResult<ActionDownloadWithApp.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionDownloadWithApp)proxy.getProxy(ActionDownloadWithApp.class)).execute(effectivePerson, flag, appInfoFlag);
+			result = new ActionDownloadWithApp().execute(effectivePerson, flag, appInfoFlag);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);
@@ -259,7 +256,7 @@ public class FileAction extends StandardJaxrsAction {
 		ActionResult<ActionContentWithApp.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = ((ActionContentWithApp)proxy.getProxy(ActionContentWithApp.class)).execute(effectivePerson, flag, appInfoFlag);
+			result = new ActionContentWithApp().execute(effectivePerson, flag, appInfoFlag);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);