deason 7 yıl önce
ebeveyn
işleme
b96909e1f7

+ 1 - 3
src/main/java/cn/com/qmth/examcloud/app/model/Constants.java

@@ -15,9 +15,7 @@ public interface Constants {
 
     String PARAM_TOKEN = "token";
 
-    String ERROR_500 = "\"code\":\"500\"";
-
-    String ERROR_403 = "\"code\":\"403\"";
+    String DEFAULT_ACCOUNT_TYPE = "COMMON_LOGIN_NAME";
 
     /* 常用状态码 */
     String CODE_200 = "200";//成功

+ 7 - 5
src/main/java/cn/com/qmth/examcloud/app/service/UserAuthService.java

@@ -22,6 +22,8 @@ import org.springframework.stereotype.Service;
 import java.util.HashMap;
 import java.util.Map;
 
+import static cn.com.qmth.examcloud.app.model.Constants.*;
+
 /**
  * 认证中心业务服务接口
  */
@@ -37,8 +39,8 @@ public class UserAuthService {
         Map<String, String> params = new HashMap<>();
         params.put("accountValue", account);
         params.put("password", password);
-        params.put("accountType", "COMMON_LOGIN_NAME");
         params.put("rootOrgId", rootOrgId);
+        params.put("accountType", DEFAULT_ACCOUNT_TYPE);
         params.put("domain", "");
         String json = new JsonMapper().toJson(params);
         RequestBody formBody = FormBody.create(MediaType.parse(Constants.CHARSET_JSON_UTF8), json);
@@ -71,8 +73,8 @@ public class UserAuthService {
         Request request = new Request.Builder()
                 .url(requestUrl)
                 .put(formBody)
-                .addHeader("key", key)
-                .addHeader("token", token)
+                .addHeader(PARAM_KEY, key)
+                .addHeader(PARAM_TOKEN, token)
                 .build();
         //执行请求
         return HttpUtils.call(request);
@@ -84,8 +86,8 @@ public class UserAuthService {
         Request request = new Request.Builder()
                 .url(requestUrl)
                 .get()
-                .addHeader("key", key)
-                .addHeader("token", token)
+                .addHeader(PARAM_KEY, key)
+                .addHeader(PARAM_TOKEN, token)
                 .build();
         //执行请求
         return HttpUtils.call(request);

+ 3 - 2
src/main/java/cn/com/qmth/examcloud/app/utils/HttpUtils.java

@@ -21,9 +21,10 @@ public class HttpUtils {
     public static Result call(Request request) throws Exception {
         Response response = HttpBuilder.client.getInstance().newCall(request).execute();
         String bodyStr = response.body().string();
-        log.debug("Response is " + bodyStr);
+        log.debug("Http response is " + bodyStr);
         if (response.isSuccessful()) {
-            return new Result().success();
+            //todo data
+            return new Result().success(bodyStr);
         } else {
             ResBody body = new JsonMapper().fromJson(bodyStr, ResBody.class);
             if (body != null && body.getCode() != null) {