diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/WebHookAlarmService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/WebHookAlarmService.java index daa0561c..dc6662c7 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/WebHookAlarmService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/WebHookAlarmService.java @@ -25,6 +25,9 @@ import java.util.List; @Service public class WebHookAlarmService implements Alarmable { + private static final String HTTP_PROTOCOL_PREFIX = "http://"; + private static final String HTTPS_PROTOCOL_PREFIX = "https://"; + @Override public void onFailed(Alarm alarm, List targetUserList) { if (CollectionUtils.isEmpty(targetUserList)) { @@ -36,6 +39,11 @@ public class WebHookAlarmService implements Alarmable { return; } + // 自动添加协议头 + if (!webHook.startsWith(HTTP_PROTOCOL_PREFIX) && !webHook.startsWith(HTTPS_PROTOCOL_PREFIX)) { + webHook = HTTP_PROTOCOL_PREFIX + webHook; + } + MediaType jsonType = MediaType.parse(OmsConstant.JSON_MEDIA_TYPE); RequestBody requestBody = RequestBody.create(jsonType, JSONObject.toJSONString(alarm)); diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/ModifyUserInfoRequest.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/ModifyUserInfoRequest.java index e07b00f1..4f47cb3b 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/ModifyUserInfoRequest.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/ModifyUserInfoRequest.java @@ -15,6 +15,7 @@ public class ModifyUserInfoRequest { private String username; private String password; + private String webHook; // 手机号 private String phone;