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

# Conflicts:
#	app_core/common/src/main/java/com/core/net/http/ViewUtil.java
#	app_modular/applogin/src/main/java/com/modular/login/activity/LoginActivity.java

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/WebViewCommActivity.java

@@ -240,10 +240,10 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
 
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                if (!TextUtils.isEmpty(url) && !url.equals("http://www.ubtob.com/signin#")) {
+                if (!TextUtils.isEmpty(url)) {
                     Log.d("loadurl", url);
                     if (url.contains("https://account.ubtob.com/sso/login") ||
-                            url.contains("https://sso.ubtob.com/")) {
+                            url.contains("https://sso.ubtob.com/") || url.contains("http://surecloseweb.com")) {
                         Intent loginIntent = new Intent();
                         loginIntent.setClass(WebViewCommActivity.this, LoginActivity.class);
                         startActivity(loginIntent);
@@ -258,13 +258,6 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
                             view.loadUrl(url);
                         }
                     }
-                } else {
-                    if (isCookie) {
-                        synCookies(WebViewCommActivity.this, url);
-                        view.loadUrl(url);
-                    } else {
-                        view.loadUrl(url);
-                    }
                 }
                 return true;
             }

app_core/common/src/main/java/com/core/app/Constants.java

@@ -10,8 +10,8 @@ public class Constants {
     public static final String BASE_URL_LOGIN = "http://manage.ubtob.com/public/account";
     //账户中心地址
     public static final String ACCOUNT_CENTER_HOST = "https://sso.ubtob.com/";
-//    public static final String ACCOUNT_CENTER_HOST = "http://192.168.253.12:32323/";
-    //    public static final String ACCOUNT_CENTER_HOST = "https://account.ubtob.com/";
+    //    public static final String ACCOUNT_CENTER_HOST = "http://10.1.51.91:3001/";
+//    public static final String ACCOUNT_CENTER_HOST = "https://account.ubtob.com/";
     //IM正式地址
     public static final String IM_BASE_URL = "http://113.105.74.140:8092/";
     //IM测试地址

app_modular/appworks/src/main/java/com/uas/appworks/activity/RegisterDetailActivity.java

@@ -99,19 +99,17 @@ public class RegisterDetailActivity extends BaseMVPActivity {
                             JSONObject enterpriseObject = JSON.parseObject(mEnterpriseInfo);
                             if (enterpriseObject != null) {
                                 enName = JSONUtil.getText(enterpriseObject, "vendname");
-//                            enAddress = JSONUtil.getText(resultObject, "enAddress");
-//                            enCorporation = JSONUtil.getText(resultObject, "enCorporation");
-//                            adminName = JSONUtil.getText(resultObject, "adminName");
-//                            enTel = JSONUtil.getText(resultObject, "enTel");
-//                            long date = resultObject.getLongValue("date");
-//                            registerDate = "";
-//                            if (date != 0) {
-//                                registerDate = DateFormatUtil.long2Str(date, DateFormatUtil.YMD);
-//                            }
-                                JSONObject userObject = enterpriseObject.getJSONObject("user");
-
-                                inviteUserName = JSONUtil.getText(userObject, "userName");
-//                                inviteEnName = JSONUtil.getText(resultObject, "inviteEnName");
+                                enAddress = JSONUtil.getText(enterpriseObject, "enAddress");
+                                enCorporation = JSONUtil.getText(enterpriseObject, "enCorporation");
+                                adminName = JSONUtil.getText(enterpriseObject, "adminName");
+                                enTel = JSONUtil.getText(enterpriseObject, "enTel");
+                                long date = enterpriseObject.getLongValue("registerDate");
+                                registerDate = "";
+                                if (date != 0) {
+                                    registerDate = DateFormatUtil.long2Str(date, DateFormatUtil.YMD);
+                                }
+                                inviteUserName = JSONUtil.getText(enterpriseObject, "inviteUserName");
+                                inviteEnName = JSONUtil.getText(enterpriseObject, "inviteEnName");
 
                             }
                         } catch (Exception e) {