Merge pull request #306 from lepdou/0627_0701

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/auth/CtripUserService.java

@@ -14,6 +14,7 @@ import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.http.converter.json.GsonHttpMessageConverter;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.client.RestTemplate;
 
@@ -44,6 +45,7 @@ public class CtripUserService implements UserService {
     SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
     factory.setConnectTimeout(getConnectTimeout());
     factory.setReadTimeout(getReadTimeout());
+
     return factory;
   }
 
@@ -140,10 +142,10 @@ public class CtripUserService implements UserService {
                                                         int limit) {
     UserServiceRequest request = new UserServiceRequest();
     request.setAccess_token(getUserServiceAccessToken());
-    request.setType("emloyee");
 
     UserServiceRequestBody requestBody = new UserServiceRequestBody();
     requestBody.setIndexAlias("itdb_emloyee");
+    requestBody.setType("emloyee");
     request.setRequest_body(requestBody);
 
     Map<String, Object> queryJson = Maps.newHashMap();
@@ -168,7 +170,6 @@ public class CtripUserService implements UserService {
 
   static class UserServiceRequest {
     private String access_token;
-    private String type;
     private UserServiceRequestBody request_body;
 
     public String getAccess_token() {
@@ -179,14 +180,6 @@ public class CtripUserService implements UserService {
       this.access_token = access_token;
     }
 
-    public String getType() {
-      return type;
-    }
-
-    public void setType(String type) {
-      this.type = type;
-    }
-
     public UserServiceRequestBody getRequest_body() {
       return request_body;
     }
@@ -199,8 +192,17 @@ public class CtripUserService implements UserService {
 
   static class UserServiceRequestBody {
     private String indexAlias;
+    private String type;
     private Map<String, Object> queryJson;
 
+    public String getType() {
+      return type;
+    }
+
+    public void setType(String type) {
+      this.type = type;
+    }
+
     public String getIndexAlias() {
       return indexAlias;
     }

apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/auth/CtripUserServiceTest.java

@@ -70,7 +70,6 @@ public class CtripUserServiceTest {
         ctripUserService.assembleSearchUserRequest(someKeyword, someOffset, someLimit);
 
     assertEquals(someUserServiceToken, request.getAccess_token());
-    assertEquals("emloyee", request.getType());
 
     CtripUserService.UserServiceRequestBody requestBody = request.getRequest_body();
 
@@ -94,7 +93,6 @@ public class CtripUserServiceTest {
     CtripUserService.UserServiceRequest request = ctripUserService.assembleFindUserRequest(userIds);
 
     assertEquals(someUserServiceToken, request.getAccess_token());
-    assertEquals("emloyee", request.getType());
 
     CtripUserService.UserServiceRequestBody requestBody = request.getRequest_body();