Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[feat #1839]: Support setting server.servlet.context-path #1851

Merged
merged 2 commits into from
Nov 23, 2020
Merged

[feat #1839]: Support setting server.servlet.context-path #1851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00be76b
fix: 解决启动时指定server.servlet.context-path导致页面加载失败问题
xuande Nov 12, 2020
28d3c7d
fix: 提交遗漏文件
xuande Nov 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions sentinel-dashboard/src/main/webapp/resources/app/scripts/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ angular
return response;
},
'request' : function(config) {
// Resolved resource loading failure after configuring ContextPath
var baseUrl = $window.document.getElementsByTagName('base')[0].href;
config.url = baseUrl + config.url;
return config;
},
'requestError' : function(config){
Expand Down
2 changes: 1 addition & 1 deletion sentinel-dashboard/src/main/webapp/resources/app/views/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="container">
<div class="row" style="margin: 200px auto 15px auto; text-align: center;">
<img src="../../assets/img/sentinel-logo.png" alt="Sentinel Logo"
<img src="./assets/img/sentinel-logo.png" alt="Sentinel Logo"
style="max-height: 25%; max-width: 25%;">
<!-- <h1 id='login_title'>Sentinel 控制台</h1> -->
</div>
Expand Down
2 changes: 1 addition & 1 deletion sentinel-dashboard/src/main/webapp/resources/dist/js/app.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions sentinel-dashboard/src/main/webapp/resources/index.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<link rel="stylesheet" href="./lib/css/bootstrap.min.css" />
<link rel="stylesheet" href="./lib/css/font-awesome.min.css">
<link rel="stylesheet" href="./dist/css/app.css">
<base href="./">
</head>

<body>
Expand Down
1 change: 1 addition & 0 deletions sentinel-dashboard/src/main/webapp/resources/index_dev.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<link rel="stylesheet" href="//cdn.bootcss.com/bootstrap/3.0.3/css/bootstrap.min.css" />
<link rel="stylesheet" href="//cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="http://localhost:1234/css/app.css">
<base href="./">
</head>

<body>
Expand Down