修复

fs-company-app/src/main/resources/application.yml

@@ -6,4 +6,4 @@ server:
 spring:
   profiles:
 #    active: druid-fcky-test
-    active: druid-jnmy-test
+    active: druid-bjczwh-test

fs-service/src/main/java/com/fs/course/mapper/FsUserCourseVideoMapper.java

@@ -104,16 +104,15 @@ public interface FsUserCourseVideoMapper extends BaseMapper<FsUserCourseVideo> {
             "<if test = ' maps.videoId!=null and maps.videoId != \"\" '> " +
             "and v.video_id = #{maps.videoId} " +
             "</if>" +
-            " order by v.course_sort  " +
             "<choose>"+
             "<when test = 'maps.sorting!=null and maps.sorting==1 '> " +
-            "order by v.course_sort asc"+
+            " order by v.course_sort asc"+
             "</when>"+
             "<when test = 'maps.sorting!=null and maps.sorting==2 '> " +
-            "order by v.course_sort desc"+
+            " order by v.course_sort desc"+
             "</when>"+
             "<otherwise>"+
-            " order by v.course_sort  "+
+            " order by v.course_sort"+
             "</otherwise>"+
             "</choose>"+
             "</script>"})

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreProductScrmMapper.java

@@ -78,8 +78,7 @@ public interface FsStoreProductScrmMapper
      */
     public int deleteFsStoreProductByIds(Long[] productIds);
     @Select({"<script> " +
-            "select p.*, pc.cate_name, fs.store_name from fs_store_product_scrm p left join fs_store_product_category_scrm pc on p.cate_id=pc.cate_id  " +
-            "MIN(av.purchase_limit) AS purchase_limit " + // 取最小限购量
+            "select p.*, pc.cate_name, fs.store_name, MIN(av.purchase_limit) AS purchase_limit " +//取最小限购
             "FROM fs_store_product_scrm p " +
             "LEFT JOIN fs_store_product_category_scrm pc ON p.cate_id = pc.cate_id " +
             "LEFT JOIN fs_store_product_attr_value_scrm av ON p.product_id = av.product_id " +

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

@@ -70,8 +70,8 @@ nuonuo:
 
 # 存储捅配置
 tencent_cloud_config:
-  secret_id: AKIDiMq9lDf2EOM9lIfqqfKo7FNgM5meD0sT
-  secret_key: u5SuS80342xzx8FRBukza9lVNHKNMSaB
+  secret_id: AKIDraAYkjVIvLch4ReiaIr0FTiyGPOGyUr2
+  secret_key: 3tcDi6QccQ971xoU0KRhpkSyIOIzSikZ
   bucket: czwh-1323137866
   app_id: 1323137866
   region: ap-chongqing

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

@@ -46,7 +46,7 @@ spring:
                 slave:
                     # 从数据源开关/默认关闭
                     enabled: true
-                    url: jdbc:mysql://192.168.0.180:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://192.168.0.180:3306/fs_his?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: czwh
                     password: Ylrz_1q2w3e4r5t6y
               # 从库数据源