Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!2477

o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ApplicationServer.java

@@ -73,7 +73,7 @@ public class ApplicationServer extends ConfigObject {
 	@FieldDescribe("暴露jest接口.")
 	private Boolean exposeJest;
 
-	@FieldDescribe("是否启用长连接,默认false.")
+	@FieldDescribe("是否启用长连接,默认true.")
 	private Boolean persistentConnectionsEnable;
 
 	public Boolean getPersistentConnectionsEnable() {

o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/jaxrs/attachment2/ActionGetImageScaleBase64.java

@@ -8,6 +8,7 @@ import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WrapString;
 import com.x.file.assemble.control.ThisApplication;
+import com.x.file.core.entity.open.FileType;
 import com.x.file.core.entity.open.OriginFile;
 import com.x.file.core.entity.personal.Attachment2;
 import org.apache.commons.codec.binary.Base64;
@@ -30,7 +31,7 @@ class ActionGetImageScaleBase64 extends BaseAction {
 				throw new Exception("person{name:" + effectivePerson.getDistinguishedName() + "} access attachment{id:"
 						+ id + "} denied.");
 			}
-			if (!ArrayUtils.contains(IMAGE_EXTENSIONS, attachment.getExtension())) {
+			if (!FileType.getExtType(attachment.getExtension()).equals(FileType.image.name())) {
 				throw new Exception("attachment not image file.");
 			}
 			if (scale < 0 || scale > 100) {
@@ -64,4 +65,4 @@ class ActionGetImageScaleBase64 extends BaseAction {
 
 	public static class Wo extends WrapString {
 	}
-}
+}

o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/jaxrs/attachment2/ActionGetImageWidthHeightBase64.java

@@ -11,6 +11,7 @@ import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WrapString;
 import com.x.file.assemble.control.ThisApplication;
+import com.x.file.core.entity.open.FileType;
 import com.x.file.core.entity.open.OriginFile;
 import com.x.file.core.entity.personal.Attachment2;
 import org.apache.commons.codec.binary.Base64;
@@ -36,7 +37,7 @@ class ActionGetImageWidthHeightBase64 extends BaseAction {
 				throw new Exception("person{name:" + effectivePerson.getDistinguishedName() + "} access attachment{id:"
 						+ id + "} denied.");
 			}
-			if (!ArrayUtils.contains(IMAGE_EXTENSIONS, attachment.getExtension())) {
+			if (!FileType.getExtType(attachment.getExtension()).equals(FileType.image.name())) {
 				throw new Exception("attachment not image file.");
 			}
 			if (width < 0 || width > 5000) {
@@ -89,4 +90,4 @@ class ActionGetImageWidthHeightBase64 extends BaseAction {
 	public static class Wo extends WrapString {
 
 	}
-}
+}

o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/oauth/OauthAction.java

@@ -71,7 +71,7 @@ public class OauthAction extends StandardJaxrsAction {
 		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
 	}
 
-	@JaxrsMethodDescribe(value = "POST方法实现oauth认证token方法,是配jira.", action = ActionToken.class)
+	@JaxrsMethodDescribe(value = "POST方法实现oauth认证token方法,适配jira.", action = ActionToken.class)
 	@POST
 	@Path("token/jira")
 	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@@ -126,6 +126,24 @@ public class OauthAction extends StandardJaxrsAction {
 		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
 	}
 
+	@JaxrsMethodDescribe(value = "POST方法实现oauth认证info方法,适配jira.", action = ActionInfo.class)
+	@POST
+	@Path("info/jira")
+	@Consumes({ MediaType.MULTIPART_FORM_DATA, MediaType.APPLICATION_FORM_URLENCODED })
+	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+	public void postInfoJira(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+			@Context HttpServletResponse response, @FormParam("access_token") String access_token) {
+		ActionResult<ActionInfo.Wo> result = new ActionResult<>();
+		EffectivePerson effectivePerson = this.effectivePerson(request);
+		try {
+			result = new ActionInfo().execute(request, effectivePerson, access_token, MediaType.APPLICATION_JSON);
+		} catch (Exception e) {
+			logger.error(e, effectivePerson, request, null);
+			result.error(e);
+		}
+		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+	}
+
 	@JaxrsMethodDescribe(value = "GET方法实现oauth认证info方法.", action = ActionInfo.class)
 	@GET
 	@Path("info")
@@ -144,4 +162,22 @@ public class OauthAction extends StandardJaxrsAction {
 		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
 	}
 
+	@JaxrsMethodDescribe(value = "GET方法实现oauth认证info方法,适配jira.", action = ActionInfo.class)
+	@GET
+	@Path("info/jira")
+	@Consumes({ MediaType.MULTIPART_FORM_DATA, MediaType.APPLICATION_FORM_URLENCODED })
+	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+	public void getInfoJira(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+			@Context HttpServletResponse response, @QueryParam("access_token") String access_token) {
+		ActionResult<ActionInfo.Wo> result = new ActionResult<>();
+		EffectivePerson effectivePerson = this.effectivePerson(request);
+		try {
+			result = new ActionInfo().execute(request, effectivePerson, access_token, MediaType.APPLICATION_JSON);
+		} catch (Exception e) {
+			logger.error(e, effectivePerson, request, null);
+			result.error(e);
+		}
+		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+	}
+
 }

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

@@ -304,7 +304,7 @@ class ActionListMyFilterPaging extends BaseAction {
 		private static final long serialVersionUID = 2279846765261247910L;
 
 		static WrapCopier<Task, Wo> copier = WrapCopierFactory.wo(Task.class, Wo.class,
-				JpaObject.singularAttributeField(Task.class, true, true), null);
+				JpaObject.singularAttributeField(Task.class, true, false), null);
 
 	}
 

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

@@ -9,6 +9,7 @@ import com.x.base.core.project.bean.WrapCopier;
 import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.tools.ListTools;
 import com.x.processplatform.core.entity.content.Task;
 
 class ActionListMyPaging extends BaseAction {
@@ -29,7 +30,7 @@ class ActionListMyPaging extends BaseAction {
 		private static final long serialVersionUID = 2279846765261247910L;
 
 		static WrapCopier<Task, Wo> copier = WrapCopierFactory.wo(Task.class, Wo.class,
-				JpaObject.singularAttributeField(Task.class, true, true), null);
+				JpaObject.singularAttributeField(Task.class, true, false), null);
 
 	}
 

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

@@ -422,7 +422,7 @@ class ActionManageListFilterPaging extends BaseAction {
 		private static final long serialVersionUID = 2279846765261247910L;
 
 		static WrapCopier<Task, Wo> copier = WrapCopierFactory.wo(Task.class, Wo.class,
-				JpaObject.singularAttributeField(Task.class, true, true), null);
+				JpaObject.singularAttributeField(Task.class, true, false), null);
 
 	}
 

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

@@ -291,7 +291,7 @@ class ActionListMyFilterPaging extends BaseAction {
 		private static final long serialVersionUID = 2279846765261247910L;
 
 		static WrapCopier<TaskCompleted, Wo> copier = WrapCopierFactory.wo(TaskCompleted.class, Wo.class,
-				JpaObject.singularAttributeField(TaskCompleted.class, true, true), null);
+				JpaObject.singularAttributeField(TaskCompleted.class, true, false), null);
 
 	}
 

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

