diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Item.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Item.java index 2d1314ec6df778b53374017df09c0c71b69c1ade..f5bf8b2759698b90d1352bdef1a09360eb74848c 100644 --- a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Item.java +++ b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Item.java @@ -4,6 +4,7 @@ import com.ctrip.framework.apollo.common.entity.BaseEntity; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import org.hibernate.annotations.SQLDelete; @@ -22,6 +23,7 @@ public class Item extends BaseEntity { private String key; @Column(name = "value") + @Lob private String value; @Column(name = "comment") diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/auth/CtripUserService.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/auth/CtripUserService.java index 4d9a0b50edda11bb96d940d93e8f6b7d3ae691a0..874c7934de41db4c542af8c63ed3eb373fc28d61 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/auth/CtripUserService.java +++ b/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 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 queryJson; + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + public String getIndexAlias() { return indexAlias; } diff --git a/apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/auth/CtripUserServiceTest.java b/apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/auth/CtripUserServiceTest.java index 16c54fadf9b24d624d296c2fba54086a2edea0f8..4cbdb7cb985cc011e12eef5ff50621fdeb63e6a2 100644 --- a/apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/auth/CtripUserServiceTest.java +++ b/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();