提交 4fedeec7 authored 作者: zgy's avatar zgy

修改bug

上级 6553de70
...@@ -162,7 +162,7 @@ public class AfricaShopItemSpider implements IItemSpider { ...@@ -162,7 +162,7 @@ public class AfricaShopItemSpider implements IItemSpider {
} }
productResponse.setProductPropSet(productPropSet); productResponse.setProductPropSet(productPropSet);
productResponse.setPlatform("Afrieshop"); productResponse.setPlatform("Afrishop");
productResponse.setPromotionList(promotionList); productResponse.setPromotionList(promotionList);
productResponse.setOriginalPriceList(originalPriceList); productResponse.setOriginalPriceList(originalPriceList);
productResponse.setItemInfo(itemInfo); productResponse.setItemInfo(itemInfo);
...@@ -260,7 +260,7 @@ public class AfricaShopItemSpider implements IItemSpider { ...@@ -260,7 +260,7 @@ public class AfricaShopItemSpider implements IItemSpider {
//取第一张 //取第一张
itemInfo.setPic(resultObj.getString("featured_image")); itemInfo.setPic(resultObj.getString("featured_image"));
itemInfo.setShopName(PlatformEnum.AfriEshop.getValue()); itemInfo.setShopName(PlatformEnum.AfriEshop.getValue());
itemInfo.setShopUrl("https://www.afri-eshop.com/"); itemInfo.setShopUrl("https://www.afrieshop.com/");
itemInfo.setTitle(resultObj.getString("title")); itemInfo.setTitle(resultObj.getString("title"));
productResponse.setPropFlag(true); productResponse.setPropFlag(true);
productResponse.setProductPropSet(productPropSet); productResponse.setProductPropSet(productPropSet);
......
...@@ -5,64 +5,64 @@ import com.diaoyun.zion.master.enums.EnumItemable; ...@@ -5,64 +5,64 @@ import com.diaoyun.zion.master.enums.EnumItemable;
/** /**
* 爬虫枚举 * 爬虫枚举
* *
* @author G * @author G
*/ */
public enum PlatformEnum implements EnumItemable<PlatformEnum> { public enum PlatformEnum implements EnumItemable<PlatformEnum> {
/** /**
* 对应爬虫的枚举 * 对应爬虫的枚举
*/ */
TB("淘宝", "tb"), TB("淘宝", "tb"),
TM("天猫", "tm"), TM("天猫", "tm"),
PULLANDBEAR("Pullandbear","pullandbear"), PULLANDBEAR("Pullandbear", "pullandbear"),
GAP("GAP", "gap"), GAP("GAP", "gap"),
ZARA("Zara", "zara"), ZARA("Zara", "zara"),
UNIQLO("优衣库", "uniqlo"), UNIQLO("优衣库", "uniqlo"),
NIKE("耐克", "nike"), NIKE("耐克", "nike"),
ADIDAS("阿迪达斯", "adidas"), ADIDAS("阿迪达斯", "adidas"),
HM("H&M", "hm"), HM("H&M", "hm"),
LILY("Lily", "lily"), LILY("Lily", "lily"),
EIFINI("伊芙丽", "eifini"), EIFINI("伊芙丽", "eifini"),
URBANREVIVO("UrbanRevivo", "urbanrevivo"), URBANREVIVO("UrbanRevivo", "urbanrevivo"),
ABERCROMBIEFITCH("Abercrombie&Fitch", "aberCrombieFitch"), ABERCROMBIEFITCH("Abercrombie&Fitch", "aberCrombieFitch"),
UNDERARMOUR("安德玛", "underarmour"), UNDERARMOUR("安德玛", "underarmour"),
OCHIRLY("欧时力", "ochirly"), OCHIRLY("欧时力", "ochirly"),
ESPRIT("思捷", "esprit"), ESPRIT("思捷", "esprit"),
LEVI("李维斯", "levi"), LEVI("李维斯", "levi"),
MOCO("MO&Co.", "moco"), MOCO("MO&Co.", "moco"),
MASSIMODUTTI("MassimoDutti", "massimodutti"), MASSIMODUTTI("MassimoDutti", "massimodutti"),
COACH("蔻驰", "coach"), COACH("蔻驰", "coach"),
REVOLVE("Revolve", "revolve"), REVOLVE("Revolve", "revolve"),
VANS("范斯", "vans"), VANS("范斯", "vans"),
ZARAHOME("ZaraHome", "zaraHome"), ZARAHOME("ZaraHome", "zaraHome"),
OYSHO("Oysho", "oysho"), OYSHO("Oysho", "oysho"),
STRADIVARIUS("斯特拉迪瓦里斯", "stradivarius"), STRADIVARIUS("斯特拉迪瓦里斯", "stradivarius"),
MAJE("Maje", "maje"), MAJE("Maje", "maje"),
GUCCI("古驰", "gucci"), GUCCI("古驰", "gucci"),
BURBERRY("博柏利", "burberry"), BURBERRY("博柏利", "burberry"),
PRADA("普拉达", "prada"), PRADA("普拉达", "prada"),
FENDI("芬迪", "fendi"), FENDI("芬迪", "fendi"),
APPLE("苹果", "apple"), APPLE("苹果", "apple"),
LOUISVUITTON("路易威登LV", "louisVuitton"), LOUISVUITTON("路易威登LV", "louisVuitton"),
UN("未知", "un"), UN("未知", "un"),
AfriEshop("afri-eshop","afri-eshop" ); AfriEshop("Afrishop", "Afrishop");
private String label; private String label;
private String value; private String value;
PlatformEnum(String label, String value) { PlatformEnum(String label, String value) {
this.label = label; this.label = label;
this.value = value; this.value = value;
} }
@Override @Override
public String getLabel() { public String getLabel() {
return this.label; return this.label;
} }
@Override @Override
public String getValue() { public String getValue() {
return this.value; return this.value;
} }
} }
...@@ -65,9 +65,9 @@ public class FlutterWaveServiceImpl implements FlutterWaveService { ...@@ -65,9 +65,9 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
private String FLUTTERWAVE_REFUND_URL = "https://api.ravepay.co/gpx/merchant/transactions/refund"; private String FLUTTERWAVE_REFUND_URL = "https://api.ravepay.co/gpx/merchant/transactions/refund";
// //校验API // //校验API
// private String VERIFY_PAY_URL = "https://api.ravepay.co/flwv3-pug/getpaidx/api/v2/verify"; private String VERIFY_PAY_URL = "https://api.ravepay.co/flwv3-pug/getpaidx/api/v2/verify";
//测试API //测试API
private String VERIFY_PAY_URL = "https://ravesandboxapi.flutterwave.com/flwv3-pug/getpaidx/api/v2/verify"; // private String VERIFY_PAY_URL = "https://ravesandboxapi.flutterwave.com/flwv3-pug/getpaidx/api/v2/verify";
/** /**
* 使用卡号支付(预支付) * 使用卡号支付(预支付)
...@@ -80,7 +80,7 @@ public class FlutterWaveServiceImpl implements FlutterWaveService { ...@@ -80,7 +80,7 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
public Result payForOrder(String orderId, FlutterWaveCard flutterWaveCard) { public Result payForOrder(String orderId, FlutterWaveCard flutterWaveCard) {
RaveConstant.PUBLIC_KEY = domainProperties.getProperty("flutterwave.public.key"); RaveConstant.PUBLIC_KEY = domainProperties.getProperty("flutterwave.public.key");
RaveConstant.SECRET_KEY = domainProperties.getProperty("flutterwave.secret.key"); RaveConstant.SECRET_KEY = domainProperties.getProperty("flutterwave.secret.key");
RaveConstant.ENVIRONMENT = Environment.STAGING; //or live RaveConstant.ENVIRONMENT = Environment.LIVE; //or live
Result result = new Result(); Result result = new Result();
TbCfOrderVo tbCfOrderVo = (TbCfOrderVo) orderRedisCache.get(KeyConstant.ORDER_DET + orderId); TbCfOrderVo tbCfOrderVo = (TbCfOrderVo) orderRedisCache.get(KeyConstant.ORDER_DET + orderId);
TbCfOrderEntity orderEntity = tbCfOrderDao.queryObject(orderId); TbCfOrderEntity orderEntity = tbCfOrderDao.queryObject(orderId);
......
...@@ -39,9 +39,9 @@ spring: ...@@ -39,9 +39,9 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
# 测试环境 # 测试环境
# url: jdbc:mysql://47.106.242.175:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false # url: jdbc:mysql://47.106.242.175:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
# username: root # username: root
# password: diaoyun666 # password: diaoyun666
url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
username: root username: root
password: Diaoyunnuli.8 password: Diaoyunnuli.8
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论