Merge branch 'dev' of http://192.168.1.220:10080/chenweida/jw2.0 into dev

svr/svr-manage/src/main/resources/webapp/common/js/common.js

@@ -1,2 +1,2 @@
var server="localhost:8080";
var server="localhost:8080/";
var not_login=-1000;

svr/svr-manage/src/main/resources/webapp/common/js/util/util.js

@@ -117,7 +117,7 @@ function getUserCode() {
    var code = window.localStorage.getItem("userCode");
    if (!code) {
        alert("请重新登陆")
        window.location.href = '/login/login.jsp';
        window.location.href = server+'/login/login.html';
    }
    return code
}
@@ -125,3 +125,14 @@ function getUserCode() {
function setUserCode(code) {
    window.localStorage.setItem("userCode", code);
}
/**
 * 判断是否有登陆
 * @param data
 */
function isLogin(data){
    if(data.errorCode==not_login){
         alert("请重新登陆")
         window.location.href = server+'/login/login.html';
    }
}

svr/svr-manage/src/main/resources/webapp/html/login/login.html

@@ -54,7 +54,7 @@
        var password=$("#password").val();
        $.ajax({
            type: "GET",
            url: "/login",
            url: server+"/login",
            data: {
                "username":username,
                "password":password
@@ -65,7 +65,7 @@
                    //保存用户信息到缓存中
                    window.localStorage.setItem("usercode",data.obj.code);//用户code
                    console.info(data)
                    window.location.href='/index/index.html?u='+data.obj.id;
                    window.location.href=server+'/index/index.html?u='+data.obj.id;
                }else{
                    alert("账号或密码错误")
                }