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

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

@@ -416,6 +416,7 @@ public class MsgsSecondCommonActivity extends BaseActivity implements View.OnCli
             Intent intent_web = new Intent(mContext, WebViewCommActivity.class);
             intent_web.putExtra("url", url + "?id=" + msg_id);
             intent_web.putExtra("title", msg_title);
+            intent_web.putExtra("cookie", true);
             startActivityForResult(intent_web, MSG_MARKED_READED);
 
         Log.d("322msg_id",msg_id + ":" + url);

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

@@ -451,8 +451,8 @@ public class ViewUtil {
         params.put("appId", "b2b");
         params.put("username", phone);
         params.put("password", password);
-        params.put("spaceId", String.valueOf(spaceId));
-       // params.put("spaceId", "76035");
+        //params.put("spaceId", String.valueOf(spaceId));
+       params.put("spaceId", "76035");
         startNetThread(url, params, handler, Constants.SUCCESS_B2B, null, null, "post");
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/wxapi/ApiPlatform.java

@@ -12,8 +12,8 @@ public class ApiPlatform extends ApiBase implements ApiModel {
 //    private final String mBaseUrl = "http://192.168.253.102:8090/platform-b2b/"; //董必伟本地ip
 //    private final String mBaseUrl = "http://192.168.253.192:8088/platform-b2b/"; //何本地ip
 
-    private String url_login_test="https://uas.ubtob.com/sso/login";
-   // private String url_login_test = "http://113.105.74.135:8001/sso/login";
+    //private String url_login_test="https://uas.ubtob.com/sso/login";
+   private String url_login_test = "http://113.105.74.135:8001/sso/login";
    // private String url_login_formal = "https://account.ubtob.com/sso/login";
 
     private String OBTAIN_ANNOUNCE_URL = mBaseUrl + "/bulletinCenter/getAllbulletins?pageNumber=1&pageSize=10&enuu=10030994";