diff --git a/framework/src/main/java/cn/lili/modules/file/util/FileUtil.java b/framework/src/main/java/cn/lili/modules/file/util/FileUtil.java deleted file mode 100644 index 46cbf51f..00000000 --- a/framework/src/main/java/cn/lili/modules/file/util/FileUtil.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.lili.modules.file.util; - -/** - * FileUtil - * - * @author Chopper - * @version v1.0 - * 2021-11-22 11:19 - */ -public class FileUtil { - - /** - * 根据原图生成规定尺寸的图片 - * - * @param url 连接 - * @param width 宽 - * @param height 高 - * @return - */ - public static String getUrl(String url, Integer width, Integer height) { - //缩略图全路径 - return url + "?x-oss-process=style/" + width + "X" + height; - } -} diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java index 34b71e08..70508ac7 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java @@ -1,12 +1,14 @@ package cn.lili.modules.goods.serviceimpl; import cn.hutool.json.JSONUtil; +import cn.lili.modules.file.entity.enums.OssEnum; import cn.lili.modules.file.util.FileUtil; import cn.lili.modules.goods.entity.dos.GoodsGallery; import cn.lili.modules.goods.mapper.GoodsGalleryMapper; import cn.lili.modules.goods.service.GoodsGalleryService; import cn.lili.modules.system.entity.dos.Setting; import cn.lili.modules.system.entity.dto.GoodsSetting; +import cn.lili.modules.system.entity.dto.OssSetting; import cn.lili.modules.system.entity.enums.SettingEnum; import cn.lili.modules.system.service.SettingService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -59,9 +61,9 @@ public class GoodsGalleryServiceImpl extends ServiceImpl().eq("goods_id", goodsId)); } + + + /** + * 根据原图生成规定尺寸的图片 + * + * @param url 连接 + * @param width 宽 + * @param height 高 + * @return + */ + private String getUrl(String url, Integer width, Integer height) { + Setting setting = settingService.get(SettingEnum.OSS_SETTING.name()); + OssSetting ossSetting = JSONUtil.toBean(setting.getSettingValue(), OssSetting.class); + switch (OssEnum.valueOf(ossSetting.getType())) { + case MINIO: + //缩略图全路径 + return url + "?x-oss-process=style/" + width + "X" + height; + case ALI_OSS: + //缩略图全路径 + return url + "?x-oss-process=style/" + width + "X" + height; + case HUAWEI_OBS: + //缩略图全路径 + return url + "?image/resize,m_fixed,h_"+height+",w_"+width; + case TENCENT_COS: + //缩略图全路径 + return url + "?imageMogr2/thumbnail/" + width + "x" + height; + } + return url; + } + } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/logistics/plugin/kdniao/KdniaoPlugin.java b/framework/src/main/java/cn/lili/modules/logistics/plugin/kdniao/KdniaoPlugin.java index 9e022575..4cdbe6b9 100644 --- a/framework/src/main/java/cn/lili/modules/logistics/plugin/kdniao/KdniaoPlugin.java +++ b/framework/src/main/java/cn/lili/modules/logistics/plugin/kdniao/KdniaoPlugin.java @@ -63,7 +63,7 @@ public class KdniaoPlugin implements LogisticsPlugin { Map params = new HashMap<>(8); params.put("RequestData", urlEncoder(requestData, "UTF-8")); params.put("EBusinessID", logisticsSetting.getKdniaoEbusinessID()); - params.put("RequestType", "1002"); + params.put("RequestType", logisticsSetting.getRequestType()); String dataSign = encrypt(requestData, logisticsSetting.getKdniaoAppKey(), "UTF-8"); params.put("DataSign", urlEncoder(dataSign, "UTF-8")); params.put("DataType", "2"); diff --git a/framework/src/main/java/cn/lili/modules/sms/plugin/impl/HuaweiSmsPlugin.java b/framework/src/main/java/cn/lili/modules/sms/plugin/impl/HuaweiSmsPlugin.java index fa6818c5..90d9f8d4 100644 --- a/framework/src/main/java/cn/lili/modules/sms/plugin/impl/HuaweiSmsPlugin.java +++ b/framework/src/main/java/cn/lili/modules/sms/plugin/impl/HuaweiSmsPlugin.java @@ -48,7 +48,7 @@ public class HuaweiSmsPlugin implements SmsPlugin { @Override public void sendSmsCode(String signName, String mobile, Map param, String templateCode) { try { - this.sendSms(signName, mobile, "[" + param.values() + "]", templateCode); + this.sendSms(signName, mobile, param.values() + "", templateCode); } catch (Exception e) { e.printStackTrace(); } @@ -115,7 +115,7 @@ public class HuaweiSmsPlugin implements SmsPlugin { //条件必填,国内短信关注,当templateId指定的模板类型为通用模板时生效且必填,必须是已审核通过的,与模板类型一致的签名名称 //国际/港澳台短信不用关注该参数 - String signature = signName; //签名名称 + String signature = smsSetting.getHuaweiSignature(); //签名名称 //必填,全局号码格式(包含国家码),示例:+8615123456789,多个号码之间用英文逗号分隔 String receiver = mobile; //短信接收人号码 diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/LogisticsSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/LogisticsSetting.java index 3eb5a893..0baa3896 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/LogisticsSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/LogisticsSetting.java @@ -31,6 +31,11 @@ public class LogisticsSetting implements Serializable { */ private String kdniaoAppKey; + /** + * 调用端口 + */ + private String requestType; + /** * 快递100 授权码，请申请企业版获取 */ diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/OssSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/OssSetting.java index 95c225ba..b4c12471 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/OssSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/OssSetting.java @@ -31,10 +31,10 @@ public class OssSetting implements Serializable { * 阿里云-储存空间 */ private String aliyunOSSBucketName = ""; - /** - * 阿里云-存放路径路径 - */ - private String aliyunOSSPicLocation = ""; +// /** +// * 阿里云-存放路径路径 +// */ +// private String aliyunOSSPicLocation = ""; /** * 阿里云-密钥id */