Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_raomeng

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Dec 07 15:10:56 CST 2018
-debugName=970
+#Fri Dec 07 16:46:48 CST 2018
+debugName=971
 versionName=649
-debugCode=970
+debugCode=971
 versionCode=204

app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -26,6 +26,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
+import com.common.config.BaseConfig;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
@@ -643,7 +644,7 @@ public class ViewUtil {
                 LoginEntity model = loginMsg.get(i);
                 if (model.getPlatform().equals("ERP")) {
                     isHasUas = true;
-                    if (model.getName().equals("UAS研发系统（测试）")){
+                    if (BaseConfig.isDebug()&&model.getName().equals("UAS研发系统（测试）")){
                         model.setWebsite("https://218.17.158.219:9443/uas_dev/");
                     }