Merge remote-tracking branch 'origin/master'

fs-admin/src/main/java/com/fs/his/task/Task.java

@@ -485,9 +485,9 @@ public class Task {
     }
 
 
-    public void addQwWatchLogMinute(Long minute) throws Exception{
+    public void addQwWatchLogMinute(Integer minute) throws Exception{
         log.info("定时更新看课111");
-        if(minute == null) minute = 30L;
+        if(minute == null) minute = 30;
         LocalDateTime now = LocalDateTime.now().withSecond(0);
         LocalDateTime start = now.minusMinutes(minute);
         LocalDateTime end = now.minusSeconds(1);

fs-admin/src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: druid-jnmy-test
+    active: dev
 #    active: druid-hdt
 #    active: druid-yzt
 #    active: druid-sxjz

fs-qw-api-msg/src/main/java/com/fs/app/controller/QwMsgController.java

@@ -354,6 +354,7 @@ public class QwMsgController {
                             if(qwUserVideo == null){
                                 QwUserVideo userVideo=new QwUserVideo();
                                 userVideo.setSenderName(wxWorkMessageDTO.getSender_name());
+                                userVideo.setAppKey(qwUserByAppKey.getAppKey());
                                 userVideo.setNickName(wxWorkMessageDTO.getNickname());
                                 userVideo.setObjectId(wxWorkMessageDTO.getObjectId());
                                 userVideo.setCoverUrl(wxWorkMessageDTO.getCover_url());