From e3565e2bd367c1199b37e390aadf0dc7fa72010c Mon Sep 17 00:00:00 2001
From: czp <czp3009@gmail.com>
Date: Sun, 12 Nov 2017 22:41:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=20=E8=B0=83=E7=94=A8=20BilibiliRESTAPI.getAccountInfo?=
 =?UTF-8?q?()=20=E6=97=B6=E5=B0=86=E8=87=AA=E5=8A=A8=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=20mid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hiczp/bilibili/api/BilibiliRESTAPI.java     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/hiczp/bilibili/api/BilibiliRESTAPI.java b/src/main/java/com/hiczp/bilibili/api/BilibiliRESTAPI.java
index 2e7b8a8..847213b 100644
--- a/src/main/java/com/hiczp/bilibili/api/BilibiliRESTAPI.java
+++ b/src/main/java/com/hiczp/bilibili/api/BilibiliRESTAPI.java
@@ -18,6 +18,7 @@ import java.security.interfaces.RSAPublicKey;
 import java.time.Instant;
 import java.util.Base64;
 
+//TODO 尚未实现自动 refreshToken 拦截器
 public class BilibiliRESTAPI {
     private static final Logger LOGGER = LoggerFactory.getLogger(BilibiliRESTAPI.class);
     private static String accessToken;
@@ -29,6 +30,7 @@ public class BilibiliRESTAPI {
 
     public static LiveService getLiveService() {
         if (liveService == null) {
+            LOGGER.debug("Init LiveService");
             OkHttpClient okHttpClient = new OkHttpClient.Builder()
                     .addInterceptor(new AddFixedHeadersInterceptor(
                             "Display-ID", Utils.calculateDisplayId(),
@@ -66,6 +68,7 @@ public class BilibiliRESTAPI {
     //TODO 不明确客户端访问 passport.bilibili.com 时使用的 UA
     public static PassportService getPassportService() {
         if (passportService == null) {
+            LOGGER.debug("Init PassportService");
             OkHttpClient okHttpClient = new OkHttpClient().newBuilder()
                     .addInterceptor(AddAppKeyInterceptor.getInstance())
                     .addInterceptor(SortParamsAndSignInterceptor.getInstance())
@@ -140,7 +143,7 @@ public class BilibiliRESTAPI {
         BilibiliRESTAPI.refreshToken = loginResponseEntity.getData().getRefreshToken();
         BilibiliRESTAPI.mid = loginResponseEntity.getData().getMid();
         LOGGER.info("Login success with username '{}'", username);
-        LOGGER.debug("mid: " + BilibiliRESTAPI.mid);
+        LOGGER.debug("mid: {}", BilibiliRESTAPI.mid);
         return loginResponseEntity;
     }
 
@@ -158,6 +161,7 @@ public class BilibiliRESTAPI {
                 }
             }
         }
+        BilibiliRESTAPI.mid = infoEntity.getData().getMid();
         return infoEntity;
     }
 
@@ -217,10 +221,11 @@ public class BilibiliRESTAPI {
         if (logoutResponseEntity.getCode() != 0) {
             throw new LoginException("access token invalid");
         }
+        LOGGER.info("Logout success");
+        LOGGER.debug("Old mid: {}", BilibiliRESTAPI.mid);
         BilibiliRESTAPI.accessToken = null;
         BilibiliRESTAPI.refreshToken = null;
         BilibiliRESTAPI.mid = 0;
-        LOGGER.info("Logout success");
         return logoutResponseEntity;
     }