添加更新钉钉回调接口地址

o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/dingding/ActionSyncOrganizationCallbackUrlRegister.java

@@ -26,10 +26,10 @@ public class ActionSyncOrganizationCallbackUrlRegister extends BaseAction {
 
     private List<String> tags = new ArrayList<>(Arrays.asList("user_add_org", "user_modify_org", "user_leave_org", "user_active_org", "org_dept_create", "org_dept_modify", "org_dept_remove"));
 
-    ActionResult<Wo> execute(EffectivePerson effectivePerson) throws Exception {
+
+    ActionResult<Wo> execute(EffectivePerson effectivePerson, boolean enable) throws Exception {
         logger.info("注册钉钉回调接口。。。。。。。");
         ActionResult<Wo> result = new ActionResult<>();
-
         if (Config.dingding().getEnable()) {
             RegisterObject registerObject = new RegisterObject();
             registerObject.setAes_key(Config.dingding().getEncodingAesKey());
@@ -45,7 +45,12 @@ public class ActionSyncOrganizationCallbackUrlRegister extends BaseAction {
             registerObject.setUrl(callbackUrl);
             logger.info("注册回调地址 post对象：{}", registerObject.toString());
             //钉钉回调地址注册 url post
-            String address = Config.dingding().getOapiAddress() + "/call_back/register_call_back?access_token=" + Config.dingding().corpAccessToken();
+            String address;
+            if (enable) {
+                address = Config.dingding().getOapiAddress() + "/call_back/register_call_back?access_token=" + Config.dingding().corpAccessToken();
+            }else {
+                address = Config.dingding().getOapiAddress() + "/call_back/update_call_back?access_token=" + Config.dingding().corpAccessToken();
+            }
             logger.info("register url :" + address);
             DingdingMessageResp resp = HttpConnection.postAsObject(address, null, registerObject.toString(), DingdingMessageResp.class);
             if (resp.getErrcode() != 0) {

o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/dingding/DingdingAction.java

@@ -13,6 +13,7 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
 import com.x.base.core.project.annotation.JaxrsDescribe;
 import com.x.base.core.project.annotation.JaxrsMethodDescribe;
+import com.x.base.core.project.annotation.JaxrsParameterDescribe;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.http.HttpMediaType;
@@ -85,14 +86,15 @@ public class DingdingAction extends StandardJaxrsAction {
 
 	@JaxrsMethodDescribe(value = "到钉钉注册回调地址", action = ActionSyncOrganizationCallbackUrlRegister.class)
 	@GET
-	@Path("sync/organization/register/callback")
+	@Path("sync/organization/register/callback/{enable}")
 	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
 	@Consumes(MediaType.APPLICATION_JSON)
-	public void registerSyncOrgCallbackUrl(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) {
+	public void registerSyncOrgCallbackUrl(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+										   @JaxrsParameterDescribe("注册回调地址还是更新") @PathParam("enable") boolean enable) {
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		ActionResult<ActionSyncOrganizationCallbackUrlRegister.Wo> result = new ActionResult<>();
 		try {
-			result = new ActionSyncOrganizationCallbackUrlRegister().execute(effectivePerson);
+			result = new ActionSyncOrganizationCallbackUrlRegister().execute(effectivePerson, enable);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, null);
 			result.error(e);