@@ -15,6 +15,7 @@ import com.x.base.core.project.bean.WrapCopier;
 import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.tools.ListTools;
 import com.x.processplatform.assemble.surface.Business;
 import com.x.processplatform.core.entity.content.TaskCompleted;
 import com.x.processplatform.core.entity.content.TaskCompleted_;
@@ -40,7 +41,7 @@ class ActionListMyPaging extends BaseAction {
 		private static final long serialVersionUID = 2279846765261247910L;
 
 		static WrapCopier<TaskCompleted, Wo> copier = WrapCopierFactory.wo(TaskCompleted.class, Wo.class,
-				JpaObject.singularAttributeField(TaskCompleted.class, true, true), null);
+				JpaObject.singularAttributeField(TaskCompleted.class, true, false), null);
 
 	}
 

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

@@ -317,7 +317,7 @@ class ActionManageListFilterPaging extends BaseAction {
 		private static final long serialVersionUID = 2279846765261247910L;
 
 		static WrapCopier<TaskCompleted, Wo> copier = WrapCopierFactory.wo(TaskCompleted.class, Wo.class,
-				JpaObject.singularAttributeField(TaskCompleted.class, true, true), null);
+				JpaObject.singularAttributeField(TaskCompleted.class, true, false), null);
 
 	}
 

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Task.java

@@ -477,7 +477,7 @@ public class Task extends SliceJpaObject implements ProjectionInterface {
 	private String mediaOpinion;
 
 	public static final String first_FIELDNAME = "first";
-	@FieldDescribe("是否是第一条待办.")
+	@FieldDescribe("是否是第一条待办,用于却别待办和草稿.")
 	@CheckPersist(allowEmpty = true)
 	@Column(name = ColumnNamePrefix + first_FIELDNAME)
 	private Boolean first;

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/TaskCompleted.java

@@ -623,7 +623,7 @@ public class TaskCompleted extends SliceJpaObject implements ProjectionInterface
 	private Date retractTime;
 
 	public static final String latest_FIELDNAME = "latest";
-	@FieldDescribe("同一Job中同一用户是否是最新的.")
+	@FieldDescribe("同一Job中同一用户是否是最新的,多人可以有多条已办,页面显示的时候可以通过此标记仅显示一条最新的.")
 	@Column(name = ColumnNamePrefix + latest_FIELDNAME)
 	@Index(name = TABLE + IndexNameMiddle + latest_FIELDNAME)
 	@CheckPersist(allowEmpty = true)

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Work.java

@@ -152,6 +152,11 @@ public class Work extends SliceJpaObject implements ProjectionInterface {
 	}
 
 	public List<String> getSplitValueList() {
+		//这里调用必须重新指向一次,如果使用
+		//Work copy = XGsonBuilder.convert(work, Work.class);
+		//copy.copyTo(this, JpaObject.id_FIELDNAME);
+		//这样的方法调用,那么在运行完成以后copy.splitValueList不再指向this.getProperties().getSplitValueList()
+		this.splitValueList = this.getProperties().getSplitValueList();
 		return this.splitValueList;
 	}