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

101captain

2022-01-21 c71ef8c4ea68de676075ae5da64fcb12ab0d5dfa

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

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsGameMapper.xml

@@ -74,7 +74,7 @@
    </update>
    <select id="pageMcsGame"
            resultType="com.panzhihua.common.model.vos.community.microCommercialStreet.McsGameVO">
        (SELECT t1.id, t1.`name`, t1.`type`, t1.coupons, t1.surplus_coupons,
        (SELECT t1.id, t1.`name`, t1.`type`, t1.coupons, t1.surplus_coupons, t1.award_type,
        t1.publish_at, t1.expire_at, t1.`status`, t1.merchant_id, t2.`name` AS merchantName, t1.is_popular, t1.cover
        FROM mcs_game t1
        LEFT JOIN mcs_merchant t2 ON t1.merchant_id = t2.id
@@ -93,7 +93,7 @@
        </if>
        ORDER BY t1.created_at DESC LIMIT 99999)
        UNION ALL
        (SELECT t1.id, t1.`name`, t1.`type`, t1.coupons, t1.surplus_coupons,
        (SELECT t1.id, t1.`name`, t1.`type`, t1.coupons, t1.surplus_coupons, t1.award_type,
        t1.publish_at, t1.expire_at, t1.`status`, t1.merchant_id, t2.`name` AS merchantName, t1.is_popular, t1.cover
        FROM mcs_game t1
        LEFT JOIN mcs_merchant t2 ON t1.merchant_id = t2.id

 springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/ConvenientApi.java

@@ -207,11 +207,11 @@
        sftp.login();
        for (MultipartFile f : file) {
            String fileExtension = FilenameUtils.getExtension(f.getOriginalFilename());
            String name = UUID.randomUUID().toString().replaceAll("-", "") + fileExtension;
            String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + fileExtension;
            try {
                InputStream is = f.getInputStream();
                String fileName =
                        UUID.randomUUID().toString().replace("-", "") + fileExtension;
                        UUID.randomUUID().toString().replace("-", "") + "." + fileExtension;
                File file1 = new File(fileName);
                f.transferTo(file1);
                boolean delete = file1.delete();

 springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/filter/StoreValidFilter.java

@@ -57,7 +57,7 @@
        boolean mcsBindPhone = uri.contains("/microcommercialstreet/bindPhone");
        boolean wxNotify = uri.contains("/wxNotify");
        boolean getConfig = uri.contains("/config/all");
        boolean isUpload = "/convenient/upload/file".equals(uri);
        boolean isUpload = uri.contains("upload");

        List<String> noLoginUrl = new ArrayList<>();


 springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java

@@ -263,6 +263,7 @@
                noLoginUrl.add("/api/applets/convenient/merchant/incr-view");
                noLoginUrl.add("/api/applets/convenient/product/incr-view");
                noLoginUrl.add("/api/shopbackstage/convenient/upload/file");
                noLoginUrl.add("/api/shopbackstage/convenient/upload/files");
                noLoginUrl.add("/api/applets/warehouse/donates/page");
                noLoginUrl.add("/api/applets/warehouse/donates/get");
                noLoginUrl.add("/api/applets/property/publicity/page");