FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Server:优化修改密码接口；Client:优化验证码相关接口，如验证码登录、注册、改密码等 · SFlyers/APIJSON@497a656 · GitHub

/ APIJSON Public
forked from APIJSON/APIJSON

Commit 497a656

Browse files
TommyLemon
committed
Server:优化修改密码接口；Client:优化验证码相关接口，如验证码登录、注册、改密码等
1 parent 3e33f78 commit 497a656

6 files changed

Lines changed: 116 additions & 107 deletions

File tree

‎APIJSON-Android/APIJSON-ADT/APIJSONApp/APIJSONApp/src/apijson/demo/client/activity_fragment/PasswordActivity.java‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public Activity getActivity() {
8787

8888
public static final int TYPE_VERIFY = 0;
8989
public static final int TYPE_REGISTER = 1;
90-
public static final int TYPE_RESET = 3;
90+
public static final int TYPE_RESET = 2;
9191

9292
private int type = TYPE_VERIFY;
9393
private String phone;
@@ -212,7 +212,7 @@ private void getVerify() {
212212

213213
/**从服务器获取验证码
214214
*/
215-
private void getVerifyFromServer() {
215+
private void getVerifyFromServer(int type) {
216216
runUiThread(new Runnable() {
217217

218218
@Override
@@ -221,7 +221,7 @@ public void run() {
221221
}
222222
});
223223

224-
HttpRequest.getVerify(StringUtil.getTrimedString(etPasswordPhone), HTTP_GET_VERIFY, this);
224+
HttpRequest.getVerify(type, StringUtil.getTrimedString(etPasswordPhone), HTTP_GET_VERIFY, this);
225225
}
226226

227227
/**下一步
@@ -245,24 +245,28 @@ private void toNextStep() {
245245
case TYPE_REGISTER:
246246
register();
247247
break;
248-
default:
249-
checkVerify(true);
248+
case TYPE_VERIFY:
249+
checkVerify(Verify.TYPE_LOGIN, true);
250+
break;
251+
case TYPE_RESET:
252+
checkVerify(Verify.TYPE_PASSWORD, true);
250253
break;
251254
}
252255
}
253256

254257
/**验证验证码
258+
* @param type
255259
* @param fromServer
256260
*/
257-
private boolean checkVerify(boolean fromServer) {
261+
private boolean checkVerify(int type, boolean fromServer) {
258262
if (EditTextUtil.isInputedCorrect(context, etPasswordPhone, EditTextUtil.TYPE_PHONE) == false
259263
|| EditTextUtil.isInputedCorrect(context, etPasswordVerify, EditTextUtil.TYPE_VERIFY) == false) {
260264
return false;
261265
}
262266

263267
if (fromServer) {
264268
showProgressDialog();
265-
HttpRequest.checkVerify(StringUtil.getTrimedString(etPasswordPhone),
269+
HttpRequest.checkVerify(type, StringUtil.getTrimedString(etPasswordPhone),
266270
StringUtil.getTrimedString(etPasswordVerify), HTTP_CHECK_VERIFY, this);
267271
}
268272

@@ -271,7 +275,7 @@ private boolean checkVerify(boolean fromServer) {
271275

272276

273277
private void register() {
274-
if (checkVerify(false) == false) {
278+
if (checkVerify(Verify.TYPE_REGISTER, false) == false) {
275279
return;
276280
}
277281
showProgressDialog();
@@ -357,11 +361,11 @@ public void run() {
357361
if (type == TYPE_REGISTER) {
358362
showShortToast("手机号已经注册");
359363
} else {
360-
getVerifyFromServer();
364+
getVerifyFromServer(type == TYPE_VERIFY ? Verify.TYPE_LOGIN : Verify.TYPE_PASSWORD);
361365
}
362366
} else {//手机号未被注册过
363367
if (type == TYPE_REGISTER) {
364-
getVerifyFromServer();
368+
getVerifyFromServer(Verify.TYPE_REGISTER);
365369
} else {
366370
showShortToast("手机号未注册");
367371
}

‎APIJSON-Android/APIJSON-ADT/APIJSONApp/APIJSONApp/src/apijson/demo/client/model/Verify.java‎

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414

1515
package apijson.demo.client.model;
1616

17-
import zuo.biao.library.util.StringUtil;
18-
19-
2017
/**验证码类
2118
* @author Lemon
2219
*/
@@ -26,32 +23,15 @@ public class Verify extends apijson.demo.server.model.Verify {
2623
public Verify() {
2724
super();
2825
}
29-
public Verify(long phone) {
30-
super(phone);
26+
27+
public Verify(int type, String phone) {
28+
super(type, phone);
3129
}
32-
public Verify(String verify) {
33-
this();
34-
setVerify(verify);
35-
}
36-
30+
31+
3732
@Override
3833
public Long getId() {
3934
return value(super.getId());
4035
}
4136

42-
/**服务器用id作为phone
43-
* @return
44-
*/
45-
public String getPhone() {
46-
return "" + getId();
47-
}
48-
public Verify setPhone(String phone) {
49-
setId(Long.valueOf(0 + StringUtil.getNumber(phone)));
50-
return this;
51-
}
52-
public Verify setPhone(Long phone) {
53-
setId(Long.valueOf(0 + StringUtil.getNumber(phone)));
54-
return this;
55-
}
56-
5737
}

‎APIJSON-Android/APIJSON-ADT/APIJSONApp/APIJSONApp/src/apijson/demo/client/util/HttpRequest.java‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -271,33 +271,40 @@ public static void setPassword(String verify, String phone, String password, int
271271
, int requestCode, OnHttpResponseListener listener) {
272272
JSONRequest request = new JSONRequest();
273273
request.put(VERIFY, verify);
274-
request.put(PHONE, phone);
275-
request.put(PASSWORD, password);
276-
request.put(TYPE, type);
274+
Privacy privacy = new Privacy().setPhone(phone);
275+
if (type == Privacy.PASSWORD_TYPE_LOGIN) {
276+
privacy.setPassword(password);
277+
} else {
278+
privacy.setPayPassword(password);
279+
}
280+
request.put(privacy);
277281

278282
HttpManager.getInstance().post(URL_BASE + "put/password", request, requestCode, listener);
279283
}
280284

281285

282286

283287
/**获取验证码
288+
* @param type
284289
* @param phone
285290
* @param requestCode
286291
* @param listener
287292
*/
288-
public static void getVerify(String phone, int requestCode, OnHttpResponseListener listener) {
293+
public static void getVerify(int type, String phone, int requestCode, OnHttpResponseListener listener) {
289294
HttpManager.getInstance().post(URL_BASE + "post/verify/"
290-
, new JSONRequest(PHONE, phone).setTag(VERIFY_)
295+
, new JSONRequest(PHONE, phone).puts(TYPE, type).setTag(VERIFY_)
291296
, requestCode, listener);
292297
}
293298
/**校验验证码
299+
* @param type
294300
* @param phone
295301
* @param verify
296302
* @param requestCode
297303
* @param listener
298304
*/
299-
public static void checkVerify(String phone, String verify, int requestCode, OnHttpResponseListener listener) {
305+
public static void checkVerify(int type, String phone, String verify, int requestCode, OnHttpResponseListener listener) {
300306
JSONRequest request = new JSONRequest();
307+
request.put(TYPE, type);
301308
request.put(PHONE, phone);
302309
request.put(VERIFY, verify);
303310

‎APIJSON-Android/APIJSON-ADT/APIJSONApp/APIJSONApp/src/apijson/demo/server/model/Verify.java‎

Lines changed: 28 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,9 @@
2222
import static zuo.biao.apijson.RequestRole.UNKNOWN;
2323

2424
import zuo.biao.apijson.MethodAccess;
25-
import zuo.biao.apijson.StringUtil;
2625

2726
/**验证码
2827
* @author Lemon
29-
* @see
30-
* <br >GETS:gets/authCode<pre>
31-
{
32-
"Verify":{
33-
"disallow":"id"
34-
}
35-
}
36-
* </pre>
37-
* <br >POST:post/authCode<pre>
38-
{
39-
"Verify":{
40-
"disallow":"!",
41-
"necessary":"id"
42-
}
43-
}
44-
* </pre>
4528
*/
4629
@MethodAccess(
4730
GET = {},
@@ -55,42 +38,50 @@
5538
public class Verify extends BaseModel {
5639
private static final long serialVersionUID = 1L;
5740

58-
private String verify;
41+
public static final int TYPE_LOGIN = 0; //登录
42+
public static final int TYPE_REGISTER = 1; //注册
43+
public static final int TYPE_PASSWORD = 2; //设置密码
44+
45+
private String phone; //手机
46+
private String verify; //验证码
47+
private Integer type; //验证类型
5948

6049
public Verify() {
6150
super();
6251
}
63-
public Verify(String phone) {
52+
/**type和phone为联合主键，必传
53+
* @param type
54+
* @param phone
55+
*/
56+
public Verify(int type, String phone) {
6457
this();
58+
setType(type);
6559
setPhone(phone);
6660
}
67-
public Verify(Long phone) {
68-
this();
69-
setId(phone);
70-
}
71-
public Verify(Long phone, Integer verify) {
72-
this(phone);
73-
setVerify(verify == null ? null : ("" + verify));
74-
}
75-
public Verify(String phone, String verify) {
76-
this(phone);
77-
setVerify(verify);
78-
}
7961

8062

8163
public String getVerify() {
8264
return verify;
8365
}
84-
public void setVerify(String verify) {
66+
public Verify setVerify(String verify) {
8567
this.verify = verify;
68+
return this;
8669
}
8770

88-
//phone is not column
89-
// public String getPhone() {
90-
// return StringUtil.getString(getId());
91-
// }
71+
public String getPhone() {
72+
return phone;
73+
}
9274
public Verify setPhone(String phone) {
93-
setId(Long.valueOf(0 + StringUtil.getNumber(phone)));
75+
this.phone = phone;
9476
return this;
9577
}
78+
79+
public Integer getType() {
80+
return type;
81+
}
82+
public Verify setType(Integer type) {
83+
this.type = type;
84+
return this;
85+
}
86+
9687
}

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL