Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
apollo
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
apollo
Commits
4c015ec4
Commit
4c015ec4
authored
Jun 03, 2016
by
lepdou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
细节优化
parent
8639abd0
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
2 deletions
+10
-2
ServiceLocator.java
...ctrip/framework/apollo/portal/service/ServiceLocator.java
+3
-1
config.html
apollo-portal/src/main/resources/static/config.html
+2
-0
index.html
apollo-portal/src/main/resources/static/index.html
+2
-1
AppUtils.js
apollo-portal/src/main/resources/static/scripts/AppUtils.js
+3
-0
font-awesome.min.css
...tal/src/main/resources/static/vendor/font-awesome.min.css
+0
-0
No files found.
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ServiceLocator.java
View file @
4c015ec4
...
...
@@ -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
View file @
4c015ec4
...
...
@@ -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
View file @
4c015ec4
...
...
@@ -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
View file @
4c015ec4
...
...
@@ -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
View file @
4c015ec4
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment