Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
superrain51
apollo
提交
b16ef121
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,发现更多精彩内容 >>
提交
b16ef121
编写于
5月 04, 2016
作者:
L
lepdou
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #170 from lepdou/lepdou_master
bugfix release name
上级
cfe37bed
cb602922
变更
9
显示空白变更内容
内联
并排
Showing
9 changed file
with
19 addition
and
21 deletion
+19
-21
apollo-biz/src/main/java/com/ctrip/apollo/biz/service/ReleaseService.java
...ain/java/com/ctrip/apollo/biz/service/ReleaseService.java
+1
-0
apollo-portal/src/main/java/com/ctrip/apollo/portal/entity/form/NamespaceTextModel.java
...m/ctrip/apollo/portal/entity/form/NamespaceTextModel.java
+1
-10
apollo-portal/src/main/resources/application.yml
apollo-portal/src/main/resources/application.yml
+1
-1
apollo-portal/src/main/resources/static/scripts/controller/app/AppConfigController.js
...rces/static/scripts/controller/app/AppConfigController.js
+3
-2
apollo-portal/src/main/resources/static/scripts/controller/app/SyncConfigController.js
...ces/static/scripts/controller/app/SyncConfigController.js
+2
-0
apollo-portal/src/main/resources/static/scripts/services/ConfigService.js
...c/main/resources/static/scripts/services/ConfigService.js
+2
-3
apollo-portal/src/main/resources/static/views/app.html
apollo-portal/src/main/resources/static/views/app.html
+3
-2
apollo-portal/src/main/resources/static/views/sync.html
apollo-portal/src/main/resources/static/views/sync.html
+6
-2
apollo-portal/src/test/java/com/ctrip/apollo/portal/ConfigServiceTest.java
.../test/java/com/ctrip/apollo/portal/ConfigServiceTest.java
+0
-1
未找到文件。
apollo-biz/src/main/java/com/ctrip/apollo/biz/service/ReleaseService.java
浏览文件 @
b16ef121
...
...
@@ -67,6 +67,7 @@ public class ReleaseService {
release
.
setReleaseKey
(
ReleaseKeyGenerator
.
generateReleaseKey
(
namespace
));
release
.
setDataChangeCreatedTime
(
new
Date
());
release
.
setDataChangeCreatedBy
(
owner
);
release
.
setDataChangeLastModifiedBy
(
owner
);
release
.
setName
(
name
);
release
.
setComment
(
comment
);
release
.
setAppId
(
namespace
.
getAppId
());
...
...
apollo-portal/src/main/java/com/ctrip/apollo/portal/entity/form/NamespaceTextModel.java
浏览文件 @
b16ef121
...
...
@@ -12,12 +12,11 @@ public class NamespaceTextModel implements Verifiable {
private
String
namespaceName
;
private
int
namespaceId
;
private
String
configText
;
private
String
modifyBy
;
private
String
comment
;
@Override
public
boolean
isInvalid
(){
return
StringUtils
.
isContainEmpty
(
appId
,
env
,
clusterName
,
namespaceName
,
configText
,
modifyBy
)
||
namespaceId
<=
0
;
return
StringUtils
.
isContainEmpty
(
appId
,
env
,
clusterName
,
namespaceName
,
configText
)
||
namespaceId
<=
0
;
}
public
String
getAppId
()
{
return
appId
;
...
...
@@ -67,14 +66,6 @@ public class NamespaceTextModel implements Verifiable {
this
.
configText
=
configText
;
}
public
String
getModifyBy
()
{
return
modifyBy
;
}
public
void
setModifyBy
(
String
modifyBy
)
{
this
.
modifyBy
=
modifyBy
;
}
public
String
getComment
()
{
return
comment
;
}
...
...
apollo-portal/src/main/resources/application.yml
浏览文件 @
b16ef121
...
...
@@ -17,4 +17,4 @@ ctrip:
apollo
:
portal
:
env
:
dev
env
:
dev
,fat
apollo-portal/src/main/resources/static/scripts/controller/app/AppConfigController.js
浏览文件 @
b16ef121
...
...
@@ -159,7 +159,7 @@ application_module.controller("AppConfigController",
$scope
.
commitChange
=
function
()
{
ConfigService
.
modify_items
(
$scope
.
pageContext
.
appId
,
$scope
.
pageContext
.
env
,
$scope
.
pageContext
.
clusterName
,
$scope
.
draft
.
namespace
.
namespaceName
,
$scope
.
draft
.
text
,
$scope
.
draft
.
namespace
.
id
,
$scope
.
commitComment
,
currentUser
).
then
(
$scope
.
draft
.
namespace
.
id
,
$scope
.
commitComment
).
then
(
function
(
result
)
{
toastr
.
success
(
"
更新成功
"
);
//refresh all namespace items
...
...
@@ -205,10 +205,11 @@ application_module.controller("AppConfigController",
releaseNamespace
=
namespace
;
};
$scope
.
releaseComment
=
''
;
$scope
.
releaseTitle
=
''
;
$scope
.
release
=
function
()
{
ConfigService
.
release
(
$scope
.
pageContext
.
appId
,
$scope
.
pageContext
.
env
,
$scope
.
pageContext
.
clusterName
,
releaseNamespace
.
namespace
.
namespaceName
,
currentUser
,
releaseNamespace
.
namespace
.
namespaceName
,
$scope
.
releaseTitle
,
$scope
.
releaseComment
).
then
(
function
(
result
)
{
toastr
.
success
(
"
发布成功
"
);
...
...
apollo-portal/src/main/resources/static/scripts/controller/app/SyncConfigController.js
浏览文件 @
b16ef121
...
...
@@ -72,7 +72,9 @@ sync_item_module.controller("SyncItemController",
$scope
.
syncItems
=
function
()
{
ConfigService
.
sync_items
(
$scope
.
pageContext
.
namespaceName
,
parseSyncSourceData
()).
then
(
function
(
result
)
{
$scope
.
syncItemStep
+=
1
;
$scope
.
syncSuccess
=
true
;
},
function
(
result
)
{
$scope
.
syncSuccess
=
false
;
toastr
.
error
(
AppUtil
.
errorMsg
(
result
));
});
};
...
...
apollo-portal/src/main/resources/static/scripts/services/ConfigService.js
浏览文件 @
b16ef121
...
...
@@ -59,7 +59,7 @@ appService.service("ConfigService", ['$resource', '$q', function ($resource, $q)
return
d
.
promise
;
},
modify_items
:
function
(
appId
,
env
,
clusterName
,
namespaceName
,
configText
,
namespaceId
,
comment
,
modifyBy
)
{
modify_items
:
function
(
appId
,
env
,
clusterName
,
namespaceName
,
configText
,
namespaceId
,
comment
)
{
var
d
=
$q
.
defer
();
config_source
.
modify_items
({
appId
:
appId
,
...
...
@@ -70,8 +70,7 @@ appService.service("ConfigService", ['$resource', '$q', function ($resource, $q)
{
configText
:
configText
,
namespaceId
:
namespaceId
,
comment
:
comment
,
modifyBy
:
modifyBy
comment
:
comment
},
function
(
result
)
{
d
.
resolve
(
result
);
...
...
apollo-portal/src/main/resources/static/views/app.html
浏览文件 @
b16ef121
...
...
@@ -334,12 +334,13 @@
<h4
class=
"modal-title"
>
发布
</h4>
</div>
<div
class=
"modal-body"
>
<textarea
rows=
"4"
class=
"form-control"
style=
"width:570px;"
ng-model=
"releaseComment"
<input
type=
"text"
class=
"form-control"
placeholder=
"input release title"
ng-model=
"releaseTitle"
required=
"required"
>
<textarea
rows=
"4"
class=
"form-control"
style=
"margin-top: 15px;"
ng-model=
"releaseComment"
placeholder=
"input release log...."
></textarea>
</div>
<div
class=
"modal-footer"
>
<button
type=
"button"
class=
"btn btn-default"
data-dismiss=
"modal"
>
关闭
</button>
<button
type=
"
button
"
class=
"btn btn-primary"
data-dismiss=
"modal"
ng-click=
"release()"
>
提交
<button
type=
"
submit
"
class=
"btn btn-primary"
data-dismiss=
"modal"
ng-click=
"release()"
>
提交
</button>
</div>
</div>
...
...
apollo-portal/src/main/resources/static/views/sync.html
浏览文件 @
b16ef121
...
...
@@ -162,9 +162,13 @@
<!--step 3-->
<div
class=
"row text-center"
ng-show=
"syncItemStep == 3"
>
<div
class=
"row text-center"
ng-show=
"syncItemStep == 3
&& syncSuccess
"
>
<img
src=
"../img/sync-succ.png"
style=
"height: 100px; width: 100px"
>
<h3>
同步成功!
</h3>
<h3
>
同步成功!
</h3>
</div>
<div
class=
"row text-center"
ng-show=
"syncItemStep == 3 && !syncSuccess"
>
<img
src=
"../img/sync-error.png"
style=
"height: 100px; width: 100px"
>
<h3
>
同步失败!
</h3>
</div>
</div>
...
...
apollo-portal/src/test/java/com/ctrip/apollo/portal/ConfigServiceTest.java
浏览文件 @
b16ef121
...
...
@@ -100,7 +100,6 @@ public class ConfigServiceTest {
NamespaceTextModel
model
=
new
NamespaceTextModel
();
model
.
setEnv
(
"DEV"
);
model
.
setModifyBy
(
"ll"
);
model
.
setNamespaceName
(
namespaceName
);
model
.
setClusterName
(
clusterName
);
model
.
setAppId
(
appId
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录