Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wrr-cat
apollo
提交
99a6f5dd
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,发现更多精彩内容 >>
提交
99a6f5dd
编写于
12月 27, 2019
作者:
W
waters
提交者:
Jason Song
12月 27, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactor/remove redundant else (#2864)
上级
24cc3da1
变更
25
隐藏空白更改
内联
并排
Showing
25 changed file
with
137 addition
and
159 deletion
+137
-159
apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ItemController.java
...mework/apollo/adminservice/controller/ItemController.java
+2
-3
apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ItemService.java
...a/com/ctrip/framework/apollo/biz/service/ItemService.java
+2
-4
apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ReleaseService.java
...om/ctrip/framework/apollo/biz/service/ReleaseService.java
+1
-2
apollo-client/src/main/java/com/ctrip/framework/apollo/util/http/HttpUtil.java
...n/java/com/ctrip/framework/apollo/util/http/HttpUtil.java
+2
-3
apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/TitanCondition.java
...ip/framework/apollo/common/datasource/TitanCondition.java
+4
-2
apollo-core/src/main/java/com/ctrip/framework/foundation/internals/DefaultProviderManager.java
...ramework/foundation/internals/DefaultProviderManager.java
+3
-4
apollo-core/src/main/java/com/ctrip/framework/foundation/internals/provider/DefaultApplicationProvider.java
...dation/internals/provider/DefaultApplicationProvider.java
+2
-3
apollo-core/src/main/java/com/ctrip/framework/foundation/internals/provider/DefaultNetworkProvider.java
...foundation/internals/provider/DefaultNetworkProvider.java
+3
-3
apollo-core/src/main/java/com/ctrip/framework/foundation/internals/provider/DefaultServerProvider.java
.../foundation/internals/provider/DefaultServerProvider.java
+4
-4
apollo-mockserver/src/main/java/com/ctrip/framework/apollo/mockserver/EmbeddedApollo.java
...com/ctrip/framework/apollo/mockserver/EmbeddedApollo.java
+2
-1
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/RetryableRestTemplate.java
...mework/apollo/portal/component/RetryableRestTemplate.java
+2
-3
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/emailbuilder/GrayPublishEmailBuilder.java
...ortal/component/emailbuilder/GrayPublishEmailBuilder.java
+15
-16
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/AppController.java
...rip/framework/apollo/portal/controller/AppController.java
+2
-4
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ConsumerController.java
...ramework/apollo/portal/controller/ConsumerController.java
+21
-22
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ItemController.java
...ip/framework/apollo/portal/controller/ItemController.java
+1
-2
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ServerConfigController.java
...work/apollo/portal/controller/ServerConfigController.java
+4
-4
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/bo/UserInfo.java
...com/ctrip/framework/apollo/portal/entity/bo/UserInfo.java
+1
-2
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/listener/ConfigPublishListener.java
...amework/apollo/portal/listener/ConfigPublishListener.java
+1
-2
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ItemService.java
...om/ctrip/framework/apollo/portal/service/ItemService.java
+3
-3
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ReleaseService.java
...ctrip/framework/apollo/portal/service/ReleaseService.java
+1
-2
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/AuthConfiguration.java
...rk/apollo/portal/spi/configuration/AuthConfiguration.java
+8
-8
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/ldap/ApolloLdapAuthenticationProvider.java
...llo/portal/spi/ldap/ApolloLdapAuthenticationProvider.java
+8
-8
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/ldap/FilterLdapByGroupUserSearch.java
...k/apollo/portal/spi/ldap/FilterLdapByGroupUserSearch.java
+10
-11
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/ldap/LdapUserService.java
...rip/framework/apollo/portal/spi/ldap/LdapUserService.java
+34
-41
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/util/RelativeDateFormat.java
...trip/framework/apollo/portal/util/RelativeDateFormat.java
+1
-2
未找到文件。
apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ItemController.java
浏览文件 @
99a6f5dd
...
...
@@ -50,10 +50,9 @@ public class ItemController {
Item
managedEntity
=
itemService
.
findOne
(
appId
,
clusterName
,
namespaceName
,
entity
.
getKey
());
if
(
managedEntity
!=
null
)
{
throw
new
BadRequestException
(
"item already exists"
);
}
else
{
entity
=
itemService
.
save
(
entity
);
builder
.
createItem
(
entity
);
}
entity
=
itemService
.
save
(
entity
);
builder
.
createItem
(
entity
);
dto
=
BeanUtils
.
transform
(
ItemDTO
.
class
,
entity
);
Commit
commit
=
new
Commit
();
...
...
apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ItemService.java
浏览文件 @
99a6f5dd
...
...
@@ -100,9 +100,8 @@ public class ItemService {
Namespace
namespace
=
namespaceService
.
findOne
(
appId
,
clusterName
,
namespaceName
);
if
(
namespace
!=
null
)
{
return
findItemsWithoutOrdered
(
namespace
.
getId
());
}
else
{
return
Collections
.
emptyList
();
}
return
Collections
.
emptyList
();
}
public
List
<
Item
>
findItemsWithOrdered
(
Long
namespaceId
)
{
...
...
@@ -117,9 +116,8 @@ public class ItemService {
Namespace
namespace
=
namespaceService
.
findOne
(
appId
,
clusterName
,
namespaceName
);
if
(
namespace
!=
null
)
{
return
findItemsWithOrdered
(
namespace
.
getId
());
}
else
{
return
Collections
.
emptyList
();
}
return
Collections
.
emptyList
();
}
public
List
<
Item
>
findItemsModifiedAfterDate
(
long
namespaceId
,
Date
date
)
{
...
...
apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ReleaseService.java
浏览文件 @
99a6f5dd
...
...
@@ -242,9 +242,8 @@ public class ReleaseService {
if
(
parentNamespace
!=
null
)
{
return
publishBranchNamespace
(
parentNamespace
,
namespace
,
operateNamespaceItems
,
releaseName
,
releaseComment
,
operator
,
isEmergencyPublish
,
grayDelKeys
);
}
else
{
throw
new
NotFoundException
(
"Parent namespace not found"
);
}
throw
new
NotFoundException
(
"Parent namespace not found"
);
}
private
void
checkLock
(
Namespace
namespace
,
boolean
isEmergencyPublish
,
String
operator
)
{
...
...
apollo-client/src/main/java/com/ctrip/framework/apollo/util/http/HttpUtil.java
浏览文件 @
99a6f5dd
...
...
@@ -119,10 +119,9 @@ public class HttpUtil {
// 200 and 304 should not trigger IOException, thus we must throw the original exception out
if
(
statusCode
==
200
||
statusCode
==
304
)
{
throw
ex
;
}
else
{
// for status codes like 404, IOException is expected when calling conn.getInputStream()
throw
new
ApolloConfigStatusCodeException
(
statusCode
,
ex
);
}
// for status codes like 404, IOException is expected when calling conn.getInputStream()
throw
new
ApolloConfigStatusCodeException
(
statusCode
,
ex
);
}
if
(
statusCode
==
200
)
{
...
...
apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/TitanCondition.java
浏览文件 @
99a6f5dd
...
...
@@ -12,9 +12,11 @@ public class TitanCondition implements Condition {
public
boolean
matches
(
ConditionContext
context
,
AnnotatedTypeMetadata
metadata
)
{
if
(!
StringUtils
.
isEmpty
(
context
.
getEnvironment
().
getProperty
(
"fat.titan.url"
)))
{
return
true
;
}
else
if
(!
StringUtils
.
isEmpty
(
context
.
getEnvironment
().
getProperty
(
"uat.titan.url"
)))
{
}
if
(!
StringUtils
.
isEmpty
(
context
.
getEnvironment
().
getProperty
(
"uat.titan.url"
)))
{
return
true
;
}
else
if
(!
StringUtils
.
isEmpty
(
context
.
getEnvironment
().
getProperty
(
"pro.titan.url"
)))
{
}
if
(!
StringUtils
.
isEmpty
(
context
.
getEnvironment
().
getProperty
(
"pro.titan.url"
)))
{
return
true
;
}
return
false
;
...
...
apollo-core/src/main/java/com/ctrip/framework/foundation/internals/DefaultProviderManager.java
浏览文件 @
99a6f5dd
...
...
@@ -44,11 +44,10 @@ public class DefaultProviderManager implements ProviderManager {
if
(
provider
!=
null
)
{
return
(
T
)
provider
;
}
else
{
logger
.
error
(
"No provider [{}] found in DefaultProviderManager, please make sure it is registered in DefaultProviderManager "
,
clazz
.
getName
());
return
(
T
)
NullProviderManager
.
provider
;
}
logger
.
error
(
"No provider [{}] found in DefaultProviderManager, please make sure it is registered in DefaultProviderManager "
,
clazz
.
getName
());
return
(
T
)
NullProviderManager
.
provider
;
}
@Override
...
...
apollo-core/src/main/java/com/ctrip/framework/foundation/internals/provider/DefaultApplicationProvider.java
浏览文件 @
99a6f5dd
...
...
@@ -66,10 +66,9 @@ public class DefaultApplicationProvider implements ApplicationProvider {
if
(
"app.id"
.
equals
(
name
))
{
String
val
=
getAppId
();
return
val
==
null
?
defaultValue
:
val
;
}
else
{
String
val
=
m_appProperties
.
getProperty
(
name
,
defaultValue
);
return
val
==
null
?
defaultValue
:
val
;
}
String
val
=
m_appProperties
.
getProperty
(
name
,
defaultValue
);
return
val
==
null
?
defaultValue
:
val
;
}
@Override
...
...
apollo-core/src/main/java/com/ctrip/framework/foundation/internals/provider/DefaultNetworkProvider.java
浏览文件 @
99a6f5dd
...
...
@@ -10,12 +10,12 @@ public class DefaultNetworkProvider implements NetworkProvider {
if
(
"host.address"
.
equalsIgnoreCase
(
name
))
{
String
val
=
getHostAddress
();
return
val
==
null
?
defaultValue
:
val
;
}
else
if
(
"host.name"
.
equalsIgnoreCase
(
name
))
{
}
if
(
"host.name"
.
equalsIgnoreCase
(
name
))
{
String
val
=
getHostName
();
return
val
==
null
?
defaultValue
:
val
;
}
else
{
return
defaultValue
;
}
return
defaultValue
;
}
@Override
...
...
apollo-core/src/main/java/com/ctrip/framework/foundation/internals/provider/DefaultServerProvider.java
浏览文件 @
99a6f5dd
...
...
@@ -86,13 +86,13 @@ public class DefaultServerProvider implements ServerProvider {
if
(
"env"
.
equalsIgnoreCase
(
name
))
{
String
val
=
getEnvType
();
return
val
==
null
?
defaultValue
:
val
;
}
else
if
(
"dc"
.
equalsIgnoreCase
(
name
))
{
}
if
(
"dc"
.
equalsIgnoreCase
(
name
))
{
String
val
=
getDataCenter
();
return
val
==
null
?
defaultValue
:
val
;
}
else
{
String
val
=
m_serverProperties
.
getProperty
(
name
,
defaultValue
);
return
val
==
null
?
defaultValue
:
val
.
trim
();
}
String
val
=
m_serverProperties
.
getProperty
(
name
,
defaultValue
);
return
val
==
null
?
defaultValue
:
val
.
trim
();
}
@Override
...
...
apollo-mockserver/src/main/java/com/ctrip/framework/apollo/mockserver/EmbeddedApollo.java
浏览文件 @
99a6f5dd
...
...
@@ -64,7 +64,8 @@ public class EmbeddedApollo extends ExternalResource {
if
(
request
.
getPath
().
startsWith
(
"/notifications/v2"
))
{
String
notifications
=
request
.
getRequestUrl
().
queryParameter
(
"notifications"
);
return
new
MockResponse
().
setResponseCode
(
200
).
setBody
(
mockLongPollBody
(
notifications
));
}
else
if
(
request
.
getPath
().
startsWith
(
"/configs"
))
{
}
if
(
request
.
getPath
().
startsWith
(
"/configs"
))
{
List
<
String
>
pathSegments
=
request
.
getRequestUrl
().
pathSegments
();
// appId and cluster might be used in the future
String
appId
=
pathSegments
.
get
(
1
);
...
...
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/RetryableRestTemplate.java
浏览文件 @
99a6f5dd
...
...
@@ -219,10 +219,9 @@ public class RetryableRestTemplate {
return
nestedException
instanceof
SocketTimeoutException
||
nestedException
instanceof
HttpHostConnectException
||
nestedException
instanceof
ConnectTimeoutException
;
}
else
{
return
nestedException
instanceof
HttpHostConnectException
||
nestedException
instanceof
ConnectTimeoutException
;
}
return
nestedException
instanceof
HttpHostConnectException
||
nestedException
instanceof
ConnectTimeoutException
;
}
}
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/emailbuilder/GrayPublishEmailBuilder.java
浏览文件 @
99a6f5dd
...
...
@@ -56,23 +56,22 @@ public class GrayPublishEmailBuilder extends ConfigPublishEmailBuilder {
if
(
CollectionUtils
.
isEmpty
(
ruleItems
))
{
return
bodyTemplate
.
replaceAll
(
EMAIL_CONTENT_GRAY_RULES_MODULE
,
"<br><h4>无灰度规则</h4>"
);
}
else
{
StringBuilder
rulesHtmlBuilder
=
new
StringBuilder
();
for
(
GrayReleaseRuleItemDTO
ruleItem
:
ruleItems
)
{
String
clientAppId
=
ruleItem
.
getClientAppId
();
Set
<
String
>
ips
=
ruleItem
.
getClientIpList
();
rulesHtmlBuilder
.
append
(
"<b>AppId: </b>"
)
.
append
(
clientAppId
)
.
append
(
" <b>IP: </b>"
);
IP_JOINER
.
appendTo
(
rulesHtmlBuilder
,
ips
);
}
String
grayRulesModuleContent
=
portalConfig
.
emailGrayRulesModuleTemplate
().
replaceAll
(
EMAIL_CONTENT_GRAY_RULES_CONTENT
,
Matcher
.
quoteReplacement
(
rulesHtmlBuilder
.
toString
()));
return
bodyTemplate
.
replaceAll
(
EMAIL_CONTENT_GRAY_RULES_MODULE
,
Matcher
.
quoteReplacement
(
grayRulesModuleContent
));
}
StringBuilder
rulesHtmlBuilder
=
new
StringBuilder
();
for
(
GrayReleaseRuleItemDTO
ruleItem
:
ruleItems
)
{
String
clientAppId
=
ruleItem
.
getClientAppId
();
Set
<
String
>
ips
=
ruleItem
.
getClientIpList
();
rulesHtmlBuilder
.
append
(
"<b>AppId: </b>"
)
.
append
(
clientAppId
)
.
append
(
" <b>IP: </b>"
);
IP_JOINER
.
appendTo
(
rulesHtmlBuilder
,
ips
);
}
String
grayRulesModuleContent
=
portalConfig
.
emailGrayRulesModuleTemplate
().
replaceAll
(
EMAIL_CONTENT_GRAY_RULES_CONTENT
,
Matcher
.
quoteReplacement
(
rulesHtmlBuilder
.
toString
()));
return
bodyTemplate
.
replaceAll
(
EMAIL_CONTENT_GRAY_RULES_MODULE
,
Matcher
.
quoteReplacement
(
grayRulesModuleContent
));
}
}
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/AppController.java
浏览文件 @
99a6f5dd
...
...
@@ -75,9 +75,8 @@ public class AppController {
public
List
<
App
>
findApps
(
@RequestParam
(
value
=
"appIds"
,
required
=
false
)
String
appIds
)
{
if
(
StringUtils
.
isEmpty
(
appIds
))
{
return
appService
.
findAll
();
}
else
{
return
appService
.
findByAppIds
(
Sets
.
newHashSet
(
appIds
.
split
(
","
)));
}
return
appService
.
findByAppIds
(
Sets
.
newHashSet
(
appIds
.
split
(
","
)));
}
@GetMapping
(
"/search/by-appid-or-name"
)
...
...
@@ -85,9 +84,8 @@ public class AppController {
Pageable
pageable
)
{
if
(
StringUtils
.
isEmpty
(
query
))
{
return
appService
.
findAll
(
pageable
);
}
else
{
return
appService
.
searchByAppIdOrAppName
(
query
,
pageable
);
}
return
appService
.
searchByAppIdOrAppName
(
query
,
pageable
);
}
@GetMapping
(
"/by-owner"
)
...
...
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ConsumerController.java
浏览文件 @
99a6f5dd
...
...
@@ -86,33 +86,32 @@ public class ConsumerController {
}
if
(
Objects
.
equals
(
"AppRole"
,
type
))
{
return
Collections
.
singletonList
(
consumerService
.
assignAppRoleToConsumer
(
token
,
appId
));
}
else
{
if
(
StringUtils
.
isEmpty
(
namespaceName
))
{
throw
new
BadRequestException
(
"Params(NamespaceName) can not be empty."
);
}
if
(
null
!=
envs
){
String
[]
envArray
=
envs
.
split
(
","
);
List
<
String
>
envList
=
Lists
.
newArrayList
();
// validate env parameter
for
(
String
env
:
envArray
)
{
if
(
Strings
.
isNullOrEmpty
(
env
))
{
continue
;
}
if
(
Env
.
UNKNOWN
==
EnvUtils
.
transformEnv
(
env
))
{
throw
new
BadRequestException
(
String
.
format
(
"env: %s is illegal"
,
env
));
}
envList
.
add
(
env
);
}
if
(
StringUtils
.
isEmpty
(
namespaceName
))
{
throw
new
BadRequestException
(
"Params(NamespaceName) can not be empty."
);
}
if
(
null
!=
envs
){
String
[]
envArray
=
envs
.
split
(
","
);
List
<
String
>
envList
=
Lists
.
newArrayList
();
// validate env parameter
for
(
String
env
:
envArray
)
{
if
(
Strings
.
isNullOrEmpty
(
env
))
{
continue
;
}
List
<
ConsumerRole
>
consumeRoles
=
new
ArrayList
<>();
for
(
String
env
:
envList
)
{
consumeRoles
.
addAll
(
consumerService
.
assignNamespaceRoleToConsumer
(
token
,
appId
,
namespaceName
,
env
));
if
(
Env
.
UNKNOWN
==
EnvUtils
.
transformEnv
(
env
))
{
throw
new
BadRequestException
(
String
.
format
(
"env: %s is illegal"
,
env
));
}
return
consumeRoles
;
envList
.
add
(
env
)
;
}
return
consumerService
.
assignNamespaceRoleToConsumer
(
token
,
appId
,
namespaceName
);
List
<
ConsumerRole
>
consumeRoles
=
new
ArrayList
<>();
for
(
String
env
:
envList
)
{
consumeRoles
.
addAll
(
consumerService
.
assignNamespaceRoleToConsumer
(
token
,
appId
,
namespaceName
,
env
));
}
return
consumeRoles
;
}
return
consumerService
.
assignNamespaceRoleToConsumer
(
token
,
appId
,
namespaceName
);
}
...
...
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ItemController.java
浏览文件 @
99a6f5dd
...
...
@@ -194,8 +194,7 @@ public class ItemController {
configService
.
syncItems
(
model
.
getSyncToNamespaces
(),
model
.
getSyncItems
());
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
build
();
}
else
throw
new
AccessDeniedException
(
String
.
format
(
"You don't have the permission to modify environment: %s"
,
envNoPermission
));
throw
new
AccessDeniedException
(
String
.
format
(
"You don't have the permission to modify environment: %s"
,
envNoPermission
));
}
@PreAuthorize
(
value
=
"@permissionValidator.hasModifyNamespacePermission(#appId, #namespaceName, #env)"
)
...
...
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ServerConfigController.java
浏览文件 @
99a6f5dd
...
...
@@ -40,11 +40,11 @@ public class ServerConfigController {
serverConfig
.
setDataChangeLastModifiedBy
(
modifiedBy
);
serverConfig
.
setId
(
0L
);
//为空,设置ID 为0,jpa执行新增操作
return
serverConfigRepository
.
save
(
serverConfig
);
}
else
{
//update
BeanUtils
.
copyEntityProperties
(
serverConfig
,
storedConfig
);
storedConfig
.
setDataChangeLastModifiedBy
(
modifiedBy
);
return
serverConfigRepository
.
save
(
storedConfig
);
}
//update
BeanUtils
.
copyEntityProperties
(
serverConfig
,
storedConfig
);
storedConfig
.
setDataChangeLastModifiedBy
(
modifiedBy
);
return
serverConfigRepository
.
save
(
storedConfig
);
}
@PreAuthorize
(
value
=
"@permissionValidator.isSuperAdmin()"
)
...
...
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/bo/UserInfo.java
浏览文件 @
99a6f5dd
...
...
@@ -48,9 +48,8 @@ public class UserInfo {
UserInfo
anotherUser
=
(
UserInfo
)
o
;
return
userId
.
equals
(
anotherUser
.
userId
);
}
else
{
return
false
;
}
return
false
;
}
}
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/listener/ConfigPublishListener.java
浏览文件 @
99a6f5dd
...
...
@@ -101,9 +101,8 @@ public class ConfigPublishListener {
if
(
publishInfo
.
isRollbackEvent
())
{
return
releaseHistoryService
.
findLatestByPreviousReleaseIdAndOperation
(
env
,
publishInfo
.
getPreviousReleaseId
(),
operation
);
}
else
{
return
releaseHistoryService
.
findLatestByReleaseIdAndOperation
(
env
,
publishInfo
.
getReleaseId
(),
operation
);
}
return
releaseHistoryService
.
findLatestByReleaseIdAndOperation
(
env
,
publishInfo
.
getReleaseId
(),
operation
);
}
...
...
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ItemService.java
浏览文件 @
99a6f5dd
...
...
@@ -239,10 +239,10 @@ public class ItemService {
if
(
sourceComment
==
null
)
{
return
!
StringUtils
.
isEmpty
(
targetComment
);
}
else
if
(
targetComment
!=
null
)
{
}
if
(
targetComment
!=
null
)
{
return
!
sourceComment
.
equals
(
targetComment
);
}
else
{
return
false
;
}
return
false
;
}
}
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ReleaseService.java
浏览文件 @
99a6f5dd
...
...
@@ -126,9 +126,8 @@ public class ReleaseService {
List
<
ReleaseDTO
>
releases
=
findReleaseByIds
(
env
,
releaseIds
);
if
(
CollectionUtils
.
isEmpty
(
releases
))
{
return
null
;
}
else
{
return
releases
.
get
(
0
);
}
return
releases
.
get
(
0
);
}
...
...
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/AuthConfiguration.java
浏览文件 @
99a6f5dd
...
...
@@ -373,15 +373,15 @@ public class AuthConfiguration {
ldapProperties
.
getSearchFilter
(),
ldapContextSource
);
filterBasedLdapUserSearch
.
setSearchSubtree
(
true
);
return
filterBasedLdapUserSearch
;
}
else
{
FilterLdapByGroupUserSearch
filterLdapByGroupUserSearch
=
new
FilterLdapByGroupUserSearch
(
ldapProperties
.
getBase
(),
ldapProperties
.
getSearchFilter
(),
ldapExtendProperties
.
getGroup
().
getGroupBase
(),
ldapContextSource
,
ldapExtendProperties
.
getGroup
().
getGroupSearch
(),
ldapExtendProperties
.
getMapping
().
getRdnKey
(),
ldapExtendProperties
.
getGroup
().
getGroupMembership
(),
ldapExtendProperties
.
getMapping
().
getLoginId
());
filterLdapByGroupUserSearch
.
setSearchSubtree
(
true
);
return
filterLdapByGroupUserSearch
;
}
FilterLdapByGroupUserSearch
filterLdapByGroupUserSearch
=
new
FilterLdapByGroupUserSearch
(
ldapProperties
.
getBase
(),
ldapProperties
.
getSearchFilter
(),
ldapExtendProperties
.
getGroup
().
getGroupBase
(),
ldapContextSource
,
ldapExtendProperties
.
getGroup
().
getGroupSearch
(),
ldapExtendProperties
.
getMapping
().
getRdnKey
(),
ldapExtendProperties
.
getGroup
().
getGroupMembership
(),
ldapExtendProperties
.
getMapping
().
getLoginId
());
filterLdapByGroupUserSearch
.
setSearchSubtree
(
true
);
return
filterLdapByGroupUserSearch
;
}
@Bean
...
...
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/ldap/ApolloLdapAuthenticationProvider.java
浏览文件 @
99a6f5dd
...
...
@@ -67,16 +67,16 @@ public class ApolloLdapAuthenticationProvider extends LdapAuthenticationProvider
if
(!
StringUtils
.
hasLength
(
username
))
{
throw
new
BadCredentialsException
(
this
.
messages
.
getMessage
(
"LdapAuthenticationProvider.emptyUsername"
,
"Empty Username"
));
}
else
if
(!
StringUtils
.
hasLength
(
password
))
{
}
if
(!
StringUtils
.
hasLength
(
password
))
{
throw
new
BadCredentialsException
(
this
.
messages
.
getMessage
(
"AbstractLdapAuthenticationProvider.emptyPassword"
,
"Empty Password"
));
}
else
{
Assert
.
notNull
(
password
,
"Null password was supplied in authentication token"
);
DirContextOperations
userData
=
this
.
doAuthentication
(
userToken
);
String
loginId
=
userData
.
getStringAttribute
(
properties
.
getMapping
().
getLoginId
());
UserDetails
user
=
this
.
userDetailsContextMapper
.
mapUserFromContext
(
userData
,
loginId
,
this
.
loadUserAuthorities
(
userData
,
loginId
,
(
String
)
authentication
.
getCredentials
()));
return
this
.
createSuccessfulAuthentication
(
userToken
,
user
);
}
Assert
.
notNull
(
password
,
"Null password was supplied in authentication token"
);
DirContextOperations
userData
=
this
.
doAuthentication
(
userToken
);
String
loginId
=
userData
.
getStringAttribute
(
properties
.
getMapping
().
getLoginId
());
UserDetails
user
=
this
.
userDetailsContextMapper
.
mapUserFromContext
(
userData
,
loginId
,
this
.
loadUserAuthorities
(
userData
,
loginId
,
(
String
)
authentication
.
getCredentials
()));
return
this
.
createSuccessfulAuthentication
(
userToken
,
user
);
}
}
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/ldap/FilterLdapByGroupUserSearch.java
浏览文件 @
99a6f5dd
...
...
@@ -81,17 +81,16 @@ public class FilterLdapByGroupUserSearch extends FilterBasedLdapUserSearch {
}
}
throw
new
UsernameNotFoundException
(
"User "
+
username
+
" not found in directory."
);
}
else
{
String
[]
memberUids
=
((
DirContextAdapter
)
ctx
)
.
getStringAttributes
(
groupMembershipAttrName
);
for
(
String
memberUid
:
memberUids
)
{
if
(
memberUid
.
equalsIgnoreCase
(
username
))
{
Name
name
=
searchUserById
(
memberUid
);
LdapName
ldapName
=
LdapUtils
.
newLdapName
(
name
);
LdapName
ldapRdn
=
LdapUtils
.
removeFirst
(
ldapName
,
LdapUtils
.
newLdapName
(
searchBase
));
return
new
DirContextAdapter
(
ldapRdn
);
}
}
String
[]
memberUids
=
((
DirContextAdapter
)
ctx
)
.
getStringAttributes
(
groupMembershipAttrName
);
for
(
String
memberUid
:
memberUids
)
{
if
(
memberUid
.
equalsIgnoreCase
(
username
))
{
Name
name
=
searchUserById
(
memberUid
);
LdapName
ldapName
=
LdapUtils
.
newLdapName
(
name
);
LdapName
ldapRdn
=
LdapUtils
.
removeFirst
(
ldapName
,
LdapUtils
.
newLdapName
(
searchBase
));
return
new
DirContextAdapter
(
ldapRdn
);
}
}
throw
new
UsernameNotFoundException
(
"User "
+
username
+
" not found in directory."
);
...
...
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/ldap/LdapUserService.java
浏览文件 @
99a6f5dd
...
...
@@ -167,12 +167,10 @@ public class LdapUserService implements UserService {
if
(
userIds
!=
null
)
{
if
(
userIds
.
stream
().
anyMatch
(
c
->
c
.
equals
(
tmp
.
getUserId
())))
{
return
tmp
;
}
else
{
return
null
;
}
}
else
{
return
tmp
;
return
null
;
}
return
tmp
;
});
}
...
...
@@ -224,24 +222,23 @@ public class LdapUserService implements UserService {
}
return
userInfos
;
}
else
{
List
<
UserInfo
>
userInfos
=
new
ArrayList
<>();
String
[]
memberUids
=
((
DirContextAdapter
)
ctx
)
.
getStringAttributes
(
groupMembershipAttrName
);
for
(
String
memberUid
:
memberUids
)
{
UserInfo
userInfo
=
searchUserById
(
memberUid
);
if
(
userInfo
!=
null
)
{
if
(
keyword
!=
null
)
{
if
(
userInfo
.
getUserId
().
toLowerCase
().
contains
(
keyword
.
toLowerCase
()))
{
userInfos
.
add
(
userInfo
);
}
}
else
{
}
List
<
UserInfo
>
userInfos
=
new
ArrayList
<>();
String
[]
memberUids
=
((
DirContextAdapter
)
ctx
)
.
getStringAttributes
(
groupMembershipAttrName
);
for
(
String
memberUid
:
memberUids
)
{
UserInfo
userInfo
=
searchUserById
(
memberUid
);
if
(
userInfo
!=
null
)
{
if
(
keyword
!=
null
)
{
if
(
userInfo
.
getUserId
().
toLowerCase
().
contains
(
keyword
.
toLowerCase
()))
{
userInfos
.
add
(
userInfo
);
}
}
else
{
userInfos
.
add
(
userInfo
);
}
}
return
userInfos
;
}
return
userInfos
;
});
}
...
...
@@ -258,15 +255,14 @@ public class LdapUserService implements UserService {
}
return
-
1
;
})),
ArrayList:
:
new
));
}
else
{
ContainerCriteria
criteria
=
ldapQueryCriteria
();
if
(!
Strings
.
isNullOrEmpty
(
keyword
))
{
criteria
.
and
(
query
().
where
(
loginIdAttrName
).
like
(
keyword
+
"*"
).
or
(
userDisplayNameAttrName
)
.
like
(
keyword
+
"*"
));
}
users
=
ldapTemplate
.
search
(
criteria
,
ldapUserInfoMapper
);
return
users
;
}
ContainerCriteria
criteria
=
ldapQueryCriteria
();
if
(!
Strings
.
isNullOrEmpty
(
keyword
))
{
criteria
.
and
(
query
().
where
(
loginIdAttrName
).
like
(
keyword
+
"*"
).
or
(
userDisplayNameAttrName
)
.
like
(
keyword
+
"*"
));
}
users
=
ldapTemplate
.
search
(
criteria
,
ldapUserInfoMapper
);
return
users
;
}
@Override
...
...
@@ -278,30 +274,27 @@ public class LdapUserService implements UserService {
return
lists
.
get
(
0
);
}
return
null
;
}
else
{
return
ldapTemplate
.
searchForObject
(
ldapQueryCriteria
().
and
(
loginIdAttrName
).
is
(
userId
),
ldapUserInfoMapper
);
}
return
ldapTemplate
.
searchForObject
(
ldapQueryCriteria
().
and
(
loginIdAttrName
).
is
(
userId
),
ldapUserInfoMapper
);
}
@Override
public
List
<
UserInfo
>
findByUserIds
(
List
<
String
>
userIds
)
{
if
(
CollectionUtils
.
isEmpty
(
userIds
))
{
return
Collections
.
emptyList
();
}
else
{
List
<
UserInfo
>
userList
=
new
ArrayList
<>();
if
(
StringUtils
.
isNotBlank
(
groupSearch
))
{
List
<
UserInfo
>
userListByGroup
=
searchUserInfoByGroup
(
groupBase
,
groupSearch
,
null
,
userIds
);
userList
.
addAll
(
userListByGroup
);
return
userList
;
}
else
{
ContainerCriteria
criteria
=
query
().
where
(
loginIdAttrName
).
is
(
userIds
.
get
(
0
));
userIds
.
stream
().
skip
(
1
).
forEach
(
userId
->
criteria
.
or
(
loginIdAttrName
).
is
(
userId
));
return
ldapTemplate
.
search
(
ldapQueryCriteria
().
and
(
criteria
),
ldapUserInfoMapper
);
}
}
List
<
UserInfo
>
userList
=
new
ArrayList
<>();
if
(
StringUtils
.
isNotBlank
(
groupSearch
))
{
List
<
UserInfo
>
userListByGroup
=
searchUserInfoByGroup
(
groupBase
,
groupSearch
,
null
,
userIds
);
userList
.
addAll
(
userListByGroup
);
return
userList
;
}
ContainerCriteria
criteria
=
query
().
where
(
loginIdAttrName
).
is
(
userIds
.
get
(
0
));
userIds
.
stream
().
skip
(
1
).
forEach
(
userId
->
criteria
.
or
(
loginIdAttrName
).
is
(
userId
));
return
ldapTemplate
.
search
(
ldapQueryCriteria
().
and
(
criteria
),
ldapUserInfoMapper
);
}
}
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/util/RelativeDateFormat.java
浏览文件 @
99a6f5dd
...
...
@@ -53,9 +53,8 @@ public class RelativeDateFormat {
long
months
=
toMonths
(
delta
);
if
(
months
<=
3
)
{
return
(
months
<=
0
?
1
:
months
)
+
ONE_MONTH_AGO
;
}
else
{
return
TIMESTAMP_FORMAT
.
format
(
date
);
}
return
TIMESTAMP_FORMAT
.
format
(
date
);
}
private
static
long
toSeconds
(
long
date
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录