Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
8ff9b77f53
|
|
@ -12,6 +12,6 @@ public class LoginPageConfig {
|
||||||
|
|
||||||
@RequestMapping("/")
|
@RequestMapping("/")
|
||||||
public RedirectView loginPage() {
|
public RedirectView loginPage() {
|
||||||
return new RedirectView("/ynImgTool/login.html");
|
return new RedirectView("/imgTool/login.html");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@
|
||||||
<script src="js/publicJs.js"></script>
|
<script src="js/publicJs.js"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
if (top != self) {
|
if (top != self) {
|
||||||
parent.location.href = '/ynImgTool/login.html';
|
parent.location.href = '/imgTool/login.html';
|
||||||
}
|
}
|
||||||
var token = localStorage.getItem("token");
|
var token = localStorage.getItem("token");
|
||||||
if (token != null && token.trim().length != 0) {
|
if (token != null && token.trim().length != 0) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue