Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
superrain51
apollo
提交
a474d5ca
apollo
项目概览
superrain51
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
a474d5ca
编写于
6月 27, 2016
作者:
张
张乐
提交者:
GitHub
6月 27, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #300 from nobodyiam/assign-role-result
return users assigned and adjust rest template timeout
上级
78912008
a0a6a43b
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
65 addition
and
26 deletion
+65
-26
apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ServerConfigService.java
...rip/framework/apollo/biz/service/ServerConfigService.java
+5
-0
apollo-common/src/main/java/com/ctrip/framework/apollo/common/auth/ActiveUser.java
...va/com/ctrip/framework/apollo/common/auth/ActiveUser.java
+0
-17
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/api/API.java
.../main/java/com/ctrip/framework/apollo/portal/api/API.java
+0
-1
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/api/RestTemplateFactory.java
...trip/framework/apollo/portal/api/RestTemplateFactory.java
+28
-6
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/auth/CtripUserService.java
.../ctrip/framework/apollo/portal/auth/CtripUserService.java
+22
-1
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/RolePermissionService.java
...ramework/apollo/portal/service/RolePermissionService.java
+5
-1
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ServerConfigService.java
.../framework/apollo/portal/service/ServerConfigService.java
+5
-0
未找到文件。
apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ServerConfigService.java
浏览文件 @
a474d5ca
...
...
@@ -41,6 +41,11 @@ public class ServerConfigService {
return
serverConfig
==
null
?
null
:
serverConfig
.
getValue
();
}
public
String
getValue
(
String
key
,
String
defaultValue
)
{
String
value
=
getValue
(
key
);
return
value
==
null
?
defaultValue
:
value
;
}
String
getDataCenter
()
{
return
Foundation
.
server
().
getDataCenter
();
}
...
...
apollo-common/src/main/java/com/ctrip/framework/apollo/common/auth/ActiveUser.java
已删除
100644 → 0
浏览文件 @
78912008
package
com.ctrip.framework.apollo.common.auth
;
import
java.lang.annotation.Documented
;
import
java.lang.annotation.ElementType
;
import
java.lang.annotation.Retention
;
import
java.lang.annotation.RetentionPolicy
;
import
java.lang.annotation.Target
;
import
org.springframework.security.core.annotation.AuthenticationPrincipal
;
@Target
({
ElementType
.
PARAMETER
,
ElementType
.
TYPE
})
@Retention
(
RetentionPolicy
.
RUNTIME
)
@Documented
@AuthenticationPrincipal
public
@interface
ActiveUser
{
}
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/api/API.java
浏览文件 @
a474d5ca
...
...
@@ -5,7 +5,6 @@ import javax.annotation.PostConstruct;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.client.RestTemplate
;
import
com.ctrip.framework.apollo.common.auth.RestTemplateFactory
;
import
com.ctrip.framework.apollo.core.enums.Env
;
import
com.ctrip.framework.apollo.portal.service.ServiceLocator
;
...
...
apollo-
common/src/main/java/com/ctrip/framework/apollo/common/auth
/RestTemplateFactory.java
→
apollo-
portal/src/main/java/com/ctrip/framework/apollo/portal/api
/RestTemplateFactory.java
浏览文件 @
a474d5ca
package
com.ctrip.framework.apollo.
common.auth
;
package
com.ctrip.framework.apollo.
portal.api
;
import
java.io.UnsupportedEncodingException
;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
com.google.common.io.BaseEncoding
;
import
com.ctrip.framework.apollo.portal.service.ServerConfigService
;
import
org.apache.http.Header
;
import
org.apache.http.auth.AuthScope
;
...
...
@@ -19,13 +19,18 @@ import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import
org.springframework.stereotype.Component
;
import
org.springframework.web.client.RestTemplate
;
import
com.google.common.io.BaseEncoding
;
import
java.io.UnsupportedEncodingException
;
import
java.util.ArrayList
;
import
java.util.Collection
;
@Component
public
class
RestTemplateFactory
implements
FactoryBean
<
RestTemplate
>,
InitializingBean
{
@Autowired
private
HttpMessageConverters
httpMessageConverters
;
@Autowired
private
ServerConfigService
serverConfigService
;
private
RestTemplate
restTemplate
;
public
RestTemplate
getObject
()
{
...
...
@@ -54,7 +59,24 @@ public class RestTemplateFactory implements FactoryBean<RestTemplate>, Initializ
.
setDefaultHeaders
(
defaultHeaders
).
build
();
restTemplate
=
new
RestTemplate
(
httpMessageConverters
.
getConverters
());
restTemplate
.
setRequestFactory
(
new
HttpComponentsClientHttpRequestFactory
(
httpClient
));
HttpComponentsClientHttpRequestFactory
requestFactory
=
new
HttpComponentsClientHttpRequestFactory
(
httpClient
);
requestFactory
.
setConnectTimeout
(
getConnectTimeout
());
requestFactory
.
setReadTimeout
(
getReadTimeout
());
restTemplate
.
setRequestFactory
(
requestFactory
);
}
private
int
getConnectTimeout
()
{
String
connectTimeout
=
serverConfigService
.
getValue
(
"api.connectTimeout"
,
"3000"
);
return
Integer
.
parseInt
(
connectTimeout
);
}
private
int
getReadTimeout
()
{
String
readTimeout
=
serverConfigService
.
getValue
(
"api.readTimeout"
,
"10000"
);
return
Integer
.
parseInt
(
readTimeout
);
}
}
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/auth/CtripUserService.java
浏览文件 @
a474d5ca
...
...
@@ -12,6 +12,8 @@ import org.springframework.core.ParameterizedTypeReference;
import
org.springframework.http.HttpEntity
;
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.util.CollectionUtils
;
import
org.springframework.web.client.RestTemplate
;
...
...
@@ -31,13 +33,32 @@ public class CtripUserService implements UserService {
public
CtripUserService
(
ServerConfigService
serverConfigService
)
{
this
.
serverConfigService
=
serverConfigService
;
this
.
restTemplate
=
new
RestTemplate
();
this
.
restTemplate
=
new
RestTemplate
(
clientHttpRequestFactory
()
);
this
.
searchUserMatchFields
=
Lists
.
newArrayList
(
"empcode"
,
"empaccount"
,
"displayname"
,
"c_name"
,
"pinyin"
);
this
.
responseType
=
new
ParameterizedTypeReference
<
Map
<
String
,
List
<
UserServiceResponse
>>>()
{
};
}
private
ClientHttpRequestFactory
clientHttpRequestFactory
()
{
SimpleClientHttpRequestFactory
factory
=
new
SimpleClientHttpRequestFactory
();
factory
.
setConnectTimeout
(
getConnectTimeout
());
factory
.
setReadTimeout
(
getReadTimeout
());
return
factory
;
}
private
int
getConnectTimeout
()
{
String
connectTimeout
=
serverConfigService
.
getValue
(
"api.connectTimeout"
,
"3000"
);
return
Integer
.
parseInt
(
connectTimeout
);
}
private
int
getReadTimeout
()
{
String
readTimeout
=
serverConfigService
.
getValue
(
"api.readTimeout"
,
"3000"
);
return
Integer
.
parseInt
(
readTimeout
);
}
@Override
public
List
<
UserInfo
>
searchUsers
(
String
keyword
,
int
offset
,
int
limit
)
{
UserServiceRequest
request
=
assembleSearchUserRequest
(
keyword
,
offset
,
limit
);
...
...
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/RolePermissionService.java
浏览文件 @
a474d5ca
...
...
@@ -87,9 +87,12 @@ public class RolePermissionService implements InitializingBean {
/**
* Assign role to users
*
* @return the users assigned roles
*/
@Transactional
public
void
assignRoleToUsers
(
String
roleName
,
Set
<
String
>
userIds
,
String
operatorUserId
)
{
public
Set
<
String
>
assignRoleToUsers
(
String
roleName
,
Set
<
String
>
userIds
,
String
operatorUserId
)
{
Role
role
=
findRoleByRoleName
(
roleName
);
Preconditions
.
checkState
(
role
!=
null
,
"Role %s doesn't exist!"
,
roleName
);
...
...
@@ -110,6 +113,7 @@ public class RolePermissionService implements InitializingBean {
});
userRoleRepository
.
save
(
toCreate
);
return
toAssignUserIds
;
}
/**
...
...
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ServerConfigService.java
浏览文件 @
a474d5ca
...
...
@@ -28,4 +28,9 @@ public class ServerConfigService {
return
serverConfig
==
null
?
null
:
serverConfig
.
getValue
();
}
public
String
getValue
(
String
key
,
String
defaultValue
)
{
String
value
=
getValue
(
key
);
return
value
==
null
?
defaultValue
:
value
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录