From d0da0aa5e01dd73b7fca8e59ff2664d7e6076802 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 24 六月 2020 10:09:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java | 72 +++++++++++++++++++++++++++--------
1 files changed, 55 insertions(+), 17 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java b/fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java
index 36d47a1..e40aa51 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java
@@ -19,16 +19,25 @@
shareSina("shareSina", "鍒嗕韩鍟嗗搧鍒版柊娴殑鍓嶇紑鍐呭"), // 鏈壘鍒板搴擟all
shareRuleLinkJD("share_rule_link_jd", "浜笢鍒嗕韩瑙勫垯锛堝府鍔╀腑蹇冿級"),
shareRuleLinkPDD("share_rule_link_pdd", "鎷煎澶氬垎浜鍒欙紙甯姪涓績锛�"),
+ shareRuleLinkVIP("share_rule_link_vip", "鍞搧浼氬垎浜鍒欙紙甯姪涓績锛�"),
+ shareRuleLinkSuning("share_rule_link_suning", "鑻忓畞鍒嗕韩瑙勫垯锛堝府鍔╀腑蹇冿級"),
shareSingleGoodsRule("share_single_goods_rule", "鍗曞搧鍒嗕韩瑙勫垯"),
- shareGoodsTemplateRules("share_goods_template_rules", "鍒嗕韩妯℃澘瑙勫垯"), // 瀛樺湪2涓浉鍚� 鍐呭涓嶅悓銆佺増鏈絾涓�鏍�
+ shareGoodsTemplateRules("share_goods_template_rules", "鍒嗕韩妯℃澘瑙勫垯"), // 瀛樺湪2涓浉鍚�
+ // 鍐呭涓嶅悓銆佺増鏈絾涓�鏍�
shareGoodsTemplateRulesJD("share_goods_template_rules_jd", "浜笢妯℃澘瑙勫垯"),
shareGoodsTemplateRulesPDD("share_goods_template_rules_pdd", "鎷煎澶氭ā鏉胯鍒�"),
+ shareGoodsTemplateRulesVIP("share_goods_template_rules_vip", "鍞搧浼氭ā鏉胯鍒�"),
+ shareGoodsTemplateRulesSuNing("share_goods_template_rules_suning", "鑻忓畞妯℃澘瑙勫垯"),
goodsShareNotifyImgs("goods_share_notify_imgs", "鍗曚釜鍟嗗搧鍒嗕韩鐨勫埜鎻愮ず鍥剧墖"),
goodsShareMultipleNotify("goods_share_multiple_notify", "澶氫釜鍟嗗搧鍒嗕韩鎻愰啋"),
goodsShareNotifyImgs207("goods_share_notify_imgs_207", "鍗曚釜鍟嗗搧鍒嗕韩鐨勫埜鎻愮ず鍥剧墖(2.0.7鍙婁互鍚�)"),
+ goodsShareNotifyImgsVIP("goods_share_notify_imgs_vip", "鍗曚釜鍟嗗搧鍒嗕韩鐨勫埜鎻愮ず鍥剧墖(鍞搧浼�)"),
goodsShareNotify("goods_share_notify", "鍗曚釜鍟嗗搧鍒嗕韩鎻愰啋"),
goodsShareNotifyJD("goods_share_notify_jd", "浜笢鍒嗕韩鎻愰啋"),
goodsShareNotifyPDD("goods_share_notify_pdd", "鎷煎澶氬垎浜彁閱�"),
+ goodsShareNotifyVIP("goods_share_notify_vip", "鎷煎澶氬垎浜彁閱�"),
+ goodsShareNotifySuning("goods_share_notify_Suning", "鎷煎澶氬垎浜彁閱�"),
+
goodsShareTextCoupon("goods_share_text_coupon", "鍗曚釜鍟嗗搧鍒嗕韩鏂囨(鏈夊埜)"),
goodsShareTextCouponJD("goods_share_text_coupon_jd", "浜笢鍗曚釜鍟嗗搧鍒嗕韩妯℃澘-鏈夊埜"),
goodsShareTextCouponPDD("goods_share_text_coupon_pdd", "鎷煎澶氬崟涓晢鍝佸垎浜ā鏉�-鏈夊埜"),
@@ -82,7 +91,8 @@
taobaoProxyIP("taobao_proxy_ip", "娣樺疂鍟嗗搧璇︽儏浠ｇ悊IP"),
taobaoCartJS("taobao_cart_js", "娣樺疂璐墿杞﹁剼鏈�"),
taobaoCartLink("taobao_cart_link", "璐墿杞﹂摼鎺�"),
- taobaoCartJumpDetail("taobao_cart_jump_detail", "鎴戠殑璐墿杞﹁烦杞柟寮�"), // 瀛樺湪2涓浉鍚� 瀛樺湪鐗堟湰鍖哄垎
+ taobaoCartJumpDetail("taobao_cart_jump_detail", "鎴戠殑璐墿杞﹁烦杞柟寮�"), // 瀛樺湪2涓浉鍚�
+ // 瀛樺湪鐗堟湰鍖哄垎
taobaoCouponHelp("taobao_coupon_help", "鍒稿府鍔�"),
convertTaoBaoLinkInServer("convert_taobao_link_in_server", "鏄惁鍦ㄦ湇鍔＄杞摼"),
showTaobaoCartConvert("show_taobao_cart_convert", "璐墿杞︽槸鍚﹁浆閾�"),
@@ -160,37 +170,65 @@
openSpeicalAndRelationApply("open_speical_and_relation_apply", "寮�鍚細鍛樿繍钀D涓庢笭閬揑D鐢宠"),
hotFunctionUrl("hot_function_url", "鐑棬鍔熻兘閾炬帴"), // 瀛樺湪2涓浉鍚� 瀛樺湪鐗堟湰鍖哄垎
pushGoodsDetails("push_goods_details", "鎺ㄩ�侀〉闈�"),
+ pushActivityLink("push_activity_link", "鎺ㄩ�佸彂鍦堟椿鍔ㄩ〉闈�"),
brandBackgroundPicture("brand_background_picture", "鍝佺墝鑳屾櫙鍥剧墖"),
articleHotWords("article_hot_words", "鍔ㄦ��-瀛﹂櫌鏂囩珷鐑悳璇�"),
inviteRules("invite_rules", "鍔ㄦ��-瀛﹂櫌鏂囩珷鐑悳璇�"),
vipLink("vip_link", "瓒呯骇浼氬憳鍗囩骇閾炬帴"), // 杞Щ鑷砎IPConfig 宸插簾寮�
helpLinkVipInfo("help_link_vip_info", "瓒呯骇浼氬憳璇︽儏椤靛府鍔╅摼鎺�"), // 宸插簾寮�
- //鏂囨杞摼
- convertDocWebLink("convert_doc_web_link","鏂囨杞摼缃戦〉"),
- convertDocHelpLink("convert_doc_help_link","鏂囨杞摼甯姪缃戦〉"),
- convertDocTip("convert_doc_tip","鏂囨杞摼娓╅Θ鎻愮ず"),
- newerGonglue("newer_gonglue_url","鏂版墜鏀荤暐閾炬帴"),
- tearcherLink("tearcher_link","瀵煎笀閾炬帴"),
+ // 鏂囨杞摼
+ convertDocWebLink("convert_doc_web_link", "鏂囨杞摼缃戦〉"),
+ convertDocHelpLink("convert_doc_help_link", "鏂囨杞摼甯姪缃戦〉"),
+ convertDocTip("convert_doc_tip", "鏂囨杞摼娓╅Θ鎻愮ず"),
+ newerGonglue("newer_gonglue_url", "鏂版墜鏀荤暐閾炬帴"),
+ tearcherLink("tearcher_link", "瀵煎笀閾炬帴"),
quickShareGoodsText("quick_share_goods_text", "蹇嵎鍒嗕韩鍟嗗搧鏂囨湰"),
quickShareTBCommentText("quick_share_tb_comment_text", "蹇嵎鍒嗕韩鍟嗗搧鏂囨湰"),
quickShareJDCommentText("quick_share_jd_comment_text", "蹇嵎鍒嗕韩鍟嗗搧鏂囨湰"),
quickSharePDDCommentText("quick_share_pdd_comment_text", "蹇嵎鍒嗕韩鍟嗗搧鏂囨湰"),
-
+ quickShareVIPCommentText("quick_share_vip_comment_text", "蹇嵎鍒嗕韩鍟嗗搧鏂囨湰"),
+ quickShareSuNingCommentText("quick_share_suning_comment_text", "蹇嵎鍒嗕韩鍟嗗搧鏂囨湰"),
+
+
shareCommentTextTB("share_comment_text_tb", "娣樺疂鍗曞浘澶氬浘鍒嗕韩鍟嗗搧鏂囨湰"),
shareCommentTextJD("share_comment_text_jd", "浜笢鍗曞浘澶氬浘鍒嗕韩鍟嗗搧鏂囨湰"),
shareCommentTextPDD("share_comment_text_pdd", "鎷煎澶氬崟鍥惧鍥惧垎浜晢鍝佹枃鏈�"),
-
- evaluateEmojis("evaluate_emojis", "鍙戝湀璇勮Emojis"),
- evaluateText("evaluate_text", "鍙戝湀璇勮鏂囨湰"),
+ shareCommentTextVIP("share_comment_text_vip", "鍞搧浼氬崟鍥惧鍥惧垎浜晢鍝佹枃鏈�"),
+ shareCommentTextSuNing("share_comment_text_suning", "鑻忓畞鍗曞浘澶氬浘鍒嗕韩鍟嗗搧鏂囨湰"),
+ evaluateEmojis("evaluate_emojis", "鍙戝湀璇勮Emojis"),
+ evaluateText("evaluate_text", "鍙戝湀璇勮鏂囨湰"),
+ evaluateZeroKey("evaluate_zero_key", "0鐐瑰尮閰嶈瘝"),
+
+
vipUpgradeLink("vip_upgrade_link", "鎴戠殑鐣岄潰-浼氬憳鍗囩骇閾炬帴"),
-
+
orderRebateDescLink("order_rebate_desc_link", "璁㈠崟杩斿埄璁＄畻璇存槑閾炬帴"),
- bonusCountLinkFanli("bonus_count_link_fanli", "鑷喘杩斿埄缁熻椤甸潰闂彿"),
- bonusCountLinkShare("bonus_count_link_share", "鍒嗕韩濂栭噾缁熻椤甸潰闂彿"),
- bonusCountLinkTeam("bonus_count_link_team", "鍥㈤槦濂栧姳缁熻椤甸潰闂彿"),
- ;
+
+ teamStatisticsLink("team_statistics_link", "闃熷憳缁熻椤甸潰閾炬帴"),
+ activityDetailLink("activity_detail_link", "娲诲姩璇︽儏杩囨浮椤�"),
+
+ // 骞冲彴瑙勫垯
+ platformRule("platform_rule_link", "骞冲彴瑙勫垯"),
+
+ showSplashAd("show_splash_ad","鏄惁鏄剧ず寮�灞忓箍鍛�"),
+
+ testUserArray("test_user_array","娴嬭瘯鐢ㄦ埛鏁扮粍"),
+
+ robotCloudLink("robot_cloud_link","浜戝彂鍗曢摼鎺�"),
+ robotCloudOpen("robot_cloud_open","浜戝彂鍗曟槸鍚﹀紑鍚�-鎴戠殑鐣岄潰"),
+ robotCloudOpenCircle("robot_cloud_open_circle","浜戝彂鍗曟槸鍚﹀紑鍚�-鍙戝湀鐣岄潰"),
+ robotCloudOpenGoodsDetail("robot_cloud_open_goods_detail","浜戝彂鍗曟槸鍚﹀紑鍚�-鍟嗗搧璇︽儏"),
+ robotCloudGroupPictureNum("robot_cloud_group_picture_num","浜戝彂鍗曠兢鍥剧墖鏁伴噺"),
+
+
+ cloudAlipayJumpLink("cloud_alipay_jump_link","浜戝彂鍗曟敮浠樿烦杞湴鍧�"),
+ cloudAlipayReturnLink("cloud_alipay_return_link","浜戝彂鍗曟敮浠樻垚鍔熷悗杩斿洖鍝釜鍓嶇椤甸潰"),
+ cloudAlipayNotifyLink("cloud_alipay_notify_link","浜戝彂鍗曟敮浠樻垚鍔熷悗鍥炶皟鍦板潃");
+
+
+
private final String key;
private final String desc;
--
Gitblit v1.8.0