From 0a5eac2dbf700dbdb4950e9c58313d4ff2c5d6fa Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 5 Aug 2020 16:24:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E4=BA=BA=E5=8F=91?= =?UTF-8?q?=E9=80=81=E6=A0=BC=E5=BC=8F=20text=E6=94=B9=E4=B8=BAmarkDown?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WarrantServiceImpl.java | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java index 39dddfe6dc..63d0d8970e 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java @@ -206,28 +206,29 @@ public class WarrantServiceImpl implements WarrantService { public void dingDingRobot(String result,String event,String customerName,String clientType){ DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/robot/send?access_token=5b48fcbc3fde24b8ba4696aa062b7f8146479a9d3467dbb1f9cf132ec36b955a"); OapiRobotSendRequest request = new OapiRobotSendRequest(); - request.setMsgtype("text"); - OapiRobotSendRequest.Text text = new OapiRobotSendRequest.Text(); + request.setMsgtype("markdown"); + OapiRobotSendRequest.Markdown markdown = new OapiRobotSendRequest.Markdown(); + markdown.setTitle("代码审核结果"); switch (event){ case ModuleConstant.WEAPP_AUDIT_SUCCESS: - text.setContent("代码审核结果: 审核成功\n"+ - "客户名称：" + customerName +"\n"+ - "客户端："+clientType+"\n"); + markdown.setText("代码审核结果: 审核成功\n"+ + "> 客户名称：" + customerName +"\n\n"+ + "> 客户端："+clientType+"\n"); break; case ModuleConstant.WEAPP_AUDIT_FAIL: - text.setContent("代码审核结果: 审核不通过\n"+ - "客户名称：" + customerName +"\n"+ - "客户端："+clientType+"\n"+ - "不通过原因："+result); + markdown.setText("代码审核结果: 审核不通过\n"+ + "> 客户名称：" + customerName +"\n\n"+ + "> 客户端："+clientType+"\n\n"+ + "> 不通过原因："+result); break; case ModuleConstant.WEAPP_AUDIT_DELAY: - text.setContent("代码审核结果: 审核延时\n"+ - "客户名称：" + customerName +"\n"+ - "客户端："+clientType+"\n"+ - "延时原因："+result); + markdown.setText("代码审核结果: 审核延时\n"+ + "> 客户名称：" + customerName +"\n\n"+ + "> 客户端："+clientType+"\n\n"+ + "> 延时原因："+result); break; } - request.setText(text); + request.setMarkdown(markdown); try { OapiRobotSendResponse response = client.execute(request); } catch (ApiException e) { From 73d706dce105345236f4db72cfaa076bfb08a08f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 5 Aug 2020 16:27:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index 1fed1dc23f..0e7d073592 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.103 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.104 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 982e0e434c..5cc16a2e80 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.103 + 0.0.104 com.epmet