Skip to content

Commit 41002ed

Browse files
author
zhouxingrong
committed
fix
1 parent fcad7ca commit 41002ed

File tree

5 files changed

+176
-178
lines changed

5 files changed

+176
-178
lines changed

‎app/src/main/java/com/jusenr/androidgithub/base/BaseApi.java

Lines changed: 5 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
*/
1313

1414
public class BaseApi {
15-
1615
public static final int HOST_FORMAL = 1;//正式环境
1716
public static final int HOST_TEST = 2;//测试环境
1817
public static final int HOST_DEV = 3;//开发环境
@@ -39,21 +38,9 @@ public class BaseApi {
3938
* 通行证
4039
*/
4140
public static String PASS_BASE_URL = "";
42-
/**
43-
* h5
44-
*/
45-
public static String H5_BASE_URL = "";
46-
/**
47-
* 用户图像
48-
*/
49-
public static String USER_AVATAR_BASE_URL = "";
50-
/**
51-
* 版本更新
52-
*/
53-
public static String CLOUD_BASE_URL = "";
5441

5542
/**
56-
* environment: 1，外网 2，内网测试 3，内网开发
43+
* environment: 1，外网生产 2，内网测试 3，内网开发
5744
*/
5845
public static void init(Context context, int environment, String locale) {
5946
HOST_NOW = environment;
@@ -62,33 +49,21 @@ public static void init(Context context, int environment, String locale) {
6249
case 1:
6350
PASS_BASE_URL = "https://api.github.com/";
6451

65-
H5_BASE_URL = "http://h5.putao.com/";
66-
USER_AVATAR_BASE_URL = "http://account.file.putaocloud.com/file/";
67-
CLOUD_BASE_URL = "http://api-cloud.putao.com";
6852
break;
6953
case 2:
7054
PASS_BASE_URL = "https://api.github.com/";
7155

72-
H5_BASE_URL = "http://dev.fe.ptdev.cn/";
73-
USER_AVATAR_BASE_URL = "http://account.file.dev.putaocloud.com/file/";
74-
CLOUD_BASE_URL = "http://test-api-cloud.ptdev.cn";
7556
break;
7657
case 3:
7758
PASS_BASE_URL = "https://api.github.com/";
7859

79-
H5_BASE_URL = "http://dev.fe.ptdev.cn/";
80-
USER_AVATAR_BASE_URL = "http://account.file.dev.putaocloud.com/file/";
81-
CLOUD_BASE_URL = "http://dev-api-cloud.ptdev.cn/";
8260
break;
8361
}
8462

8563
sDeviceId = AppUtils.getRealDeviceId(context);
8664
sVersion = AppUtils.getVersionName(context);
8765
}
8866

89-
//生成孩子二维码
90-
public static final String CREATE_QR_URL = "http://store.putao.com/ad/13";
91-
9267
public static boolean isInner() {
9368
return HOST_NOW == HOST_DEV || HOST_NOW == HOST_TEST;
9469
}
@@ -104,51 +79,12 @@ public static class Url {
10479
public static final String URL_LOGIN = "/authorizations";//登录
10580
public static final String URL_USER = "/user";//获取用户信息
10681

107-
public static final String URL_VERIFICATION = "api/verification";//发送图形验证码
108-
public static final String URL_CHECKMOBILE = "api/checkMobile";//手机注册与否检测
109-
public static final String URL_SAFESENDMSG = "api/safeSendMsg";//发送验证码安全接口
110-
public static final String URL_FORGET = "api/forget";//忘记密码(手机)
111-
public static final String URL_SAFELOGIN = "api/safeLogin";//安全登录
112-
public static final String URL_CHANGEPASSWD = "api/changePasswd";//修改密码
113-
public static final String URL_UPDATETOKEN = "api/updateToken";//更新token
114-
public static final String URL_CHECKTOKEN = "api/checkToken";//验证token
115-
public static final String URL_GETNICKNAME = "api/getNickName";//获取昵称
116-
public static final String URL_SETNICKNAME = "api/setNickName";//设置昵称
117-
118-
//==============================UploadApi=======================================//
119-
/**
120-
* 文件服务
121-
*
122-
* @see com.putao.ptpad.cn.retrofit.api.UploadApi {@link BaseApi#FILE_BASE_URL}.
123-
*/
124-
public static final String URL_CHECK_SHA1 = "fileinfo";//校检sha1
125-
public static final String URL_UPLOAD_FILE = "upload";//上传文件
126-
127-
//==============================QRCodeApi========================================//
128-
/**
129-
* 二维码扫码
130-
*
131-
* @see com.putao.ptpad.cn.retrofit.api.QRCodeApi {@link BaseApi#QRCODE_BASE_URL}.
132-
*/
133-
public static final String URL_QR_SERVER_HANDLER = "handler";//二维码扫码流程
134-
135-
//==================================H5===========================================//
13682
/**
137-
* H5相关
83+
* 通行证
13884
*
139-
* @see {@link BaseApi#H5_BASE_URL}.
85+
* @see com.jusenr.androidgithub.retrofit.api.RepoApi {@link BaseApi#PASS_BASE_URL}.
14086
*/
141-
public static final String URL_H5_USED_TIME_TODAY = H5_BASE_URL + "ptpad/index.html?";//今日使用
142-
public static final String URL_H5_STUDY_REPORT = H5_BASE_URL + "pt_report/index.html";//学习报告
143-
public static final String URL_H5_WHERE_CHILD_QRCODE_1 = H5_BASE_URL + "qr_location/location_index_1.html";//二维码在哪里-协助登录页面
144-
public static final String URL_H5_WHERE_CHILD_QRCODE_2 = H5_BASE_URL + "qr_location/location_index_2.html";//二维码在哪里-关联孩子页面
145-
146-
//==================================版本===========================================//
147-
148-
/**
149-
* 版本更新相关
150-
*/
151-
public static final String URL_UPGRADE_CHECK = "version/checkupgrade";
152-
87+
//==============================RepoApi=======================================//
88+
public static final String URL_SEARCH_REPOSITORIES = "/search/repositories";//搜索项目
15389
}
15490
}

‎app/src/main/java/com/jusenr/androidgithub/retrofit/api/PassApi.java

Lines changed: 4 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,9 @@
22

33
import com.alibaba.fastjson.JSONObject;
44
import com.jusenr.androidgithub.base.BaseApi;
5-
import com.jusenr.androidgithub.retrofit.model.Model2;
65
import com.jusenr.androidgithub.user.model.model.CreateAuthorization;
7-
import com.jusenr.androidgithub.utils.PassModel;
8-
9-
import java.util.Map;
106

117
import retrofit2.http.Body;
12-
import retrofit2.http.FieldMap;
13-
import retrofit2.http.FormUrlEncoded;
148
import retrofit2.http.GET;
159
import retrofit2.http.Header;
1610
import retrofit2.http.POST;
@@ -32,7 +26,8 @@ public interface PassApi {
3226
* @return
3327
*/
3428
@POST(BaseApi.Url.URL_LOGIN)
35-
Observable<JSONObject> login(@Header("Authorization") String authorization, @Body CreateAuthorization createAuthorization);
29+
Observable<JSONObject> login(@Header("Authorization") String authorization,
30+
@Body CreateAuthorization createAuthorization);
3631

3732
/**
3833
* 获取用户信息
@@ -42,96 +37,8 @@ public interface PassApi {
4237
* @return
4338
*/
4439
@GET(BaseApi.Url.URL_USER)
45-
Observable<JSONObject> getUserInfo(@Header("Authorization") String authorization, @Query("access_token") String accessToken);
46-
47-
/**
48-
* 注册
49-
*
50-
* @param map
51-
* @return
52-
*/
53-
@FormUrlEncoded
54-
@POST(BaseApi.Url.URL_USER)
55-
Observable<PassModel> register(@FieldMap Map<String, String> map);
56-
57-
/**
58-
* 登录验证
59-
*
60-
* @param map
61-
* @return
62-
*/
63-
@FormUrlEncoded
64-
@POST(BaseApi.Url.URL_LOGIN)
65-
Observable<JSONObject> login(@FieldMap Map<String, String> map);
66-
67-
/**
68-
* 安全登录
69-
*
70-
* @param map
71-
* @return
72-
*/
73-
@FormUrlEncoded
74-
@POST(BaseApi.Url.URL_SAFELOGIN)
75-
Observable<JSONObject> safeLogin(@FieldMap Map<String, String> map);
76-
77-
/**
78-
* 图形验证码
79-
*
80-
* @param map
81-
* @return
82-
*/
83-
@FormUrlEncoded
84-
@POST(BaseApi.Url.URL_VERIFICATION)
85-
Observable<Model2> graphVerify(@FieldMap Map<String, String> map);
86-
87-
/**
88-
* 忘记密码
89-
*
90-
* @param map
91-
* @return
92-
*/
93-
@FormUrlEncoded
94-
@POST(BaseApi.Url.URL_FORGET)
95-
Observable<Model2> forget(@FieldMap Map<String, String> map);
96-
97-
/**
98-
* 手机注册与否检测
99-
*
100-
* @param map
101-
* @return
102-
*/
103-
@FormUrlEncoded
104-
@POST(BaseApi.Url.URL_CHECKMOBILE)
105-
Observable<Model2> checkMobile(@FieldMap Map<String, String> map);
40+
Observable<JSONObject> getUserInfo(@Header("Authorization") String authorization,
41+
@Query("access_token") String accessToken);
10642

107-
/**
108-
* 修改密码
109-
*
110-
* @param map
111-
* @return
112-
*/
113-
@FormUrlEncoded
114-
@POST(BaseApi.Url.URL_CHANGEPASSWD)
115-
Observable<Model2> changePasswd(@FieldMap Map<String, String> map);
116-
117-
/**
118-
* 更新账号token
119-
*
120-
* @param map
121-
* @return
122-
*/
123-
@FormUrlEncoded
124-
@POST(BaseApi.Url.URL_UPDATETOKEN)
125-
Observable<PassModel> updateToken(@FieldMap Map<String, String> map);
126-
127-
/**
128-
* 设置昵称
129-
*
130-
* @param map
131-
* @return
132-
*/
133-
@FormUrlEncoded
134-
@POST(BaseApi.Url.URL_SETNICKNAME)
135-
Observable<Model2> setNickName(@FieldMap Map<String, String> map);
13643

13744
}

0 commit comments

Comments
 (0)