詹子聪 пре 5 година
родитељ
комит
b94f1b69df

+ 13 - 0
app/src/main/java/com/itant/shibei/tool/StringTool.java

@@ -1,5 +1,6 @@
 package com.itant.shibei.tool;
 
+import android.text.TextUtils;
 import android.util.Base64;
 
 import java.math.BigDecimal;
@@ -58,4 +59,16 @@ public class StringTool {
 
         return String.valueOf(number);
     }
+
+    public static String getMixToken(String token) {
+        if (TextUtils.isEmpty(token) || token.length() < 2) {
+            return token;
+        }
+        int len = token.length();
+        char[] tokenArray = token.toCharArray();
+        char temp = tokenArray[len-2];
+        tokenArray[len-2] = tokenArray[len-1];
+        tokenArray[len-1] = temp;
+        return new String(tokenArray);
+    }
 }

+ 3 - 2
app/src/main/java/com/itant/shibei/ui/home/tool/json/JsonActivity.java

@@ -12,13 +12,14 @@ import com.itant.shibei.R;
 import com.itant.shibei.base.BaseBeiActivity;
 import com.itant.shibei.bean.BeiUser;
 import com.itant.shibei.manager.UserInfoManager;
+import com.itant.shibei.tool.StringTool;
 import com.itant.shibei.tool.SystemTool;
 import com.miekir.common.utils.ToastTool;
 import com.miekir.common.view.AlignTextView;
 import com.miekir.mvp.presenter.InjectPresenter;
 
 public class JsonActivity extends BaseBeiActivity implements View.OnClickListener, IJsonView {
-    private static final String FORMAT_URL = "%sshibei/api/getJson?email=%s";
+    private static final String FORMAT_URL = "%sshibei/api/getJson?s=%s";
 
     @InjectPresenter
     JsonPresenter jsonPresenter;
@@ -49,7 +50,7 @@ public class JsonActivity extends BaseBeiActivity implements View.OnClickListene
         setTitle("GetJson微服务");
 
         tv_json_url = findViewById(R.id.tv_json_url);
-        tv_json_url.setText(String.format(FORMAT_URL, BuildConfig.BASE_URL, mUser.email));
+        tv_json_url.setText(String.format(FORMAT_URL, BuildConfig.BASE_URL, StringTool.getMixToken(mUser.token)));
         et_json = findViewById(R.id.et_json);
         findViewById(R.id.fl_json_url).setOnClickListener(this);
         findViewById(R.id.btn_save_json).setOnClickListener(this);

+ 3 - 2
app/src/main/java/com/itant/shibei/ui/home/tool/weather/WeatherActivity.java

@@ -10,6 +10,7 @@ import com.itant.shibei.R;
 import com.itant.shibei.base.BaseBeiActivity;
 import com.itant.shibei.bean.BeiUser;
 import com.itant.shibei.manager.UserInfoManager;
+import com.itant.shibei.tool.StringTool;
 import com.itant.shibei.tool.SystemTool;
 import com.miekir.common.utils.ToastTool;
 import com.miekir.common.view.AlignTextView;
@@ -18,7 +19,7 @@ import com.miekir.common.view.AlignTextView;
  * 天气界面
  */
 public class WeatherActivity extends BaseBeiActivity implements View.OnClickListener {
-    private static final String FORMAT_URL = "%sshibei/api/getWeather?token=%s&city=深圳";
+    private static final String FORMAT_URL = "%sshibei/api/getWeather?s=%s&city=深圳";
 
     private BeiUser mUser;
 
@@ -34,7 +35,7 @@ public class WeatherActivity extends BaseBeiActivity implements View.OnClickList
         setTitle("日期天气API");
 
         tv_weather_url = findViewById(R.id.tv_weather_url);
-        tv_weather_url.setText(String.format(FORMAT_URL, BuildConfig.BASE_URL, mUser.token));
+        tv_weather_url.setText(String.format(FORMAT_URL, BuildConfig.BASE_URL, StringTool.getMixToken(mUser.token)));
 
         findViewById(R.id.fl_weather_url).setOnClickListener(this);
 

+ 3 - 2
app/src/main/java/com/itant/shibei/ui/home/tool/yiji/YijiActivity.java

@@ -10,6 +10,7 @@ import com.itant.shibei.R;
 import com.itant.shibei.base.BaseBeiActivity;
 import com.itant.shibei.bean.BeiUser;
 import com.itant.shibei.manager.UserInfoManager;
+import com.itant.shibei.tool.StringTool;
 import com.itant.shibei.tool.SystemTool;
 import com.miekir.common.utils.ToastTool;
 import com.miekir.common.view.AlignTextView;
@@ -18,7 +19,7 @@ import com.miekir.common.view.AlignTextView;
  * 黄历界面
  */
 public class YijiActivity extends BaseBeiActivity implements View.OnClickListener {
-    private static final String FORMAT_URL = "%sshibei/api/getYiji?token=%s";
+    private static final String FORMAT_URL = "%sshibei/api/getYiji?s=%s";
 
     private BeiUser mUser;
 
@@ -35,7 +36,7 @@ public class YijiActivity extends BaseBeiActivity implements View.OnClickListene
         setTitle("宜忌API");
 
         tv_yiji_url = findViewById(R.id.tv_yiji_url);
-        tv_yiji_url.setText(String.format(FORMAT_URL, BuildConfig.BASE_URL, mUser.token));
+        tv_yiji_url.setText(String.format(FORMAT_URL, BuildConfig.BASE_URL, StringTool.getMixToken(mUser.token)));
 
         findViewById(R.id.fl_yiji_url).setOnClickListener(this);