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

# Conflicts:
#	fs-service/src/main/resources/application-druid-bjczwh.yml

fs-service/src/main/java/com/fs/course/domain/FsCourseWatchLog.java

@@ -90,5 +90,7 @@ public class FsCourseWatchLog extends BaseEntity
 
     /** im发送消息详情id */
     private Long imMsgSendDetailId;
+    /** 所属小程序id**/
+    private String appid;
 
 }

fs-service/src/main/java/com/fs/course/param/FsUserCourseVideoAddKfUParam.java

@@ -69,5 +69,6 @@ public class FsUserCourseVideoAddKfUParam implements Serializable {
     private String nickName;
 
     private Integer isOpenCourse;
-
+    /** 所属小程序id**/
+    private String appid;
 }

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -865,6 +865,8 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             if (log.getUserId()==null||log.getUserId().equals(0L) || !log.getUserId().equals(param.getUserId())){
                 log.setUserId(param.getUserId());
             }
+            //跟新所属小程序ID
+            log.setAppid(param.getAppid());
             log.setUpdateTime(new Date());
             courseWatchLogMapper.updateFsCourseWatchLog(log);
 

fs-service/src/main/java/com/fs/course/vo/FsCourseWatchLogListVO.java

@@ -137,5 +137,6 @@ public class FsCourseWatchLogListVO extends BaseEntity
      */
     private Long imMsgSendDetailId;
 
+    private String appid;
 
 }

fs-service/src/main/resources/application-druid-bjczwh.yml

@@ -39,7 +39,7 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                  url: jdbc:mysql://1.95.177.188:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                  url: jdbc:mysql://rds.czwh.lan:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                   username: czwh
                   password: Ylrz_1q2w3e4r5t6y
                 # 从库数据源
@@ -94,7 +94,7 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://1.95.177.188:3306/fs_his_sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://rds.czwh.lan:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: czwh
                     password: Ylrz_1q2w3e4r5t6y
                 # 初始连接数

fs-service/src/main/resources/mapper/course/FsCourseWatchLogMapper.xml

@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectFsCourseWatchLogListVO" resultType="com.fs.course.vo.FsCourseWatchLogListVO">
         select l.log_id,l.project,l.period_id,l.user_id,uc.course_name,v.title as video_name,qec.avatar as external_user_avatar,
-        l.log_type,SEC_TO_TIME(l.duration) as duration,c.company_name,l.camp_period_time,l.finish_time,
+        l.log_type,SEC_TO_TIME(l.duration) as duration,c.company_name,l.camp_period_time,l.finish_time,l.appid,
         cu.nick_name as company_user_name ,l.send_type,l.create_time,l.update_time,l.last_heartbeat_time,
         CASE 
             WHEN qu.qw_user_name IS NOT NULL AND qu.qw_user_name LIKE '{%' THEN JSON_UNQUOTE(JSON_EXTRACT(qu.qw_user_name, '$.name'))