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

Skip to content

L
liquidnet-bus-v1
Switch branch/tag
  1. 25 Jul, 2022 3 commits
  3. 23 Jul, 2022 26 commits
    • Administrator's avatar
      Merge branch 'pre' into 'master' · c4443c8d
      Administrator authored 
      Pre

See merge request !280
      c4443c8d
    • anjiabin's avatar
      Merge branch 'fix_xuper_20220723-01' into pre · 143a8a49
      anjiabin authored
      143a8a49
    • anjiabin's avatar
      测试提交 · 454fb8cd
      anjiabin authored
      454fb8cd
    • 张国柄's avatar
      ~api:我的藏品列表:至信链上链结果查询异常处理; · cf2d51a8
      张国柄 authored
      cf2d51a8
    • anjiabin's avatar
      修改百度链购买入库逻辑 · a9fedfa4
      anjiabin authored
      a9fedfa4
    • 胡佳晨's avatar
      修改 同步券mongo · 20654118
      胡佳晨 authored
      20654118
    • anjiabin's avatar
      Merge branch 'fix_xuper_20220723-01' into pre · 05176bca
      anjiabin authored
      05176bca
    • anjiabin's avatar
      修改百度链配置文件 · 5a5b290b
      anjiabin authored
      5a5b290b
    • 张国柄's avatar
      ~env.code.valid; · 8dfade45
      张国柄 authored
      8dfade45
    • anjiabin's avatar
      Merge branch 'pre' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into pre · 92ca6089
      anjiabin authored
      92ca6089
    • anjiabin's avatar
      修改百度链购买入库逻辑 · 0573faeb
      anjiabin authored
      0573faeb
    • anjiabin's avatar
      修改百度链购买入库逻辑 · 2a33ba77
      anjiabin authored
      2a33ba77
    • 胡佳晨's avatar
      修改 同步券mongo · 3cd7fec5
      胡佳晨 authored
      3cd7fec5
    • 胡佳晨's avatar
      提交 配置 x · 43a807b0
      胡佳晨 authored
      43a807b0
    • 胡佳晨's avatar
      提交 配置 · 917f047f
      胡佳晨 authored
      917f047f
    • 张国柄's avatar
      ~config:test2.redis.onlinemq.test; · 16349576
      张国柄 authored
      16349576
    • 张国柄's avatar
      ~config.test2; · 92f038d3
      张国柄 authored
      92f038d3
    • 张国柄's avatar
      ~config.test2; · aa1ba787
      张国柄 authored
      aa1ba787
    • 张国柄's avatar
      ~config.test2; · 72dbe679
      张国柄 authored
      72dbe679
    • 张国柄's avatar
      ~config.test2; · 7cdcc165
      张国柄 authored
      7cdcc165
    • 张国柄's avatar
      ~config.test2; · c2e63a26
      张国柄 authored
      c2e63a26
    • 胡佳晨's avatar
      提交 配置 · 003b6cb0
      胡佳晨 authored
      003b6cb0
    • 张禹's avatar
      Merge branch 'fix_xuper_20220723' into 'master' · f38f88bc
      张禹 authored 
      生产百度链设置

See merge request !279
      f38f88bc
    • anjiabin's avatar
      生产百度链设置 · e55bdc9b
      anjiabin authored
      e55bdc9b
    • 张国柄's avatar
      Merge remote-tracking branch 'origin/master' into bak220720_merge · 91bfccfe
      张国柄 authored 
      # 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
      91bfccfe
    • 张禹's avatar
      Merge branch 'pre' into 'master' · 7b0a3236
      张禹 authored 
      修改 支付返回状态 已支付 并且 订单状态为待支付状态 才能走支付成功逻辑

See merge request !278
      7b0a3236
  5. 22 Jul, 2022 11 commits