From 00026c4255ed1b47961d17a5b4500fe788bfa9d8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 17 九月 2019 09:45:50 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
index 73c4d60..2105715 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -7,7 +7,7 @@
import org.yeshi.utils.annotation.MapUtil;
-import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;
import com.yeshi.fanli.entity.config.AlipayConfig;
import com.yeshi.fanli.entity.config.ConstantConfig;
import com.yeshi.fanli.entity.config.SMSConfig;
@@ -264,8 +264,18 @@
public static String getAppName(String platform, String version) {
if (VersionUtil.greaterThan_2_0(platform, version))
- return Constant.systemCommonConfig.getProjectName();
+ return Constant.systemCommonConfig.getProjectChineseName();
else
return "杩斿埄鍒�";
}
+
+ public static WXAccountInfoDTO getWXAccount(String platform, String version) {
+// if (VersionUtil.greaterThan_2_0(platform, version)) {
+// return new WXAccountInfoDTO("wxa99686bb65a9f466", "57390718ddedaa1591f6876cdcf96f43", "wx879fb78463222cd5",
+// "2ad8ec333a9f96b13c5c5c1c2b13cd67");
+// } else {
+ return new WXAccountInfoDTO("wx43617e2ed82c5b28", "f8a65908fb4681bdd181de70f6ab9a3b", "wx5c0d167c6e3ad726",
+ "0c79d5869bb0f2d7c13e43f9a18f440d");
+// }
+ }
}
--
Gitblit v1.8.0