Merge remote-tracking branch 'origin/master'

cif-service/src/main/java/com/txz/cif/configurer/LocalUtil.java

@@ -1,5 +1,7 @@
 package com.txz.cif.configurer;
 
+import cn.hutool.json.JSONUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Component;
@@ -15,6 +17,7 @@ import java.util.ResourceBundle;
  * 创建日期: 2020/9/18 10:31
  */
 
+@Slf4j
 @Component
 public class LocalUtil
 {
@@ -33,6 +36,7 @@ public class LocalUtil
     {
         try
         {
+            log.info(JSONUtil.toJsonStr(LocaleContextHolder.getLocale()));
             return messageSource.getMessage(msgKey, null, LocaleContextHolder.getLocale());
         }
         catch (Exception e)

cif-service/src/main/resources/static/i18n/messages_bn_BD.properties

@@ -5,12 +5,12 @@ BizTypeEnum.OPEN_GROUP_PAY=open group pay
 BizTypeEnum.JOIN_GROUP_PAY=join group pay
 BizTypeEnum.FAIL_GROUP_REFUND=fail group refund
 BizTypeEnum.SUCCESS_GROUP_REFUND=success group refund
-BizTypeEnum.OPEN_GROUP_RED_ENVELOPE=open group red envelope
-BizTypeEnum.JOIN_GROUP_RED_ENVELOPE=join group red envelope
-BizTypeEnum.SIGN_RED_ENVELOPE=sign red envelope
-BizTypeEnum.FIRST_COMMISSION=first commission
-BizTypeEnum.SECONDARY_COMMISSION=secondary commission
-BizTypeEnum.PROMOTION_COMMISSION=promotion commission
+BizTypeEnum.OPEN_GROUP_RED_ENVELOPE=Open Group Reward
+BizTypeEnum.JOIN_GROUP_RED_ENVELOPE=Join Group Reward
+BizTypeEnum.SIGN_RED_ENVELOPE=Check-in Reward
+BizTypeEnum.FIRST_COMMISSION=Direct Referral Reward
+BizTypeEnum.SECONDARY_COMMISSION=Indirect Referral Reward
+BizTypeEnum.PROMOTION_COMMISSION=Refer Friends Reward
 BizTypeEnum.REFUND_RECHARGE=refund recharge
 BizTypeEnum.WITHDRAWAL_FEE=withdrawal fee
 BizTypeEnum.FREEZE=freeze

cif-service/src/main/resources/static/i18n/messages_en.properties

@@ -5,12 +5,12 @@ BizTypeEnum.OPEN_GROUP_PAY=open group pay
 BizTypeEnum.JOIN_GROUP_PAY=join group pay
 BizTypeEnum.FAIL_GROUP_REFUND=fail group refund
 BizTypeEnum.SUCCESS_GROUP_REFUND=success group refund
-BizTypeEnum.OPEN_GROUP_RED_ENVELOPE=open group red envelope
-BizTypeEnum.JOIN_GROUP_RED_ENVELOPE=join group red envelope
-BizTypeEnum.SIGN_RED_ENVELOPE=sign red envelope
-BizTypeEnum.FIRST_COMMISSION=first commission
-BizTypeEnum.SECONDARY_COMMISSION=secondary commission
-BizTypeEnum.PROMOTION_COMMISSION=promotion commission
+BizTypeEnum.OPEN_GROUP_RED_ENVELOPE=Open Group Reward
+BizTypeEnum.JOIN_GROUP_RED_ENVELOPE=Join Group Reward
+BizTypeEnum.SIGN_RED_ENVELOPE=Check-in Reward
+BizTypeEnum.FIRST_COMMISSION=Direct Referral Reward
+BizTypeEnum.SECONDARY_COMMISSION=Indirect Referral Reward
+BizTypeEnum.PROMOTION_COMMISSION=Refer Friends Reward
 BizTypeEnum.REFUND_RECHARGE=refund recharge
 BizTypeEnum.WITHDRAWAL_FEE=withdrawal fee
 BizTypeEnum.FREEZE=freeze

cif-service/src/main/resources/static/i18n/messages_en_US.properties

@@ -5,12 +5,12 @@ BizTypeEnum.OPEN_GROUP_PAY=open group pay
 BizTypeEnum.JOIN_GROUP_PAY=join group pay
 BizTypeEnum.FAIL_GROUP_REFUND=fail group refund
 BizTypeEnum.SUCCESS_GROUP_REFUND=success group refund
-BizTypeEnum.OPEN_GROUP_RED_ENVELOPE=open group red envelope
-BizTypeEnum.JOIN_GROUP_RED_ENVELOPE=join group red envelope
-BizTypeEnum.SIGN_RED_ENVELOPE=sign red envelope
-BizTypeEnum.FIRST_COMMISSION=first commission
-BizTypeEnum.SECONDARY_COMMISSION=secondary commission
-BizTypeEnum.PROMOTION_COMMISSION=promotion commission
+BizTypeEnum.OPEN_GROUP_RED_ENVELOPE=Open Group Reward
+BizTypeEnum.JOIN_GROUP_RED_ENVELOPE=Join Group Reward
+BizTypeEnum.SIGN_RED_ENVELOPE=Check-in Reward
+BizTypeEnum.FIRST_COMMISSION=Direct Referral Reward
+BizTypeEnum.SECONDARY_COMMISSION=Indirect Referral Reward
+BizTypeEnum.PROMOTION_COMMISSION=Refer Friends Reward
 BizTypeEnum.REFUND_RECHARGE=refund recharge
 BizTypeEnum.WITHDRAWAL_FEE=withdrawal fee
 BizTypeEnum.FREEZE=freeze