Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wrr-cat
apollo
提交
259a9f7e
apollo
项目概览
wrr-cat
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
apollo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
259a9f7e
编写于
7月 01, 2016
作者:
L
lepdou
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix user search
上级
75199e3b
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
14 addition
and
12 deletion
+14
-12
apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Item.java
...main/java/com/ctrip/framework/apollo/biz/entity/Item.java
+2
-0
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/auth/CtripUserService.java
.../ctrip/framework/apollo/portal/auth/CtripUserService.java
+12
-10
apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/auth/CtripUserServiceTest.java
...ip/framework/apollo/portal/auth/CtripUserServiceTest.java
+0
-2
未找到文件。
apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Item.java
浏览文件 @
259a9f7e
...
...
@@ -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"
)
...
...
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/auth/CtripUserService.java
浏览文件 @
259a9f7e
...
...
@@ -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
浏览文件 @
259a9f7e
...
...
@@ -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
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录