From cc272cd4115a4b0d0fade86fc3e1a4e824518114 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 28 Sep 2020 14:14:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Euniapp-h5URL=E4=B8=8E?= =?UTF-8?q?=E7=8B=AC=E7=AB=8Bh5=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/product/rest/StoreProductController.java | 3 +++ .../yixiang/modules/services/CreatShareProductService.java | 7 +++++++ .../src/main/java/co/yixiang/constant/ShopConstants.java | 2 ++ .../java/co/yixiang/constant/SystemConfigConstants.java | 1 + 4 files changed, 13 insertions(+) diff --git a/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java b/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java index 0e38fccb..606bd11b 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java @@ -16,6 +16,7 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.extra.qrcode.QrCodeUtil; import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; +import co.yixiang.constant.ShopConstants; import co.yixiang.logging.aop.log.AppLog; import co.yixiang.common.aop.NoRepeatSubmit; import co.yixiang.common.bean.LocalUser; @@ -178,6 +179,8 @@ public class StoreProductController { FileUtil.file(fileDir+name)); }else { //生成二维码 + String uniUrl = systemConfigService.getData(SystemConfigConstants.UNI_SITE_URL); + siteUrl = StrUtil.isNotBlank(uniUrl) ? uniUrl : ShopConstants.DEFAULT_UNI_H5_URL; QrCodeUtil.generate(siteUrl+"/pages/shop/GoodsCon/index?id="+id+"&spread="+uid, 180, 180, FileUtil.file(fileDir+name)); } diff --git a/yshop-app/src/main/java/co/yixiang/modules/services/CreatShareProductService.java b/yshop-app/src/main/java/co/yixiang/modules/services/CreatShareProductService.java index 18cb4262..7878cb4d 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/services/CreatShareProductService.java +++ b/yshop-app/src/main/java/co/yixiang/modules/services/CreatShareProductService.java @@ -16,6 +16,7 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.extra.qrcode.QrCodeUtil; import cn.hutool.http.HttpUtil; import co.yixiang.api.YshopException; +import co.yixiang.constant.ShopConstants; import co.yixiang.constant.SystemConfigConstants; import co.yixiang.enums.AppFromEnum; import co.yixiang.enums.OrderInfoEnum; @@ -200,6 +201,8 @@ public class CreatShareProductService { if(from.equals(AppFromEnum.ROUNTINE.getValue())){ siteUrl = siteUrl+"/distribution/"; }else if(AppFromEnum.UNIAPPH5.getValue().equals(from)){ + String uniUrl = systemConfigService.getData(SystemConfigConstants.UNI_SITE_URL); + siteUrl = StrUtil.isNotBlank(uniUrl) ? uniUrl : ShopConstants.DEFAULT_UNI_H5_URL; siteUrl = siteUrl+"/pages/Loading/index"; } File file = FileUtil.mkdir(new File(fileDir)); @@ -316,6 +319,8 @@ public class CreatShareProductService { QrCodeUtil.generate(siteUrl+"/activity/dargain_detail/"+bargainId+"/"+uid+"?spread="+uid, 180, 180, FileUtil.file(fileDir+name)); }else { + String uniUrl = systemConfigService.getData(SystemConfigConstants.UNI_SITE_URL); + siteUrl = StrUtil.isNotBlank(uniUrl) ? uniUrl : ShopConstants.DEFAULT_UNI_H5_URL; QrCodeUtil.generate(siteUrl+"/pages/activity/DargainDetails/index?id="+bargainId+"&uid="+uid+"&partake="+uid, 180, 180, FileUtil.file(fileDir+name)); } @@ -503,6 +508,8 @@ public class CreatShareProductService { QrCodeUtil.generate(siteUrl+"/activity/group_rule/"+pinkId+"?spread="+uid, 180, 180, FileUtil.file(fileDir+name)); }else { + String uniUrl = systemConfigService.getData(SystemConfigConstants.UNI_SITE_URL); + siteUrl = StrUtil.isNotBlank(uniUrl) ? uniUrl : ShopConstants.DEFAULT_UNI_H5_URL; QrCodeUtil.generate(siteUrl+"/pages/activity/GroupRule/index?id="+pinkId+"&spread="+uid, 180, 180, FileUtil.file(fileDir+name)); } diff --git a/yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java b/yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java index 6d060b64..fde29bd8 100644 --- a/yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java +++ b/yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java @@ -171,5 +171,7 @@ public interface ShopConstants { String YSHOP_WECHAT_PUSH_REMARK = "yshop为您服务！"; + String DEFAULT_UNI_H5_URL = "https://h5.yixiang.co"; + } diff --git a/yshop-common/src/main/java/co/yixiang/constant/SystemConfigConstants.java b/yshop-common/src/main/java/co/yixiang/constant/SystemConfigConstants.java index cf15797a..14a72f3a 100644 --- a/yshop-common/src/main/java/co/yixiang/constant/SystemConfigConstants.java +++ b/yshop-common/src/main/java/co/yixiang/constant/SystemConfigConstants.java @@ -5,6 +5,7 @@ public class SystemConfigConstants { public final static String API="api"; public final static String API_URL="api_url"; public final static String SITE_URL="site_url"; + public final static String UNI_SITE_URL="uni_site_url"; public final static String TENGXUN_MAP_KEY="tengxun_map_key"; //业务相关配置