Merge remote-tracking branch 'origin/1.0' into 1.0

src/main/java/com/galaxis/manatee/controller/U9WorkMessageController.java

@@ -6,16 +6,12 @@ import com.dingtalk.api.DingTalkClient;
 import com.dingtalk.api.request.OapiMessageCorpconversationAsyncsendV2Request;
 import com.dingtalk.api.response.OapiMessageCorpconversationAsyncsendV2Response;
 import com.galaxis.manatee.constant.DingTalkConstant;
-import com.galaxis.manatee.dao.ChuanyunUserDao;
 import com.galaxis.manatee.entity.chuanyun.dto.U9Message;
 import com.galaxis.manatee.entity.chuanyun.dto.U9ResponseMessageDTO;
-import com.taobao.api.ApiException;
+import com.galaxis.manatee.service.U9WorkMessageService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -29,7 +25,7 @@ import java.util.List;
 public class U9WorkMessageController {
 
     @Autowired
-    private ChuanyunUserDao chuanyunUserDao;
+    private U9WorkMessageService u9WorkMessageService;
 
     @PostMapping("/u9workmessage/send")
     @ResponseBody
@@ -41,7 +37,7 @@ public class U9WorkMessageController {
             List<String> requestIds = new ArrayList<String>();
             if (accounts.length > 0) {
                 for (String accout : accounts) {
-                    String dingreqId = chuanyunUserDao.findByEmployeeNumber(accout).getDingTalkAccount();
+                    String dingreqId = u9WorkMessageService.findByEmployeeNumber(accout).getDingTalkAccount();
                     requestIds.add(dingreqId.substring(0, dingreqId.indexOf(".")));
                 }
             }

src/main/java/com/galaxis/manatee/entity/chuanyun/dto/U9ResponseMessageDTO.java

@@ -5,7 +5,7 @@ import java.time.LocalDateTime;
 
 /**
  * created by IntelliJ IDEA.
- * author: dell
+ * author: xuj
  * date: 2020/9/18
  */
 @Data

src/main/java/com/galaxis/manatee/service/U9WorkMessageService.java

@@ -0,0 +1,19 @@
+package com.galaxis.manatee.service;
+
+import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunUserDO;
+
+/**
+ * created by IntelliJ IDEA.
+ * author: xuj
+ * date: 2020/9/21
+ */
+public interface U9WorkMessageService {
+
+    /**
+     * 根据钉钉工号获取用户对象
+     * @param employeeNumber  钉钉工号
+     * @return 氚云对象
+     */
+    ChuanyunUserDO findByEmployeeNumber(String employeeNumber);
+
+}

src/main/java/com/galaxis/manatee/service/impl/U9WorkMessageServiceImpl.java

@@ -0,0 +1,33 @@
+package com.galaxis.manatee.service.impl;
+
+import com.galaxis.manatee.dao.ChuanyunUserDao;
+import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunUserDO;
+import com.galaxis.manatee.service.U9WorkMessageService;
+import lombok.extern.slf4j.Slf4j;
+import lombok.extern.slf4j.XSlf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * created by IntelliJ IDEA.
+ * author: xuj
+ * date: 2020/9/21
+ */
+@Service
+@Slf4j
+public class U9WorkMessageServiceImpl implements U9WorkMessageService {
+
+    @Autowired
+    private ChuanyunUserDao chuanyunUserDao;
+
+    /**
+     * 根据钉钉工号获取用户对象
+     * @param employeeNumber  钉钉工号
+     * @return 氚云对象
+     */
+    @Override
+    public ChuanyunUserDO findByEmployeeNumber(String employeeNumber) {
+        return chuanyunUserDao.findByEmployeeNumber(employeeNumber);
+    }
+
+}

src/main/resources/application.yml

@@ -38,9 +38,6 @@ aliyun:
       secret: ${ACCESS_KEY_SECRET}
     mobile: ${ALIYUN_MOBILE}
 #spring data jpa database
-server:
-  #端口号
-  port: 8889
 spring:
   task:
     scheduling: