记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 91bfccfe authored by 张国柄's avatar 张国柄
Browse files
Options

Merge remote-tracking branch 'origin/master' into bak220720_merge 

# Conflicts:
#	liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/config/AbstractRedisConfig.java
#	liquidnet-bus-config/liquidnet-config/application-test.yml
#	liquidnet-bus-config/liquidnet-config/application-yace.yml
#	liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web-yace.yml
#	liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-yace.yml
#	liquidnet-bus-config/liquidnet-config/liquidnet-support-zuul-yace.yml
#	liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/bootstrap-yace.yml
#	liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/resources/bootstrap-yace.yml
#	liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/resources/bootstrap-yace.yml
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-adam/src/main/java/com/liquidnet/service/consumer/adam/config/ConsumerAdamSmsSenderRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-adam/src/main/java/com/liquidnet/service/consumer/adam/config/ConsumerChimeRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-candy/src/main/java/com/liquidnet/service/consumer/candy/config/ConsumerCandyCouponBackRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-candy/src/main/java/com/liquidnet/service/consumer/candy/config/ConsumerCandyCouponOrderBackRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-candy/src/main/java/com/liquidnet/service/consumer/candy/config/ConsumerCandyCouponReceiveRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-candy/src/main/java/com/liquidnet/service/consumer/candy/config/ConsumerCandyCouponUseRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/java/com/liquidnet/service/consumer/goblin/config/ConsumerGoblinOrderAGRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/java/com/liquidnet/service/consumer/goblin/config/ConsumerGoblinOrderCPRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/config/ConsumerKylinSqlOptOrderCloseRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/config/ConsumerKylinSqlOrderPayRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/config/ConsumerKylinSqlOrderRefundRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-slowly/src/main/java/com/liquidnet/service/consumer/slowly/config/ConsumerGoblinSelfMarketRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-slowly/src/main/java/com/liquidnet/service/consumer/slowly/config/ConsumerGoblinShopCartStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-slowly/src/main/java/com/liquidnet/service/consumer/slowly/config/ConsumerGoblinStoneMarketRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-slowly/src/main/java/com/liquidnet/service/consumer/slowly/config/ConsumerGoblinStoreOrderRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-slowly/src/main/java/com/liquidnet/service/consumer/slowly/config/ConsumerGoblinUserOrderRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-slowly/src/main/java/com/liquidnet/service/consumer/slowly/config/ConsumerGoblinXlsRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-slowly/src/main/java/com/liquidnet/service/consumer/slowly/config/ConsumerKylinOptTransferOverTimeRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-slowly/src/main/java/com/liquidnet/service/consumer/slowly/config/ConsumerKylinOrderRefundExpressRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-slowly/src/main/java/com/liquidnet/service/consumer/slowly/config/ConsumerKylinSmsSenderRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-slowly/src/main/java/com/liquidnet/service/consumer/slowly/config/ConsumerKylinSqlOrderWithdrawRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-slowly/src/main/java/com/liquidnet/service/consumer/slowly/config/ConsumerKylinSqlPerformanceLackRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-slowly/src/main/java/com/liquidnet/service/consumer/slowly/config/ConsumerKylinSqlStationRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-slowly/src/main/java/com/liquidnet/service/consumer/slowly/config/ConsumerKylinSqlTransferRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-slowly/src/main/java/com/liquidnet/service/consumer/slowly/config/ConsumerKylinSqlTransferResultRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-slowly/src/main/java/com/liquidnet/service/consumer/slowly/config/ConsumerSlimeFieldRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-slowly/src/main/java/com/liquidnet/service/consumer/slowly/config/ConsumerSlimeLineRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-slowly/src/main/java/com/liquidnet/service/consumer/slowly/config/ConsumerSlimePerformanceInsertRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-slowly/src/main/java/com/liquidnet/service/consumer/slowly/config/ConsumerSlimePerformanceRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-slowly/src/main/java/com/liquidnet/service/consumer/slowly/config/ConsumerSlimeSponsorRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-slowly/src/main/java/com/liquidnet/service/consumer/slowly/config/ConsumerSlimeStep2RedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-slowly/src/main/java/com/liquidnet/service/consumer/slowly/config/ConsumerSlimeTicketRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-stone/src/main/java/com/liquidnet/servce/consumer/stone/service/config/ConsumerStoneLogsRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-stone/src/main/java/com/liquidnet/servce/consumer/stone/service/config/ConsumerStoneOrderRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-stone/src/main/java/com/liquidnet/servce/consumer/stone/service/config/ConsumerStoneUserRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/config/ConsumerSmileUserRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/config/ConsumerSweetAnswerRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/config/ConsumerSweetAntigenicQuestionRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/config/ConsumerSweetCityVoteRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/config/ConsumerSweetIntegralActivityDrawRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/config/ConsumerSweetMaoDengConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/config/ConsumerSweetOtherApiStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/config/ConsumerSweetPosterRdsReceiverConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/config/ConsumerSweetRemindRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/config/ConsumerSweetSqlLuckDrawRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/config/ConsumerSweetSqlUserRelationMDSKRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/config/ConsumerSweetSqlUserRelationRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/config/ConsumerSweetUserRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/resources/bootstrap-yace.yml
#	liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java
#	liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/bootstrap-yace.yml
#	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/bootstrap-yace.yml
#	liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/resources/bootstrap-yace.yml
#	liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/resources/bootstrap-yace.yml
#	liquidnet-bus-service/liquidnet-service-slime/liquidnet-service-slime-impl/src/main/resources/bootstrap-yace.yml
#	liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/resources/bootstrap-yace.yml
#	liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/src/main/resources/bootstrap-yace.yml
#	liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/bootstrap-yace.yml
parents 8705a9c7 7b0a3236
Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 122 deletions
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtDigitalGoodsAddSkuParam.java
View file @ 91bfccfe
......@@ -195,8 +195,8 @@ public class GoblinStoreMgtDigitalGoodsAddSkuParam implements Serializable {
initVo.setSkuStock(0);
// initVo.setBuyLimit(this.getBuyLimit());//
// initVo.setBuyFactor(this.getBuyFactor());//
initVo.setSkuAppear("0");
initVo.setSkuCanbuy("1");
initVo.setSkuAppear(null == this.getSkuAppear() ? "0" : this.getSkuAppear());//1
initVo.setSkuCanbuy(null == this.getSkuCanbuy() ? "1" : this.getSkuCanbuy());//1
initVo.setOpeningTime(DateUtil.Formatter.yyyyMMddHHmmss.parse(this.getOpeningTime()));//1
}
return initVo;
......@@ -227,8 +227,8 @@ public class GoblinStoreMgtDigitalGoodsAddSkuParam implements Serializable {
case "1":
// updateVo.setBuyLimit(this.getBuyLimit());//
// updateVo.setBuyFactor(this.getBuyFactor());//
updateVo.setSkuAppear("0");//
updateVo.setSkuCanbuy("1");//
updateVo.setSkuAppear(null == this.getSkuAppear() ? "0" : this.getSkuAppear());//1
updateVo.setSkuCanbuy(null == this.getSkuCanbuy() ? "1" : this.getSkuCanbuy());//1
updateVo.setName(this.getName());//1
updateVo.setSkuPic(this.getSkuPic());//1
updateVo.setSkuWatch(this.getSkuWatch());//1
......
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/KylinCandyItemParam.java 0 → 100644
View file @ 91bfccfe
package com.liquidnet.service.kylin.dto.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
@ApiModel
@Data
public class KylinCandyItemParam implements Serializable, Cloneable {
@ApiModelProperty(value = "券类型id")
private String couponId;
@ApiModelProperty(value = "每一张券id")
private String ucouponId;
private static final KylinCandyItemParam obj = new KylinCandyItemParam();
public static KylinCandyItemParam getNew() {
try {
return (KylinCandyItemParam) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinCandyItemParam();
}
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/KylinCandyParam.java
View file @ 91bfccfe
......@@ -12,7 +12,7 @@ import java.util.List;
public class KylinCandyParam implements Serializable, Cloneable {
@ApiModelProperty(value = "券id集合")
private List<String> couponList;
private List<KylinCandyItemParam> couponList;
@ApiModelProperty(value = "巡演id")
private String roadShowId;
......
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinCandyVo.java
View file @ 91bfccfe
......@@ -10,8 +10,10 @@ import java.io.Serializable;
@Data
public class KylinCandyVo implements Serializable, Cloneable {
@ApiModelProperty(value = "券id")
@ApiModelProperty(value = "券类别id")
private String couponId;
@ApiModelProperty(value = "券id")
private String ucouponId;
@ApiModelProperty(value = "巡演id")
private String roadShowId;
......
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinPerformancesService.java
View file @ 91bfccfe
package com.liquidnet.service.kylin.service;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dto.param.KylinCandyItemParam;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinCandyVo;
import java.util.List;
......@@ -28,5 +29,5 @@ public interface IKylinPerformancesService {
ResponseDto<Integer> isSubscribe(String performancesId);
ResponseDto<List<KylinCandyVo>> kylinCandy(List<String> data, String roadShowId);
ResponseDto<List<KylinCandyVo>> kylinCandy(List<KylinCandyItemParam> data, String roadShowId);
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/relevancyShow.html
View file @ 91bfccfe
......@@ -46,9 +46,9 @@
<body>
<div class="create_activity_box">
<div class="items">
<div class="title">关联循演：</div>
<div class="title">关联巡演：</div>
<div class="input-group">
<input id="goodsName" type="text" class="form-control storeList" placeholder="搜索商品名称">
<input id="goodsName" type="text" class="form-control storeList" placeholder="搜索巡演名称">
<div class="input-group-btn">
<ul class="dropdown-menu dropdown-menu-right" role="menu">
</ul>
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/TaobaoTicketUtils.java
View file @ 91bfccfe
......@@ -67,7 +67,7 @@ public class TaobaoTicketUtils {
}
public boolean refundDamaiOrder(KylinOrderTicketVo orderData,KylinPerformanceVo vo) {
public boolean refundDamaiOrder(KylinOrderTicketVo orderData, KylinPerformanceVo vo) {
try {
int isSysDamai = 0;
for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
......@@ -102,14 +102,15 @@ public class TaobaoTicketUtils {
} else {
orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()).toString().concat("020"));
}
withdrawDamaiOrder(ticketTimesKey, orderTicketEntitiesKey);
if (item.getIsPayment() == 2) {
withdrawDamaiOrder(ticketTimesKey, orderTicketEntitiesKey);
}
}
return true;
}
return true;
}catch (Exception e){
log.info("REFUND DAMAI ERROR = {}",e);
} catch (Exception e) {
log.info("REFUND DAMAI ERROR = {}", e);
return false;
}
}
......
liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/config/AbstractRedisConfig.java
View file @ 91bfccfe
......@@ -37,6 +37,8 @@ public abstract class AbstractRedisConfig {
public int totalDbs = 1;
/*public int stringTemplateDb = 1;*/
public Map<Integer, RedisTemplate<String, Object>> redisTemplateMap = new HashMap<>();
private StringRedisTemplate stringRedisTemplate = new StringRedisTemplate();
......@@ -59,7 +61,7 @@ public abstract class AbstractRedisConfig {
return;
}
defaultDb = this.getDbs().get(0);
if(this.getDbs().size()==2&&this.getDbs().get(1)!=null){
if(this.getDbs().size()>=2&&this.getDbs().get(1)!=null){
totalDbs = this.getDbs().get(1);
log.info("init totalDbs : {}",totalDbs);
for (int i = 0;i < totalDbs; i++) {
......@@ -75,6 +77,11 @@ public abstract class AbstractRedisConfig {
log.info("###### START 初始化 Redis-queue{} "+this.getClass().getSimpleName()+"连接池 START ######", this.getHost());
//初始化队列
LettuceConnectionFactory factory = null;
/*if(this.getDbs().size()==3){
stringTemplateDb = this.getDbs().get(2);
}else{
stringTemplateDb = totalDbs-1;
}*/
if(totalDbs==1){
log.info("###### 正在加载Redis-queue-db-" + defaultDb + " ######");
factory = getDbFactory(defaultDb);
......@@ -154,9 +161,13 @@ public abstract class AbstractRedisConfig {
}
LettuceConnectionFactory factory = null;
if(totalDbs==1){
log.info("###### 正在加载Redis-stringTemplate-" + (defaultDb) + " ######");
factory = getDbFactory(defaultDb);
}else{
log.info("###### 正在加载Redis-stringTemplate-" + (totalDbs-1) + " ######");
factory = getDbFactory(totalDbs-1);
/*log.info("###### 正在加载Redis-stringTemplate-" + (stringTemplateDb) + " ######");
factory = getDbFactory(stringTemplateDb);*/
}
StringRedisTemplate stringRedisTemplate = new StringRedisTemplate();
stringRedisTemplate.setConnectionFactory(factory);
......
liquidnet-bus-config/liquidnet-config/application-test.yml
View file @ 91bfccfe
......@@ -13,7 +13,7 @@ liquidnet:
refresh-ttl: 525600
blacklist_grace_period: 5
mysql:
urlHostAndPort: pc-2ze0t10lf4x6j29fb.mysql.polardb.rds.aliyuncs.com:3306
urlHostAndPort: java-test.mysql.polardb.rds.aliyuncs.com:3306
username: zhengzai
password: Zhengzai@rd2U#
# rabbitmq:
......@@ -39,47 +39,47 @@ liquidnet:
kylin:
database: 255
dbs: 0,256
host: r-2zeucai3yj2t0f4nmz.redis.rds.aliyuncs.com
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
goblin:
database: 255
dbs: 0,256
host: r-2zeucai3yj2t0f4nmz.redis.rds.aliyuncs.com
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
slime:
database: 255
dbs: 0,256
host: r-2zeucai3yj2t0f4nmz.redis.rds.aliyuncs.com
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
dragon:
database: 255
dbs: 0,256
host: r-2zeucai3yj2t0f4nmz.redis.rds.aliyuncs.com
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
sweet:
database: 255
dbs: 0,256
host: r-2zeucai3yj2t0f4nmz.redis.rds.aliyuncs.com
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
adam:
database: 255
dbs: 0,256
host: r-2zeucai3yj2t0f4nmz.redis.rds.aliyuncs.com
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
candy:
database: 255
dbs: 0,256
host: r-2zeucai3yj2t0f4nmz.redis.rds.aliyuncs.com
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
mongodb:
host: dds-2ze23697d93111041.mongodb.rds.aliyuncs.com:3717,dds-2ze23697d93111042.mongodb.rds.aliyuncs.com:3717
host: dds-2ze23697d93111041932-pub.mongodb.rds.aliyuncs.com:3717,dds-2ze23697d93111042720-pub.mongodb.rds.aliyuncs.com:3717
port: 3717
user: root
pwd: Sy6d*JwJ
......
liquidnet-bus-config/liquidnet-config/application-yace.yml
View file @ 91bfccfe
......@@ -13,7 +13,7 @@ liquidnet:
refresh-ttl: 525600
blacklist_grace_period: 5
mysql:
urlHostAndPort: pc-2ze0t10lf4x6j29fb.mysql.polardb.rds.aliyuncs.com:3306
urlHostAndPort: pc-2ze0t10lf4x6j29fb.mysql.polardb.rds.aliyuncs.com
username: zhengzai
password: Zhengzai@rd2U#
# rabbitmq:
......
liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web-yace.yml
View file @ 91bfccfe
# begin-test-这里是配置信息基本值
# begin-yace-这里是配置信息基本值
liquidnet:
info:
port: 7099
......@@ -23,4 +23,4 @@ liquidnet:
sslEnabled: false
database: yace_ln_scene
# end-test-这里是配置信息基本值
\ No newline at end of file
# end-yace-这里是配置信息基本值
\ No newline at end of file
liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-yace.yml
View file @ 91bfccfe
......@@ -28,4 +28,4 @@ liquidnet:
enters: 12
enters_opr: 20
#以下为spring各环境个性配置
#以下为spring各环境个性配置
\ No newline at end of file
liquidnet-bus-config/liquidnet-config/liquidnet-service-goblin-dev.yml
View file @ 91bfccfe
......@@ -10,7 +10,7 @@ liquidnet:
path: /data/logs
name: service-goblin
max-history: 7
level: info
level: debug
mysql:
database-name: dev_ln_scene
mongodb:
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/bootstrap-test.yml
View file @ 91bfccfe
......@@ -11,4 +11,4 @@ liquidnet:
spring:
profiles:
include: service-adam
include: service-adam
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/bootstrap-yace.yml
View file @ 91bfccfe
......@@ -11,4 +11,4 @@ liquidnet:
spring:
profiles:
include: service-adam
include: service-adam
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/resources/bootstrap-test.yml
View file @ 91bfccfe
......@@ -7,12 +7,8 @@ liquidnet:
password: user123
eureka:
host: 172.17.207.177:7001
#instance:
# prefer-ip-address: true
#host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
#host: 192.168.193.41:7001
# end-test-这里是配置信息基本值
spring:
profiles:
include: service-candy
include: service-candy
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/resources/bootstrap-yace.yml
View file @ 91bfccfe
# begin-test-这里是配置信息基本值
# begin-yace-这里是配置信息基本值
liquidnet:
cloudConfig:
profile: yace
......@@ -7,12 +7,8 @@ liquidnet:
password: user123
eureka:
host: 172.17.121.251:7001
#instance:
# prefer-ip-address: true
#host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
#host: 192.168.193.41:7001
# end-test-这里是配置信息基本值
# end-yace-这里是配置信息基本值
spring:
profiles:
include: service-candy
include: service-candy
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/resources/bootstrap-test.yml
View file @ 91bfccfe
......@@ -11,4 +11,4 @@ liquidnet:
spring:
profiles:
include: service-chime
include: service-chime
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/resources/bootstrap-yace.yml
View file @ 91bfccfe
......@@ -11,4 +11,4 @@ liquidnet:
spring:
profiles:
include: service-chime
include: service-chime
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/service/impl/DragonOrderRefundsServiceImpl.java
View file @ 91bfccfe
......@@ -180,7 +180,7 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
parameters.put("app_id", PayDouYinpayUtils.getInstance().getAPP_ID());
parameters.put("out_order_no", code);
parameters.put("out_refund_no", refundCode);
parameters.put("refund_amount", price.multiply(new BigDecimal(100)).intValue()+"");
parameters.put("refund_amount", price.multiply(new BigDecimal(100)).intValue());
parameters.put("reason", reason);
parameters.put("notify_url", notifyUrl);
String sign = PayDouYinpayUtils.getInstance().createSign(parameters);
......
liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/resources/bootstrap-prod.yml
View file @ 91bfccfe
......@@ -11,4 +11,4 @@ liquidnet:
spring:
profiles:
include: service-dragon
include: service-dragon
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/resources/bootstrap-test.yml
View file @ 91bfccfe
......@@ -11,4 +11,4 @@ liquidnet:
spring:
profiles:
include: service-dragon
include: service-dragon
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/resources/bootstrap-yace.yml
View file @ 91bfccfe
......@@ -11,4 +11,4 @@ liquidnet:
spring:
profiles:
include: service-dragon
include: service-dragon
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinOrderAppServiceImpl.java
View file @ 91bfccfe
......@@ -186,7 +186,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
//mongo
mongoUtils.updateGoblinOrderSkuVo(orderSkuVo.getOrderSkuId(), orderSkuVo);
orderSkuStatus.add(new Object[]{
orderSkuVo.getStatus(), 0,now,
orderSkuVo.getStatus(), now,
orderSkuVo.getOrderSkuId(), now, now
});
}
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java
View file @ 91bfccfe
......@@ -1515,22 +1515,24 @@ public class GoblinMongoUtils {
);
//查询活动id
Query queryShow = Query.query(Criteria.where("performanceId").is(performanceId));
Query queryShow = Query.query(Criteria.where("performanceId").is(performanceId).and("status").ne(7));
List<GoblinSelfMarketingVo> showVoList = mongoTemplate.find(queryShow,
GoblinSelfMarketingVo.class,
GoblinSelfMarketingVo.class.getSimpleName()
);
GoblinSelfMarketingVo showVo = showVoList.get(0);
if (showVoList.size() == 0) {
return baseData;
} else {
GoblinSelfMarketingVo showVo = showVoList.get(0);
//只保留 参加该活动或者没参加活动的数据
for (GoblinGoodsInfoVo vo : baseData) {
if (vo.getMarketId() == null || vo.getMarketId().equals(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue().concat(showVo.getSelfMarketId())) || vo.getMarketId().equals("")) {
returnData.add(vo);
//只保留 参加该活动或者没参加活动的数据
for (GoblinGoodsInfoVo vo : baseData) {
if (vo.getMarketId() == null || vo.getMarketId().equals(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue().concat(showVo.getSelfMarketId())) || vo.getMarketId().equals("")) {
returnData.add(vo);
}
}
return returnData;
}
return returnData;
}
//获取退款sku订单价格
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/bootstrap-test.yml
View file @ 91bfccfe
......@@ -7,12 +7,8 @@ liquidnet:
password: user123
eureka:
host: 172.17.207.177:7001
#instance:
# prefer-ip-address: true
#host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
#host: 192.168.193.41:7001
# end-test-这里是配置信息基本值
spring:
profiles:
include: service-goblin
include: service-goblin
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/bootstrap-yace.yml
View file @ 91bfccfe
# begin-test-这里是配置信息基本值
# begin-yace-这里是配置信息基本值
liquidnet:
cloudConfig:
profile: yace
......@@ -7,12 +7,8 @@ liquidnet:
password: user123
eureka:
host: 172.17.121.251:7001
#instance:
# prefer-ip-address: true
#host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
#host: 192.168.193.41:7001
# end-test-这里是配置信息基本值
# end-yace-这里是配置信息基本值
spring:
profiles:
include: service-goblin
include: service-goblin
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java
View file @ 91bfccfe
......@@ -12,6 +12,7 @@ import com.liquidnet.service.goblin.dto.vo.NoticeGoblinMixDetailsVo;
import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
import com.liquidnet.service.kylin.constant.KylinPerformanceStatusEnum;
import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
import com.liquidnet.service.kylin.dto.param.KylinCandyItemParam;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinCandyVo;
......@@ -791,18 +792,18 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
}
@Override
public ResponseDto<List<KylinCandyVo>> kylinCandy(List<String> data, String roadShowId) {
public ResponseDto<List<KylinCandyVo>> kylinCandy(List<KylinCandyItemParam> data, String roadShowId) {
List<KylinCandyVo> voList = ObjectUtil.kylinCandyVos();
for (String couponId : data) {
List<String> roadShowIds = dataUtils.getCouponRoad(couponId);
for (KylinCandyItemParam item : data) {
List<String> roadShowIds = dataUtils.getCouponRoad(item.getCouponId());
if (roadShowIds.size() == 0 || roadShowIds.contains(roadShowId)) {
KylinCandyVo vo = KylinCandyVo.getNew();
vo.setCouponId(couponId);
vo.setCouponId(item.getCouponId());
vo.setUcouponId(item.getUcouponId());
vo.setRoadShowId(roadShowIds.contains(roadShowId) ? roadShowId : "");
voList.add(vo);
}
}
return ResponseDto.success(voList);
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/bootstrap-dev.yml
View file @ 91bfccfe
......@@ -11,4 +11,4 @@ liquidnet:
spring:
profiles:
include: service-kylin
include: service-kylin
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/bootstrap-prod.yml
View file @ 91bfccfe
# begin-dev-这里是配置信息基本值
# begin-prod-这里是配置信息基本值
liquidnet:
cloudConfig:
profile: prod
......@@ -7,7 +7,7 @@ liquidnet:
password: user123
eureka:
host: 172.17.207.189:7001
# end-dev-这里是配置信息基本值
# end-prod-这里是配置信息基本值
spring:
profiles:
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/bootstrap-test.yml
View file @ 91bfccfe
# begin-dev-这里是配置信息基本值
# begin-test-这里是配置信息基本值
liquidnet:
cloudConfig:
profile: test
......@@ -7,13 +7,8 @@ liquidnet:
password: user123
eureka:
host: 172.17.207.177:7001
#instance:
# prefer-ip-address: true
#host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
#host: 192.168.193.41:7001
# end-dev-这里是配置信息基本值
# end-test-这里是配置信息基本值
spring:
profiles:
include: service-kylin
include: service-kylin
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/bootstrap-yace.yml
View file @ 91bfccfe
# begin-dev-这里是配置信息基本值
# begin-yace-这里是配置信息基本值
liquidnet:
cloudConfig:
profile: yace
......@@ -7,13 +7,8 @@ liquidnet:
password: user123
eureka:
host: 172.17.121.251:7001
#instance:
# prefer-ip-address: true
#host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
#host: 192.168.193.41:7001
# end-dev-这里是配置信息基本值
# end-yace-这里是配置信息基本值
spring:
profiles:
include: service-kylin
include: service-kylin
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/service/impl/DragonOrderRefundsServiceImpl.java
View file @ 91bfccfe
......@@ -180,7 +180,7 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
parameters.put("app_id", PayDouYinpayUtils.getInstance().getAPP_ID());
parameters.put("out_order_no", code);
parameters.put("out_refund_no", refundCode);
parameters.put("refund_amount", price.multiply(new BigDecimal(100)).intValue()+"");
parameters.put("refund_amount", price.multiply(new BigDecimal(100)).intValue());
parameters.put("reason", reason);
parameters.put("notify_url", notifyUrl);
String sign = PayDouYinpayUtils.getInstance().createSign(parameters);
......
liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/resources/bootstrap-test.yml
View file @ 91bfccfe
......@@ -11,4 +11,4 @@ liquidnet:
spring:
profiles:
include: service-notify
include: service-notify
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/resources/bootstrap-yace.yml
View file @ 91bfccfe
......@@ -11,4 +11,4 @@ liquidnet:
spring:
profiles:
include: service-notify
include: service-notify
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinOrderServiceImpl.java
View file @ 91bfccfe
......@@ -782,7 +782,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
// redisUtils.setGoblinOrder(orderVo.getOrderId(),orderVo);
} else if ((orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_6.getValue() || orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_7.getValue()) && syncOrderParam.getStatus().equals(1)) {
log.error("订单号为 {} 的订单正在退款 或者已退款", syncOrderParam.getOrderCode());
} else if (syncOrderParam.getStatus().equals(1)) {
} else if (syncOrderParam.getStatus().equals(1) && orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_0.getValue()) {
log.error("订单号为 {} 的订单正常流程", syncOrderParam.getOrderCode());
storeOrder.setPaymentType(syncOrderParam.getPaymentType());
storeOrder.setPaymentId(syncOrderParam.getPaymentId());
......@@ -796,14 +796,14 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
}
storeOrder.setStatus(GoblinStatusConst.Status.ORDER_STATUS_2.getValue());
storeOrder.setZhengzaiStatus(0);
if(orderVo.getDeviceFrom().equals("micropay") && GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue().equals(orderVo.getMarketType())){
if (orderVo.getDeviceFrom().equals("micropay") && GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue().equals(orderVo.getMarketType())) {
storeOrder.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
storeOrder.setZhengzaiStatus(1);
}
storeOrder.setUpdatedAt(now);
sqls.add(SqlMapping.get("goblin_order.pay.order"));
sqlDataOrder.add(new Object[]{
storeOrder.getPaymentType(), storeOrder.getPaymentId(), storeOrder.getPayCode(), storeOrder.getPayTime(), storeOrder.getWriteOffCode(), storeOrder.getZhengzaiStatus(),storeOrder.getStatus(), storeOrder.getUpdatedAt(),
storeOrder.getPaymentType(), storeOrder.getPaymentId(), storeOrder.getPayCode(), storeOrder.getPayTime(), storeOrder.getWriteOffCode(), storeOrder.getZhengzaiStatus(), storeOrder.getStatus(), storeOrder.getUpdatedAt(),
orderId, now, now
});
sqls.add(SqlMapping.get("goblin_order.pay.sku"));
......@@ -860,6 +860,11 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
//mysql
queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_ORDER_CREATE_PAY.getKey(),
SqlMapping.gets(sqls, sqlDataOrder, sqlDataSku));
//加分
if (orderUtils.noZhengzaiOrder(uid)) {
orderUtils.integral(uid, priceActual, "购买商品", 1);
}
}
//发短信
// SmsEnum.ADTemplate adTemplate = null;
......@@ -878,10 +883,6 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
// .setTemplateParam("time", time1 + " " + time2).toJson()
// );
// }
//加分
if (orderUtils.noZhengzaiOrder(uid)) {
orderUtils.integral(uid, priceActual, "购买商品", 1);
}
}
return "success";
}
......@@ -1125,7 +1126,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
storeOrder.setUpdatedAt(now);
sqls.add(SqlMapping.get("goblin_order.pay.order"));
sqlDataOrder.add(new Object[]{
storeOrder.getPaymentType(), storeOrder.getPaymentId(), storeOrder.getPayCode(), storeOrder.getPayTime(), storeOrder.getWriteOffCode(),storeOrder.getZhengzaiStatus(), storeOrder.getStatus(), storeOrder.getUpdatedAt(),
storeOrder.getPaymentType(), storeOrder.getPaymentId(), storeOrder.getPayCode(), storeOrder.getPayTime(), storeOrder.getWriteOffCode(), storeOrder.getZhengzaiStatus(), storeOrder.getStatus(), storeOrder.getUpdatedAt(),
orderId, now, now
});
sqls.add(SqlMapping.get("goblin_order.pay.sku"));
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java
View file @ 91bfccfe
......@@ -253,13 +253,14 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
return ResponseDto.failure("优先券不可用");
}
Integer typeVoucher = (Integer) advanceMap.get("type");
// String couponId = (String) advanceMap.get("couponId");
// if (typeVoucher.equals(-1) || orderUtils.judgeRoadShowCanUse(couponId, performanceData.getRoadShowId())) {
// return ResponseDto.failure("优先券不可用");
// }
String couponId = (String) advanceMap.get("couponId");
if (typeVoucher.equals(-1)) {
return ResponseDto.failure("优先券不可用");
}
if (!orderUtils.judgeRoadShowCanUse(couponId, performanceData.getRoadShowId())) {
orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
return ResponseDto.failure("优先券该演出不可用");
}
}
}
}
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/resources/bootstrap-test.yml
View file @ 91bfccfe
......@@ -11,4 +11,4 @@ liquidnet:
spring:
profiles:
include: service-order
include: service-order
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/resources/bootstrap-yace.yml
View file @ 91bfccfe
......@@ -11,4 +11,4 @@ liquidnet:
spring:
profiles:
include: service-order
include: service-order
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-slime/liquidnet-service-slime-impl/src/main/resources/bootstrap-test.yml
View file @ 91bfccfe
......@@ -11,4 +11,4 @@ liquidnet:
spring:
profiles:
include: service-slime
include: service-slime
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-slime/liquidnet-service-slime-impl/src/main/resources/bootstrap-yace.yml
View file @ 91bfccfe
......@@ -11,4 +11,4 @@ liquidnet:
spring:
profiles:
include: service-slime
include: service-slime
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/resources/bootstrap-test.yml
View file @ 91bfccfe
......@@ -11,4 +11,4 @@ liquidnet:
spring:
profiles:
include: service-smile
include: service-smile
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/resources/bootstrap-yace.yml
View file @ 91bfccfe
......@@ -11,4 +11,4 @@ liquidnet:
spring:
profiles:
include: service-smile
include: service-smile
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/src/main/resources/bootstrap-test.yml
View file @ 91bfccfe
......@@ -11,4 +11,4 @@ liquidnet:
spring:
profiles:
include: service-stone
include: service-stone
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/src/main/resources/bootstrap-yace.yml
View file @ 91bfccfe
......@@ -11,4 +11,4 @@ liquidnet:
spring:
profiles:
include: service-stone
include: service-stone
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/bootstrap-prod.yml
View file @ 91bfccfe
......@@ -11,4 +11,4 @@ liquidnet:
spring:
profiles:
include: service-sweet
include: service-sweet
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/bootstrap-test.yml
View file @ 91bfccfe
......@@ -11,4 +11,4 @@ liquidnet:
spring:
profiles:
include: service-sweet
include: service-sweet
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/bootstrap-yace.yml
View file @ 91bfccfe
......@@ -11,4 +11,4 @@ liquidnet:
spring:
profiles:
include: service-sweet
include: service-sweet
\ No newline at end of file
liquidnet-bus-support/liquidnet-support-eureka/src/main/resources/application-prod.yml
View file @ 91bfccfe
......@@ -13,7 +13,7 @@ spring:
eureka:
instance:
hostname: 172.17.207.177
hostname: 172.17.207.189
preferIpAddress: true
health-check-url: http://localhost:${server.port}${server.servlet.context-path}/actuator/health
status-page-url: http://localhost:${server.port}${server.servlet.context-path}/actuator/info
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment