stjdydayou %!s(int64=4) %!d(string=hai) anos
pai
achega
f570458062

+ 16 - 2
src/main/java/com/zhiqiyun/open/router/apis/Oauth2Api.java

@@ -59,8 +59,22 @@ public class Oauth2Api {
 		builder.header("Authorization", "Basic " + clientSecret);
 		builder.header("Content-Type", "application/x-www-form-urlencoded");
 		builder.post(formBuilder.build());
-
-		return this.getResponse(builder);
+		Response resp = this.okHttpClient.newCall(builder.build()).execute();
+		if (resp.isSuccessful()) {
+			String result = Objects.requireNonNull(resp.body()).string();
+			JSONObject jsonObject = JSON.parseObject(result);
+			return OapResponse.success().setBody(jsonObject);
+		} else {
+			try {
+				String result = Objects.requireNonNull(resp.body()).string();
+				log.error(result);
+				JSONObject jsonObject = JSON.parseObject(result);
+				return OapResponse.fail(jsonObject.getString("error"), jsonObject.getString("error_description"));
+			} catch (Exception e) {
+				log.error("", e);
+				return OapResponse.fail("NETWORK_ERROR", "网络异常" + resp.message());
+			}
+		}
 	}
 
 	/**

+ 4 - 4
src/test/java/com/zhiqiyun/TestSdk.java

@@ -11,19 +11,19 @@ import java.util.Map;
 public class TestSdk {
 	public static void main(String[] args) throws Exception {
 		DefaultClient client = new DefaultClient(
-				"http://127.0.0.1:9800/router",
+				"http://47.114.32.188:9800/router",
 				"220228000020",
-				"MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCzg5TgyojZDZpSpUhpXlk6wWOH0OuVjnrOKOl9jdpzgG2fgws59Ue8YMGJpVi7q32mh4cIbNi5YDnH9sIxbFKPAo8HrcopVQfQ3E+z7e4T1yErfzsNk+sWjA3piZMSZOxX/rAZetAXYAT8ZxXUDidpEnjE7QR3uNBtiTS9TvhKxwIDAQAB",
+				"MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCSTihNSHP5mqzMxkqxeEv150GWUcfdNy9eoD9wWhWO5re59vi8ownmfpcKOSHhqM09W+/jwC5xbqhYJN2kbCMWTyBHJ1BaoldX736aOPCmo0octyiq2N3Xx5JFnBh5asXdEO12lrOXGNqcwwq6iDuw2Na3H4u7p3QEIz6LKLcGJQIDAQAB",
 				AlgorithmType.RSA
 		);
 		Map<String, Object> dataMap = new HashMap<>();
-		dataMap.put("account", "stjdydayou");
+		dataMap.put("userName", "stjdydayou");
 		dataMap.put("password", "123456");
 //		form1.put("realName", "测试realName");
 //		form1.put("sex", "1");
 //		form1.put("email", "测试email");
 //		form1.put("phone", "测试phone");
-		Response<Map<String, Object>> response = client.execute("oauth2.register", "1.0.0", dataMap);
+		Response<Map<String, Object>> response = client.execute("oauth2.login", "1.0.0", dataMap);
 		System.out.println(JSON.toJSONString(response));
 	}
 }