Authored by zhaoyue

MOD unbind openid

1 git pull 1 git pull
2 -git add --all src/*  
3 -git add --all lib/* 2 +#git add --all src/*
  3 +#git add --all lib/*
4 git add push.sh 4 git add push.sh
5 git add pom.xml 5 git add pom.xml
6 -git commit -m "add hasReport" 6 +git commit -m "MOD unbind openid"
7 git push origin master 7 git push origin master
8 git status 8 git status
9 git pull 9 git pull
@@ -25,7 +25,7 @@ public class AdminOpLogTest { @@ -25,7 +25,7 @@ public class AdminOpLogTest {
25 25
26 Map<String, String> params = new HashMap<String, String>(); 26 Map<String, String> params = new HashMap<String, String>();
27 params.put("username", Constants.USR_ACC); 27 params.put("username", Constants.USR_ACC);
28 - params.put("operation", Integer.toString(Constants.OP_NEWUSER_REGISTER)); 28 + params.put("operation", Integer.toString(Constants.OP_NEWUSER_DIAGNOSE));
29 params.put("t", HttpTools.getNow()); 29 params.put("t", HttpTools.getNow());
30 params.put("type", Constants.KEY_ID); 30 params.put("type", Constants.KEY_ID);
31 params.put("sign", HttpTools.getSign(params)); 31 params.put("sign", HttpTools.getSign(params));
@@ -22,8 +22,8 @@ public class AdminSetPulseBreathRateTest { @@ -22,8 +22,8 @@ public class AdminSetPulseBreathRateTest {
22 22
23 Map<String, String> params = new HashMap<String, String>(); 23 Map<String, String> params = new HashMap<String, String>();
24 params.put("username", Constants.USR_ACC); 24 params.put("username", Constants.USR_ACC);
25 - params.put("pulse", "80");  
26 - params.put("breathrate", "19"); 25 + params.put("pulse", "111");
  26 + params.put("breathrate", "22");
27 params.put("type", Constants.KEY_ID); 27 params.put("type", Constants.KEY_ID);
28 params.put("t", HttpTools.getNow()); 28 params.put("t", HttpTools.getNow());
29 params.put("sign", HttpTools.getSign(params)); 29 params.put("sign", HttpTools.getSign(params));
@@ -45,16 +45,14 @@ public class OpenIdTest { @@ -45,16 +45,14 @@ public class OpenIdTest {
45 */ 45 */
46 @Test 46 @Test
47 public void testUnBind() { 47 public void testUnBind() {
  48 + String token = OpenIdTest.bindWithOpenIdAndLoginAndGetToken(Constants.USR_OPENID, Constants.USR_OPENID_TYPE);
48 Map<String, String> params = new HashMap<String, String>(); 49 Map<String, String> params = new HashMap<String, String>();
49 - params.put("username", Constants.USR_ACC);  
50 - params.put("password", EncodeTools.encode("MD5", Constants.USR_PWD));  
51 params.put("openId", Constants.USR_OPENID); 50 params.put("openId", Constants.USR_OPENID);
52 params.put("openIdType", Constants.USR_OPENID_TYPE); 51 params.put("openIdType", Constants.USR_OPENID_TYPE);
53 -  
54 params.put("t", HttpTools.getNow()); 52 params.put("t", HttpTools.getNow());
55 params.put("type", Constants.KEY_ID); 53 params.put("type", Constants.KEY_ID);
56 params.put("sign", HttpTools.getSign(params)); 54 params.put("sign", HttpTools.getSign(params));
57 - String response = HttpTools.requestByMap(URL_OPEN_ID, "DELETE", params); 55 + String response = HttpTools.requestByMapWithToken(URL_OPEN_ID, "DELETE", params, token);
58 System.out.println(response); 56 System.out.println(response);
59 Assert.assertTrue(RtnCodeTools.verifyCode(response, Constants.OPENID_UNBIND_SUCESS)); 57 Assert.assertTrue(RtnCodeTools.verifyCode(response, Constants.OPENID_UNBIND_SUCESS));
60 58