Merge branch 'feature/infojira' into 'wrdp'

oauth增加info/jira

See merge request o2oa/o2oa!2476

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));
+	}
+
 }
\ No newline at end of file

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)