Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
zhangjian1949
apollo
提交
be118512
apollo
项目概览
zhangjian1949
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
提交
be118512
编写于
6月 03, 2016
作者:
L
lepdou
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #249 from lepdou/adminservicecache
细节优化
上级
8639abd0
4c015ec4
变更
5
展开全部
隐藏空白更改
内联
并排
Showing
5 changed file
with
14 addition
and
2 deletion
+14
-2
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ServiceLocator.java
...ctrip/framework/apollo/portal/service/ServiceLocator.java
+3
-1
apollo-portal/src/main/resources/static/config.html
apollo-portal/src/main/resources/static/config.html
+2
-0
apollo-portal/src/main/resources/static/index.html
apollo-portal/src/main/resources/static/index.html
+2
-1
apollo-portal/src/main/resources/static/scripts/AppUtils.js
apollo-portal/src/main/resources/static/scripts/AppUtils.js
+3
-0
apollo-portal/src/main/resources/static/vendor/font-awesome.min.css
...tal/src/main/resources/static/vendor/font-awesome.min.css
+4
-0
未找到文件。
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ServiceLocator.java
浏览文件 @
be118512
...
...
@@ -33,7 +33,7 @@ public class ServiceLocator {
private
static
final
int
RETRY_TIMES
=
3
;
private
static
final
int
CALL_META_SERVER_THRESHOLD
=
10
;
private
static
final
int
CALL_META_SERVER_THRESHOLD
=
2
;
private
static
final
String
ADMIN_SERVICE_URL_PATH
=
"/services/admin"
;
...
...
@@ -91,6 +91,8 @@ public class ServiceLocator {
logger
.
warn
(
String
.
format
(
"can not get %s admin service address at %d time"
,
env
,
i
));
}
}
//clear cache
serviceAddressCache
.
remove
(
env
);
logger
.
error
(
String
.
format
(
"can not get %s admin service address"
,
env
));
throw
new
ServiceException
(
"No available admin service"
);
}
...
...
apollo-portal/src/main/resources/static/config.html
浏览文件 @
be118512
...
...
@@ -611,6 +611,8 @@
<script
type=
"application/javascript"
src=
"scripts/services/EnvService.js"
></script>
<script
type=
"application/javascript"
src=
"scripts/services/UserService.js"
></script>
<script
type=
"application/javascript"
src=
"scripts/services/ConfigService.js"
></script>
<script
type=
"application/javascript"
src=
"scripts/AppUtils.js"
></script>
<!--directive-->
...
...
apollo-portal/src/main/resources/static/index.html
浏览文件 @
be118512
...
...
@@ -6,7 +6,8 @@
<link
rel=
"stylesheet"
type=
"text/css"
href=
"vendor/bootstrap/css/bootstrap.min.css"
>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"vendor/angular/angular-toastr-1.4.1.min.css"
>
<link
rel=
"stylesheet"
type=
"text/css"
media=
'all'
href=
"vendor/angular/loading-bar.min.css"
>
<link
href=
"//cdn.bootcss.com/font-awesome/4.5.0/css/font-awesome.min.css"
rel=
"stylesheet"
>
<link
rel=
"stylesheet"
type=
"text/css"
media=
'all'
href=
"vendor/font-awesome.min.css"
>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"styles/common-style.css"
>
<title>
apollo
</title>
</head>
...
...
apollo-portal/src/main/resources/static/scripts/AppUtils.js
浏览文件 @
be118512
...
...
@@ -2,6 +2,9 @@ appUtil.service('AppUtil', ['toastr', function (toastr) {
return
{
errorMsg
:
function
(
response
)
{
if
(
response
.
status
==
-
1
)
{
return
"
您的登录信息已过期,请重新登录
"
;
}
var
msg
=
"
Code:
"
+
response
.
status
;
if
(
response
.
data
.
message
!=
null
)
{
msg
+=
"
Msg:
"
+
response
.
data
.
message
;
...
...
apollo-portal/src/main/resources/static/vendor/font-awesome.min.css
0 → 100644
浏览文件 @
be118512
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录