Skip to content

Z
zion
提交 d839b542 authored 作者: zgy's avatar zgy
浏览文件
操作

Merge remote-tracking branch 'origin/master'

上级 9d17852f abcd3122
显示空白字符变更
内嵌 并排
正在显示 包含 95 行增加 和 54 行删除
src/main/java/com/diaoyun/zion/chinafrica/controller/VersionController.java
浏览文件 @ d839b542
......@@ -8,7 +8,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
......@@ -20,10 +22,12 @@ public class VersionController {
@RequestMapping("/getVersionCode")
@GetMapping
public Map<String, TbCfVersionEntity> getGoodsTypeList( @RequestParam(required = false) String code) {
Map<String,TbCfVersionEntity> map = new HashMap<>();
TbCfVersionEntity version = tbCfVersionService.getVersionCode(code);
map.put("data",version);
return map;
public List<TbCfVersionEntity> getGoodsTypeList(@RequestParam(required = false) String code) {
List<TbCfVersionEntity> versioonList=new ArrayList<>();
List<TbCfVersionEntity> versions = tbCfVersionService.getVersionCode(code);
for(TbCfVersionEntity version:versions){
versioonList.add(version);
}
return versioonList;
}
}
src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfVersionDao.java
浏览文件 @ d839b542
......@@ -2,8 +2,11 @@ package com.diaoyun.zion.chinafrica.dao;
import com.diaoyun.zion.chinafrica.entity.TbCfVersionEntity;
import com.diaoyun.zion.master.base.Result;
import com.diaoyun.zion.master.dao.BaseDao;
import java.util.List;
/**
* Dao
*
......@@ -11,5 +14,5 @@ import com.diaoyun.zion.master.dao.BaseDao;
* @date 2019-10-22 14:33:29
*/
public interface TbCfVersionDao extends BaseDao<TbCfVersionEntity> {
TbCfVersionEntity getVersionCode(String code);
List<TbCfVersionEntity> getVersionCode(String code);
}
src/main/java/com/diaoyun/zion/chinafrica/entity/TbCfVersionEntity.java
浏览文件 @ d839b542
package com.diaoyun.zion.chinafrica.entity;
import java.io.Serializable;
import java.util.Date;
/**
* 实体
......@@ -29,7 +28,10 @@ public class TbCfVersionEntity implements Serializable {
* 版本更新内容
*/
private String versionDetail;
/**
* 版本分类(0安卓,1苹果)
*/
private Integer versionSort;
/**
* 设置：版本号Id
*/
......@@ -82,4 +84,17 @@ public class TbCfVersionEntity implements Serializable {
public String getVersionDetail() {
return versionDetail;
}
/**
* 获取： 版本分类(0安卓,1苹果)
*/
public Integer getVersionSort() {
return versionSort;
}
/**
* 设置： 版本分类(0安卓,1苹果)
*/
public void setVersionSort(Integer versionSort) {
this.versionSort = versionSort;
}
}
src/main/java/com/diaoyun/zion/chinafrica/service/TbCfVersionService.java
浏览文件 @ d839b542
......@@ -70,5 +70,5 @@ public interface TbCfVersionService {
*/
int deleteBatch(String[] versionIds);
TbCfVersionEntity getVersionCode(String code);
List<TbCfVersionEntity> getVersionCode(String code);
}
src/main/java/com/diaoyun/zion/chinafrica/service/impl/FlutterWaveServiceImpl.java
浏览文件 @ d839b542
......@@ -67,7 +67,7 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
//校验API
private String VERIFY_PAY_URL = "https://api.ravepay.co/flwv3-pug/getpaidx/api/v2/verify";
//测试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 {
public Result payForOrder(String orderId, FlutterWaveCard flutterWaveCard) {
RaveConstant.PUBLIC_KEY = domainProperties.getProperty("flutterwave.public.key");
RaveConstant.SECRET_KEY = domainProperties.getProperty("flutterwave.secret.key");
RaveConstant.ENVIRONMENT = Environment.LIVE; //or live
RaveConstant.ENVIRONMENT = Environment.STAGING; //or live
Result result = new Result();
TbCfOrderVo tbCfOrderVo = (TbCfOrderVo) orderRedisCache.get(KeyConstant.ORDER_DET + orderId);
TbCfOrderEntity orderEntity = tbCfOrderDao.queryObject(orderId);
......@@ -150,7 +150,6 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
TbCfFinanceEntity finance = createFinance(paymentid, authurl, tbCfOrderVo);
TbCfFinanceVo tbCfFinanceVo = new TbCfFinanceVo();
BeanUtils.copyProperties(finance, tbCfFinanceVo);
//清空订单
removeRedisCache(tbCfOrderVo);
}
......
src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfVersionServiceImpl.java
浏览文件 @ d839b542
......@@ -3,6 +3,7 @@ package com.diaoyun.zion.chinafrica.service.impl;
import com.diaoyun.zion.chinafrica.dao.TbCfVersionDao;
import com.diaoyun.zion.chinafrica.entity.TbCfVersionEntity;
import com.diaoyun.zion.chinafrica.service.TbCfVersionService;
import com.diaoyun.zion.master.base.Result;
import com.diaoyun.zion.master.util.IdUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -58,7 +59,9 @@ public class TbCfVersionServiceImpl implements TbCfVersionService {
}
@Override
public TbCfVersionEntity getVersionCode(String code) {
public List<TbCfVersionEntity> getVersionCode(String code) {
return tbCfVersionDao.getVersionCode(code);
}
}
src/main/resources/mapper/TbCfVersionDao.xml
浏览文件 @ d839b542
......@@ -8,33 +8,39 @@
<result property="versionCode" column="version_code"/>
<result property="versionLike" column="version_like"/>
<result property="versionDetail" column="version_detail"/>
<result property="versionSort" column="version_sort"/>
</resultMap>
<select id="getVersionCode" resultType="com.diaoyun.zion.chinafrica.entity.TbCfVersionEntity">
<select id="queryObject" resultType="com.diaoyun.zion.chinafrica.entity.TbCfVersionEntity">
select
`version_id`,
`version_code`,
`version_like`,
`version_detail`
`version_detail`,
`version_sort`
from tb_cf_version
where version_code = #{code}
where version_id = #{id}
</select>
<select id="queryObject" resultType="com.diaoyun.zion.chinafrica.entity.TbCfVersionEntity">
<select id="getVersionCode" resultType="com.diaoyun.zion.chinafrica.entity.TbCfVersionEntity">
select
`version_id`,
`version_code`,
`version_like`,
`version_detail`
`version_detail`,
`version_sort`
from tb_cf_version
where version_id = #{id}
where 1=1
<if test="versionCode != null and versionCode.trim() != ''" >
and version_code = #{versionCode}
</if>
</select>
<select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfVersionEntity">
select
`version_id`,
`version_code`,
`version_like`,
`version_detail`
`version_detail`,
`version_sort`
from tb_cf_version
WHERE 1=1
<if test="name != null and name.trim() != ''">
......@@ -66,18 +72,21 @@
`version_id`,
`version_code`,
`version_like`,
`version_detail`)
`version_detail`,
`version_sort`)
values(
#{versionId},
#{versionCode},
#{versionLike},
#{versionDetail})
#{versionDetail},
#{versionSort})
</insert>
<update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfVersionEntity">
update tb_cf_version
<set>
<if test="versionCode != null">`version_code` = #{versionCode}, </if>
<if test="versionSort != null">`version_sort` = #{versionSort}, </if>
<if test="versionLike != null">`version_like` = #{versionLike}, </if>
<if test="versionDetail != null">`version_detail` = #{versionDetail}</if>
</set>
......@@ -95,4 +104,5 @@
</foreach>
</delete>
</mapper>
\ No newline at end of file
src/main/resources/properties/domain.properties
浏览文件 @ d839b542
#############\u914D\u7F6E###########################
#\u7528\u6237\u9ED8\u8BA4\u5934\u50CF
#############配置###########################
#用户默认头像
user.avatar=https://dev.diaosaas.com/upload/chinafrica/user/avatar.png
################################################################################
###################################\u90AE\u7BB1###############################################
#\u7F51\u6613
###################################邮箱###############################################
#网易
#email.hostName=smtp.yeah.net
#email.from.email=chinafrica@yeah.net
#email.from.name=chinafrica
#email.authentication.userName=chinafrica@yeah.net
#email.authentication.password=diaoyun2019
#\u963F\u91CC\u4F01\u4E1A\u90AE\u7BB1
#阿里企业邮箱
email.hostName=smtp.mxhichina.com
email.from.email=official@afrieshop.com
email.from.name=Afrishop
email.authentication.userName=official@afrieshop.com
email.authentication.password=Afri123456
#\u53D1\u9001\u4E3B\u9898
#发送主题
email.subject=Verification Code from Afrishop
###################################\u90AE\u7BB1 END###############################################
################redis\u6709\u6548\u65F6\u95F4###################
#\u767B\u5F55token second \u9ED8\u8BA430\u5206 \u4E00\u4E2A\u661F\u671F 604800
###################################邮箱 END###############################################
################redis有效时间###################
#登录token second 默认30分 一个星期 604800
redis.token.expiredTime=7776000000
#\u8BA2\u5355 30\u5206 second
#订单 30分 second
redis.order.expiredTime=1800
################\u817E\u8BAF\u7FFB\u8BD1\u914D\u7F6E###################
################腾讯翻译配置###################
tencent.translate.app_id=2120761040
//tencent.translate.app_id=2124562134
tencent.translate.app_url=https://api.ai.qq.com/fcgi-bin/nlp/nlp_texttranslate
//tencent.wordseg.app_url=https://api.ai.qq.com/fcgi-bin/nlp/nlp_wordseg
tencent.wordpos.app_url=https://api.ai.qq.com/fcgi-bin/nlp/nlp_wordpos
################\u817E\u8BAF\u7FFB\u8BD1\u914D\u7F6E END###################
##################\u65B011.05(stripe\u516C\u94A5(\u4E0D\u52A0\u5BC6)\u548C\u79C1\u94A5(\u5DF2\u7528 AESUtils \u52A0\u5BC6))################################
################腾讯翻译配置 END###################
##################新11.05(stripe公钥(不加密)和私钥(已用 AESUtils 加密))################################
#stripe.pk=pk_live_FP6ipnw3lt0e1AmS5IVdpJWd00s5PLdbVa
#stripe.sk=YWA9aMOPvCfq0KWda2Wsh567lLl600+QK/X8ZEFDPj6UDNd3icKr6fJ+X3ey8X+T
#stripe.pk=pk_test_y5dXLjyUyBD11Ta9g2DGynxN0048vnmpGz
#stripe.sk=+RFm7p84hym4liN1/MSoshYMiy4rWgUFoZ3S5+ucxRTyzblQL2Pi0y1TDQoSE96z
stripe.pk=pk_live_puDlKTnBSW6CXQ6TG766jWZ000UuPSIUDU
stripe.sk=YVym3/CqlcF3PF6JZw6CEOhCoR4R7oqlK8HM8LHlZnqzZijZdjlxIb5wl7/S6e6y
##################stripe\u516C\u94A5(\u4E0D\u52A0\u5BC6)\u548C\u79C1\u94A5(\u5DF2\u7528 AESUtils \u52A0\u5BC6)################################
##################stripe公钥(不加密)和私钥(已用 AESUtils 加密)################################
#stripe.pk=pk_live_5MdXU4N1cvmU1yatYp5v0E0n00C7tAXpGB
#stripe.sk=d87UqTQ6QUjuNkXrjH51Gl/Zqnfy98HRl23xljism2hpaXjSNTwdl6pv6FM7D4tT
#stripe.pk=pk_test_rXUSgU8Kw7DLhDzMbHM0r55O00JAzVBBJR
#stripe.sk=3ff57yz9S5INBexBOnzi/ZaxClXkXlJ+FZ6XLc/f2vpESScG7YOaQaG2YNRic3HF
######################outlook\u7684\u8D26\u6237\u516C\u94A5\u5BC6\u94A5#####################
######################outlook的账户公钥密钥#####################
#stripe.pk=pk_test_uljWJWUuD8fzZXPlGtDZ1fxx00o1ZKr7QL
#stripe.sk=BbLXgo+ohgrAP7p3tB52YTqNwhAiTYzYWAX0W+/1PES6kOupxwc/7xpAR8QsG6gP
######################outlook\u7684\u8D26\u6237\u516C\u94A5\u5BC6\u94A5 END#####################
##################stripe\u516C\u94A5\u548C\u79C1\u94A5 END###############################
#############################\u7B2C\u4E09\u65B9\u7269\u6D41\u516C\u53F8\u63A5\u53E3#################################
######################outlook的账户公钥密钥 END#####################
##################stripe公钥和私钥 END###############################
#############################第三方物流公司接口#################################
express.info.api=http://shd.kjwlxt.com/api/track.php
express.info.user_no=shd806
express.info.token=d44426bd5b64dd2
##########################PayPal\u652F\u4ED8############################################
##########################PayPal支付############################################
#paypal.mode=sandbox
#paypal.client.app=AW7u5JVLhzA7_0EznoZ7uKHFzz1_nACOtt6k9oEpbisGUy3nqjjb3L-MmBFnD3YDuMSapcXpfSiYWtiB
#paypal.client.secret=EIyDryMDyM0BDWp2mtuGFdSU2WOkWtmSuGGaRnUiIom7kxuM7JhuSFfETbC8X4e9E_ZbMX4zg4jHA1lV
paypal.mode=live
#################################paypal\u771F\u5B9E######################################################
#################################paypal真实######################################################
#paypal.client.app=AUUFVT30kPIP-a7dcQfPS8KYdl5cCZIwyYNIS79Cp7E_0GNZWfut3ZHQiRIoamqRstHigMoTTy1n8Glj
#paypal.client.secret=EJBVz86f9Mg482bL3lniPtLYe_ULyBkjTS0q-qhZBIVFC3dgae-J7-JJA5iWQAZsQqtAOV_ctVGWNLJS
paypal.success.url=https://africa.gzdazt.com/zion/paypal/success
paypal.cancel.url=https://africa.gzdazt.com/zion/paypal/cancel
#################################paypal\u6D4B\u8BD5######################################################
#################################paypal测试######################################################
paypal.client.app=AW7u5JVLhzA7_0EznoZ7uKHFzz1_nACOtt6k9oEpbisGUy3nqjjb3L-MmBFnD3YDuMSapcXpfSiYWtiB
paypal.client.secret=EIyDryMDyM0BDWp2mtuGFdSU2WOkWtmSuGGaRnUiIom7kxuM7JhuSFfETbC8X4e9E_ZbMX4zg4jHA1lV
#paypal.success.url=http://localhost:8083/zion/paypal/success
#paypal.cancel.url=http://localhost:8083/zion/paypal/cancel
#################################flutterwave\u771F\u5B9E######################################################
#################################flutterwave真实######################################################
#flutterwave.public.key=FLWPUBK-f69061bce3128da9b15c1e12c6182ff8-X
#flutterwave.secret.key=FLWSECK-38ec6860f49e953333218d929281ce65-X
#flutterwave.encryption.key=38ec6860f49e0d9d488a83b1
#flutterwave.merchant.id=3950728
#################################flutterwave\u771F\u5B9E(miumiu@afrieshop.com)######################################################
#################################flutterwave真实(miumiu@afrieshop.com)######################################################
flutterwave.public.key=FLWPUBK-ee0f5d653f5f33fc89e6caf9de6a4c34-X
flutterwave.secret.key=FLWSECK-c06cdc19526077f3855b76045ca77de3-X
flutterwave.encryption.key=c06cdc1952600626ec8779ed
flutterwave.merchant.id=6577084
#################################flutterwave\u6D4B\u8BD5(TEST)######################################################
#################################flutterwave测试(TEST)######################################################
#flutterwave.public.key=FLWPUBK_TEST-e3cc948e7cb24b2128fca3b781f6fce0-X
#flutterwave.secret.key=FLWSECK_TEST-f88371ca63a989a4af95625475a0d22d-X
#flutterwave.encryption.key=FLWSECK_TEST001d4c34f798
......
src/test/java/com/diaoyun/zion/PayTest.java
浏览文件 @ d839b542
......@@ -17,10 +17,6 @@ import com.mashape.unirest.http.exceptions.UnirestException;
import io.swagger.models.auth.In;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import okhttp3.ResponseBody;
import org.apache.http.Consts;
import org.apache.http.HttpRequest;
import org.junit.Test;
......
src/test/java/com/diaoyun/zion/ZionApplicationTests.java
浏览文件 @ d839b542
......@@ -494,5 +494,16 @@ public class ZionApplicationTests {
//SMSUtil.yzCode("13751400455");
}
@Test
public void testCP(){
Set<String> set =new HashSet<>();
set.add("121");
set.add("121");
set.add("121");
set.add("121");
Iterator it = set.iterator();
while(it.hasNext()){
System.out.println(it.next());
}
}
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论