Merge branch 'fix/jiraoauth' into 'wrdp'

增加jira的oauth

See merge request o2oa/o2oa!2457

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

@@ -71,12 +71,12 @@ public class OauthAction extends StandardJaxrsAction {
 		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
 	}
 
-	@JaxrsMethodDescribe(value = "POST方法实现oauth认证token方法", action = ActionToken.class)
+	@JaxrsMethodDescribe(value = "POST方法实现oauth认证token方法,是配jira.", action = ActionToken.class)
 	@POST
 	@Path("token/jira")
 	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
 	@Consumes({ MediaType.MULTIPART_FORM_DATA, MediaType.APPLICATION_FORM_URLENCODED, MediaType.APPLICATION_JSON })
-	public void postTokenJson(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+	public void postTokenJira(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
 			@Context HttpServletResponse response, @FormParam("code") String code,
 			@FormParam("grant_type") String grant_type) {
 		ActionResult<ActionToken.Wo> result = new ActionResult<>();

o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Person.java

@@ -115,7 +115,8 @@ public class Person extends SliceJpaObject {
 	@FieldDescribe("性别.男:m,女:f,未知:d")
 	@Enumerated(EnumType.STRING)
 	@Column(length = GenderType.length, name = ColumnNamePrefix + genderType_FIELDNAME)
-	@Index(name = TABLE + IndexNameMiddle + genderType_FIELDNAME)
+	//Enum类型不需要进行索引
+	//@Index(name = TABLE + IndexNameMiddle + genderType_FIELDNAME)
 	@CheckPersist(allowEmpty = false)
 	private GenderType genderType;