.解决登录崩溃问题

app/src/main/java/com/unis/sxzcl/ui/home/MainFragment.java

@@ -9,7 +9,6 @@ import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.ViewPager;
 
-import com.tencent.bugly.beta.Beta;
 import com.unis.model.DataCallback;
 import com.unis.model.VersionModel;
 import com.unis.model.bean.VersionBean;
@@ -133,10 +132,10 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> {
     protected void onFirstShow() {
         updateTab(0);//默认选中第一个tab
 
-        try {
-            Beta.checkUpgrade(false, true);
-        } catch (Exception e) {
-        }
+//        try {
+//            Beta.checkUpgrade(false, true);
+//        } catch (Exception e) {
+//        }
 
         getVersion();
 

app/src/main/java/com/unis/sxzcl/ui/user/UserFragment.java

@@ -155,6 +155,8 @@ public class UserFragment extends BaseFragment<FragmentUserBinding> {
      * 退出登录
      */
     private void logout() {
+        if (!isActive()) return;
+
         showProgress("正在退出登录...", false);
         UserModel.get().logout(new DataCallback<String>() {
             @Override

model/src/main/java/com/unis/model/MyStringCallback.java

@@ -1,6 +1,8 @@
 package com.unis.model;
 
+import com.lzy.okgo.OkGo;
 import com.lzy.okgo.callback.StringCallback;
+import com.lzy.okgo.cookie.store.CookieStore;
 import com.lzy.okgo.exception.HttpException;
 import com.lzy.okgo.exception.StorageException;
 import com.lzy.okgo.model.Response;
@@ -18,6 +20,9 @@ import java.net.ConnectException;
 import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
 
+import okhttp3.Cookie;
+import okhttp3.HttpUrl;
+
 /**
  * 创建人 mQ
  * 创建时间 2019/7/12 0012 22:18
@@ -30,9 +35,18 @@ public abstract class MyStringCallback extends StringCallback {
     @Override
     public void onStart(Request<String, ? extends Request> request) {
         super.onStart(request);
-        // TODO: 2020/12/21 暂时不加token
-//        String headToken = UserModel.get().getHeadToken();
-//        request.headers("Authorization", headToken);
+        String headToken = UserModel.get().getHeadToken();
+        if (headToken != null)
+            request.headers("Authorization", headToken);
+
+        String token = UserModel.get().getHeadToken();
+        if (token != null) {
+            HttpUrl httpUrl = HttpUrl.parse(UrlPath.host);
+            Cookie.Builder builder = new Cookie.Builder();
+            Cookie cookieToken = builder.name("Token").value(token).domain(httpUrl.host()).build();
+            CookieStore cookieStore = OkGo.getInstance().getCookieJar().getCookieStore();
+            cookieStore.saveCookie(httpUrl, cookieToken);
+        }
     }
 
     protected abstract void onSuccessResult(Response<String> response) throws JSONException;

model/src/main/java/com/unis/model/UrlPath.java

@@ -15,100 +15,98 @@ public class UrlPath {
 
     //服务器地址
 //    public static final String host = "http://10.10.1.25:9066/";
-    public static final String host = "http://101.36.160.140:21021/api"; // 02服务器
-    // vpn
-//    public static final String host1 = "http://10.100.1.63:9605";
+    public static final String host = "http://101.36.160.140:21021"; // 02服务器
 
     //图片地址
-    public static final String image_host = host + "/csc-szls-system-manage/minio/preViewPicture/";
+    public static final String image_host = host + "/api/csc-szls-system-manage/minio/preViewPicture/";
 
     //版本信息
-    public static final String version_info = "http://101.36.160.140:21021/apk/version_info.json";
+    public static final String version_info = host + "/apk/version_info.json";
 
 
     /****************** 登录 ******************/
     // 登录
-    public static final String login = host + "/csc-szls-system-manage/public/login";
+    public static final String login = host + "/api/csc-szls-system-manage/public/login";
     // 注销登录
-    public static final String logout = host + "/csc-szls-system-manage/public/logout";
+    public static final String logout = host + "/api/csc-szls-system-manage/public/logout";
 
     // 新增用户
-    public static final String user_add = host + "/csc-szls-system-manage/user/authority_button/add";
+    public static final String user_add = host + "/api/csc-szls-system-manage/user/authority_button/add";
 
 
     /****************** 库 ******************/
     // 库组织架构树
-    public static final String depot_multi_list = host + "/csc-szls-system-manage/basicsDepot/authority/getAll";
+    public static final String depot_multi_list = host + "/api/csc-szls-system-manage/basicsDepot/authority/getAll";
     // 库字典
-    public static final String depot_dictionary = host + "/csc-szls-system-manage/basicsDepot/authority/getAllMAP";
+    public static final String depot_dictionary = host + "/api/csc-szls-system-manage/basicsDepot/authority/getAllMAP";
 
 
     /****************** 仓房 ******************/
     // 仓房列表
-    public static final String house_list = host + "/csc-szls-system-manage/basicsWarehouse/authority/getDepotAll";
+    public static final String house_list = host + "/api/csc-szls-system-manage/basicsWarehouse/authority/getDepotAll";
     // 仓房信息
-    public static final String house_detail = host + "/csc-szls-system-manage/basicsWarehouse/authority/getById";
+    public static final String house_detail = host + "/api/csc-szls-system-manage/basicsWarehouse/authority/getById";
     // 仓房信息 修改
-    public static final String house_update = host + "/csc-szls-system-manage/basicsWarehouse/authority_button/update";
+    public static final String house_update = host + "/api/csc-szls-system-manage/basicsWarehouse/authority_button/update";
     // 仓房字典
-    public static final String house_dictionary = host + "/csc-szls-system-manage/basicsWarehouse/authority/getAllMAP";
+    public static final String house_dictionary = host + "/api/csc-szls-system-manage/basicsWarehouse/authority/getAllMAP";
 
 
     /****************** 人员 ******************/
     // 人员树
-    public static final String person_tree = host + "/csc-szls-system-manage/sysPersonnel/authority/getByDepotId";
+    public static final String person_tree = host + "/api/csc-szls-system-manage/sysPersonnel/authority/getByDepotId";
     // 人员详情
-    public static final String person_detail = host + "/csc-szls-system-manage/sysPersonnel/authority/getById";
+    public static final String person_detail = host + "/api/csc-szls-system-manage/sysPersonnel/authority/getById";
     // 人员详情 仓房id
-    public static final String person_detail_by_house = host + "/csc-szls-system-manage/sysPersonnel/authority/getByWarehouseId";
+    public static final String person_detail_by_house = host + "/api/csc-szls-system-manage/sysPersonnel/authority/getByWarehouseId";
     // 人员字典
-    public static final String person_dictionary = host + "/csc-szls-system-manage/user/authority/getAll";
+    public static final String person_dictionary = host + "/api/csc-szls-system-manage/user/authority/getAll";
 
 
     /****************** 部门 ******************/
     // 部门字典
-    public static final String department_dictionary = host + "/csc-szls-system-manage/sysDepartment/authority/getAllMAP";
+    public static final String department_dictionary = host + "/api/csc-szls-system-manage/sysDepartment/authority/getAllMAP";
 
 
     /****************** 粮情检查 ******************/
     // 粮情检查记录
-    public static final String grain_check_list = host + "/csc-szls-business/grainConditionRecord/authority/getPage";
+    public static final String grain_check_list = host + "/api/csc-szls-business/grainConditionRecord/authority/getPage";
     // 粮情检查字典
-    public static final String grain_check_dictionary = host + "/csc-szls-business/grainManageDictionary/authority/getPage";
+    public static final String grain_check_dictionary = host + "/api/csc-szls-business/grainManageDictionary/authority/getPage";
     // 粮情检查新增
-    public static final String grain_check_add = host + "/csc-szls-business/grainConditionRecord/authority_button/add";
+    public static final String grain_check_add = host + "/api/csc-szls-business/grainConditionRecord/authority_button/add";
     // 粮情检查修改
-    public static final String grain_check_update = host + "/csc-szls-business/grainConditionRecord/authority_button/update";
+    public static final String grain_check_update = host + "/api/csc-szls-business/grainConditionRecord/authority_button/update";
 
 
     /****************** 机械通风 ******************/
     // 机械通风列表
-    public static final String process_list = host + "/csc-szls-business/ventilation/processAudit/getPage";
+    public static final String process_list = host + "/api/csc-szls-business/ventilation/processAudit/getPage";
     // 机械通风初始化流程
-    public static final String process_all = host + "/csc-szls-business/ventilation/processMain/getAllProcess";
+    public static final String process_all = host + "/api/csc-szls-business/ventilation/processMain/getAllProcess";
     // 新增机械通风
-    public static final String process_add = host + "/csc-szls-business/ventilation/processAudit/add";
+    public static final String process_add = host + "/api/csc-szls-business/ventilation/processAudit/add";
     // 修改机械通风
-    public static final String process_update = host + "/csc-szls-business/ventilation/processAudit/detailsAdd";
+    public static final String process_update = host + "/api/csc-szls-business/ventilation/processAudit/detailsAdd";
     // 机械通风审批
-    public static final String process_audit = host + "/csc-szls-business/ventilation/processAudit/audit";
+    public static final String process_audit = host + "/api/csc-szls-business/ventilation/processAudit/audit";
     // 机械通风详情
-    public static final String process_detail = host + "/csc-szls-business/ventilation/processAudit/getDataByProcessId";
+    public static final String process_detail = host + "/api/csc-szls-business/ventilation/processAudit/getDataByProcessId";
 
     // 审批流程
-    public static final String approve_all = host + "/csc-szls-business/ventilation/processBasis/getBasisByType";
+    public static final String approve_all = host + "/api/csc-szls-business/ventilation/processBasis/getBasisByType";
 
     /****************** 待办 ******************/
     // 待办 已发起
-    public static final String todo_apply_list = host + "/csc-szls-business/ventilation/processAudit/applyList";
+    public static final String todo_apply_list = host + "/api/csc-szls-business/ventilation/processAudit/applyList";
     // 待办 待处理
-    public static final String todo_list = host + "/csc-szls-business/ventilation/processAudit/toDisposeList";
+    public static final String todo_list = host + "/api/csc-szls-business/ventilation/processAudit/toDisposeList";
     // 待办 已处理
-    public static final String todo_finish_list = host + "/csc-szls-business/ventilation/processAudit/completeList";
+    public static final String todo_finish_list = host + "/api/csc-szls-business/ventilation/processAudit/completeList";
 
     /****************** 通知 ******************/
     // 通知列表
-    public static final String notice_list = host + "/csc-szls-message/sysNoticeUser/authority/getPage";
+    public static final String notice_list = host + "/api/csc-szls-message/sysNoticeUser/authority/getPage";
 
 
 }

model/src/main/java/com/unis/model/UserModel.java

@@ -5,12 +5,14 @@ import androidx.annotation.StringDef;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.lzy.okgo.OkGo;
+import com.lzy.okgo.cookie.store.CookieStore;
 import com.lzy.okgo.model.Response;
 import com.lzy.okgo.request.GetRequest;
 import com.unis.model.bean.LoginBean;
 import com.unis.model.bean.UserBean;
 import com.unis.model.bean.person.PersonBean;
 import com.unis.model.bean.person.PersonTreeBean;
+import com.xyxsbj.mylibrary.tool.LogTool;
 import com.xyxsbj.mylibrary.tool.SPTool;
 
 import org.json.JSONException;
@@ -21,6 +23,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import okhttp3.Cookie;
+import okhttp3.HttpUrl;
+
 /**
  * 包名: com.unis.model
  * 类名: UserModel
@@ -89,7 +94,8 @@ public class UserModel {
                         LoginBean bean = gson.fromJson(dataJson, LoginBean.class);
 
                         // 保存用户信息
-                        SPTool.saveString(Constant.KEY_USER, gson.toJson(bean.getUser()));
+                        String userInfo = gson.toJson(bean.getUser());
+                        SPTool.saveString(Constant.KEY_USER, userInfo);
 
                         // 保存token
                         String accessToken = bean.getTokenInfo().getAccess_token();
@@ -100,6 +106,18 @@ public class UserModel {
                         String token = tokenType + " " + accessToken;
                         SPTool.saveString(Constant.KEY_HEAD_TOKEN, token);
 
+                        HttpUrl httpUrl = HttpUrl.parse(UrlPath.host);
+                        Cookie.Builder builder = new Cookie.Builder();
+                        Cookie cookieToken = builder.name("Token").value(token).domain(httpUrl.host()).build();
+                        Cookie cookieUserInfo = builder.name("UserInfo").value(userInfo).domain(httpUrl.host()).build();
+                        CookieStore cookieStore = OkGo.getInstance().getCookieJar().getCookieStore();
+                        cookieStore.saveCookie(httpUrl, cookieToken);
+//                        cookieStore.saveCookie(httpUrl, cookie2);
+
+                        CookieStore store = OkGo.getInstance().getCookieJar().getCookieStore();
+                        List<Cookie> allCookie = store.getAllCookie();
+                        LogTool.i("所有cookie如下："+ allCookie.toString());
+
                         if (callBack != null)
                             callBack.onSuccess(bean);
                     }

version_info.json

@@ -3,7 +3,7 @@
     {
       "versionName": "1.4",
       "versionCode": 4,
-      "content": "1.修改桌面图标、页面字体、颜色样式等\n2.修改登录页\n3.等待动画调整\n4.修改部分bug\n5.完善仓房信息\n6.完善保管员信息",
+      "content": "1.修改桌面图标、页面字体、颜色样式等\n2.修改登录页\n3.等待动画调整\n4.修改部分bug\n5.完善仓房信息\n6.完善保管员信息\n7.解决登录bug",
       "fileName": "sxzcl_release_1.4_4.apk",
       "must": true,
       "time": "2020-12-26"