Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wrr-cat
apollo
提交
95e8e55c
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,发现更多精彩内容 >>
提交
95e8e55c
编写于
7月 26, 2016
作者:
L
lepdou
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update
上级
c954dbd0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
2 addition
and
20 deletion
+2
-20
apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ReleaseService.java
...om/ctrip/framework/apollo/biz/service/ReleaseService.java
+1
-10
apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/ReleaseServiceTest.java
...trip/framework/apollo/biz/service/ReleaseServiceTest.java
+0
-9
apollo-portal/src/main/resources/static/config.html
apollo-portal/src/main/resources/static/config.html
+1
-1
未找到文件。
apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ReleaseService.java
浏览文件 @
95e8e55c
...
...
@@ -41,9 +41,6 @@ public class ReleaseService {
private
AuditService
auditService
;
@Autowired
private
NamespaceLockService
namespaceLockService
;
@Autowired
private
NamespaceService
namespaceService
;
public
Release
findOne
(
long
releaseId
)
{
Release
release
=
releaseRepository
.
findOne
(
releaseId
);
...
...
@@ -126,17 +123,11 @@ public class ReleaseService {
String
clusterName
=
release
.
getClusterName
();
String
namespaceName
=
release
.
getNamespaceName
();
Namespace
namespace
=
namespaceService
.
findOne
(
appId
,
clusterName
,
namespaceName
);
if
(
namespace
==
null
)
{
throw
new
BadRequestException
(
String
.
format
(
"namespace not existed. (appId=%s, cluster=%s, namespace=%s)"
,
appId
,
clusterName
,
namespaceName
));
}
PageRequest
page
=
new
PageRequest
(
0
,
2
);
List
<
Release
>
twoLatestActiveReleases
=
findActiveReleases
(
appId
,
clusterName
,
namespaceName
,
page
);
if
(
twoLatestActiveReleases
==
null
||
twoLatestActiveReleases
.
size
()
<
2
)
{
throw
new
BadRequestException
(
String
.
format
(
"Can't rollback namespace(appId=%s, clusterName=%s, namespaceName=%s) because only one active release"
,
appId
,
"Can't rollback namespace(appId=%s, clusterName=%s, namespaceName=%s) because
there is
only one active release"
,
appId
,
clusterName
,
namespaceName
));
}
...
...
apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/ReleaseServiceTest.java
浏览文件 @
95e8e55c
package
com.ctrip.framework.apollo.biz.service
;
import
com.ctrip.framework.apollo.biz.AbstractUnitTest
;
import
com.ctrip.framework.apollo.biz.entity.Namespace
;
import
com.ctrip.framework.apollo.biz.entity.Release
;
import
com.ctrip.framework.apollo.biz.repository.ReleaseRepository
;
import
com.ctrip.framework.apollo.core.exception.BadRequestException
;
...
...
@@ -34,7 +33,6 @@ public class ReleaseServiceTest extends AbstractUnitTest {
private
String
clusterName
=
"cluster-test"
;
private
String
namespaceName
=
"namespace-test"
;
private
String
user
=
"user-test"
;
private
Namespace
namespace
;
private
long
releaseId
=
1
;
private
Release
firstRelease
;
private
Release
secondRelease
;
...
...
@@ -42,10 +40,6 @@ public class ReleaseServiceTest extends AbstractUnitTest {
@Before
public
void
init
()
{
namespace
=
new
Namespace
();
namespace
.
setAppId
(
appId
);
namespace
.
setClusterName
(
clusterName
);
namespace
.
setNamespaceName
(
namespaceName
);
firstRelease
=
new
Release
();
firstRelease
.
setId
(
releaseId
);
...
...
@@ -67,7 +61,6 @@ public class ReleaseServiceTest extends AbstractUnitTest {
public
void
testNamespaceNotExist
()
{
when
(
releaseRepository
.
findOne
(
releaseId
)).
thenReturn
(
firstRelease
);
when
(
namespaceService
.
findOne
(
appId
,
clusterName
,
namespaceName
)).
thenThrow
(
new
BadRequestException
(
"xx"
));
releaseService
.
rollback
(
releaseId
,
user
);
}
...
...
@@ -76,7 +69,6 @@ public class ReleaseServiceTest extends AbstractUnitTest {
public
void
testHasNoRelease
()
{
when
(
releaseRepository
.
findOne
(
releaseId
)).
thenReturn
(
firstRelease
);
when
(
namespaceService
.
findOne
(
appId
,
clusterName
,
namespaceName
)).
thenReturn
(
namespace
);
when
(
releaseRepository
.
findByAppIdAndClusterNameAndNamespaceNameAndIsAbandonedFalseOrderByIdDesc
(
appId
,
clusterName
,
namespaceName
,
...
...
@@ -90,7 +82,6 @@ public class ReleaseServiceTest extends AbstractUnitTest {
public
void
testRollback
()
{
when
(
releaseRepository
.
findOne
(
releaseId
)).
thenReturn
(
firstRelease
);
when
(
namespaceService
.
findOne
(
appId
,
clusterName
,
namespaceName
)).
thenReturn
(
namespace
);
when
(
releaseRepository
.
findByAppIdAndClusterNameAndNamespaceNameAndIsAbandonedFalseOrderByIdDesc
(
appId
,
clusterName
,
namespaceName
,
...
...
apollo-portal/src/main/resources/static/config.html
浏览文件 @
95e8e55c
...
...
@@ -384,7 +384,7 @@
<div
class=
"modal-footer"
>
<button
type=
"button"
class=
"btn btn-default"
data-dismiss=
"modal"
>
取消
</button>
<button
type=
"submit"
class=
"btn btn-danger"
ng-if=
"releaseCompareResult.length > 0"
ng-disabled=
"rollbackBtnDisabled"
>
回滚
ng-disabled=
"rollbackBtnDisabled"
>
确定
回滚
</button>
</div>
</div>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录