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

src/main/java/org/rcisoft/business/bchapter/dao/BChapterRepository.java

@@ -45,22 +45,21 @@ public interface BChapterRepository extends BaseMapper<BChapter> {
      * @param param
      * @return
      */
-    @Select("<script>SELECT\n" +
-            "\tbc.*,\n" +
-            "\tbf.file_size AS fileSize \n" +
-            "FROM\n" +
-            "\tb_chapter bc\n" +
-            "\tLEFT JOIN b_file bf ON bf.chapter_id = bc.business_id \n" +
-            "WHERE\n" +
-            "\tbc.del_flag = 0 \n" +
-            "\tAND bc.flag = 1 \n" +
-            "\tAND bc.pid = - 1 \n" +
-            "\tAND bc.lesson_id = #{lessonId}\n" +
-            "\t\n" +
-            "\tAND bc.corp_id = #{corpId}\n" +
-            "\t\n" +
-            "ORDER BY\n" +
-            "\tsort ASC</script>")
+    @Select("<script>" +
+            "SELECT " +
+            "bc.*, " +
+            "bf.file_size " +
+            "FROM " +
+            "b_chapter bc " +
+            "LEFT JOIN b_file bf ON bf.chapter_id = bc.business_id  " +
+            "WHERE " +
+            "bc.del_flag = 0  " +
+            "AND bc.flag = 1  " +
+            "AND bc.pid = - 1  " +
+            "AND bc.lesson_id = #{lessonId} " +
+            "AND bc.corp_id = #{corpId} " +
+            "ORDER BY sort ASC" +
+            "</script>")
     @ResultMap(value = "SupperChildListResultMap")
     List<QueryChapterListResDTO> queryBChapters(Map<String, Object> param);
 
@@ -80,7 +79,9 @@ public interface BChapterRepository extends BaseMapper<BChapter> {
             " bc.lesson_id, " +
             " bc.sort," +
             " bf.video_url AS videoUrl, " +
-            " bf.file_name AS fileName " +
+            " bf.file_name AS fileName ," +
+            " bf.file_time AS fileTime ," +
+            " bf.file_size AS fileSize " +
             " FROM " +
             " b_chapter bc " +
             " LEFT JOIN b_file bf ON bf.chapter_id = bc.business_id " +

src/main/java/org/rcisoft/business/bexternallink/dto/MenuDTO.java

@@ -15,4 +15,6 @@ public class MenuDTO {
     public  String mobileLogo;
 
     public  String computerLogo;
+
+    public  String type;
 }

src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java

@@ -305,7 +305,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     int getUserflag (CurUser curUser);
 
 
-    @Select("<script>select title menuName,external_url url,mobile_logo mobileLogo ,computer_logo computerLogo " +
+    @Select("<script>select title menuName,external_url url,mobile_logo mobileLogo ,computer_logo computerLogo  ,type " +
             "from b_external_link where 1=1  " +
             "<if test=\"type !=null \"> and type in ('1',${type}) </if>" +
             "  and corp_id = #{corpId} " +

src/main/resources/application-mt.yml

@@ -13,21 +13,16 @@ server:
 #    root: INFO
 #    org.springframework.web: DEBUG
 
-druid:
-#  url: jdbc:mysql://192.168.5.201:20001/edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-  url: jdbc:mysql://mt_mysql:3306/edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-  username: root
-  password: 91isoft
-  initial-size: 1
-  min-idle: 1
-  max-active: 20
-  test-on-borrow: true
-
-  initial-size: 1
-  min-idle: 1
-  max-active: 20
-  test-on-borrow: true
-
+#druid:
+##  url: jdbc:mysql://192.168.5.201:20001/edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+#  url: jdbc:mysql://mt_mysql:3306/edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+#  username: root
+#  password: 91isoft
+#  initial-size: 1
+#  min-idle: 1
+#  max-active: 20
+#  test-on-borrow: true
+#
 
 mybatis:
   mapper-locations: classpath:mapper/**/**/*.xml
@@ -47,6 +42,12 @@ pagehelper:
 
 
 spring:
+  datasource:
+    url: jdbc:mysql://mt_mysql:3306/edu_db?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true
+    username: root
+    password: 91isoft
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
   jackson:
     default-property-inclusion: non_null
     date-format: yyyy-MM-dd

src/main/resources/mapper/business/bchapter/mapper/BChapterMapper.xml

@@ -39,10 +39,11 @@
         <result column="is_complete" jdbcType="VARCHAR" property="isComplete"/>
         <result column="file_name" jdbcType="VARCHAR" property="fileName"/>
         <result column="course_time" jdbcType="VARCHAR" property="courseTime"/>
+        <result column="file_size" jdbcType="VARCHAR" property="fileSize"/>
         <result column="corp_id" jdbcType="VARCHAR" property="corpId"/>
     </resultMap>
 
-    <!--教师和管理员使用这个-->
+
     <resultMap id="SupperChildListResultMap" type="org.rcisoft.business.bchapter.dto.QueryChapterListResDTO" extends="BaseResultMapDTO">
         <association column="business_id" property="childList" select="org.rcisoft.business.bchapter.dao.BChapterRepository.queryBChaptersByPid"></association>
     </resultMap>