bhq@iemsoft.cn
2018-11-02 011baec49641826fa677564b757c24e10d26e00c
登录问题
4 files modified
41 ■■■■ changed files
formEngine/src/app/resources/config.json 6 ●●●● patch | view | raw | blame | history
formManagement/src/app/app.component.ts 2 ●●● patch | view | raw | blame | history
formManagement/src/app/core/config.service.ts 3 ●●●● patch | view | raw | blame | history
formManagement/src/app/services/PermissionGuard.ts 30 ●●●● patch | view | raw | blame | history
formEngine/src/app/resources/config.json
@@ -2,13 +2,13 @@
    "config":{
        "Notes":"formEngine",
        "encryptKey":"",
        "SERVER_URL" : "9dKKXEBs/a780eCu8StxI1SmvHrbaOvb62+SWyN3MWBtG0WeVSDIwg==",
        "SERVER" : "9dKKXEBs/a780eCu8StxI1SmvHrbaOvbx8uasGaodjU=",
        "SERVER_URL" : "71ubi3z5xib/I63NSh37d5y+gWThD3rz4IJ9JUiYIaGZy1BUN7TKLA==",
        "SERVER" : "71ubi3z5xib/I63NSh37d/+7kqtoDKlF",
        "WORKTAB" : "vedwIO384GbVeA2YLt6EtpAQ5md/HAfvhXhGzwR2Vyo=",
        "SERVICE_ID" : "rNj44rtPSwI=",
        "Notes":"formManagement",
        "SERVER_PUBLISH":"9dKKXEBs/a780eCu8StxI1SmvHrbaOvbgPYXai9tRb9nP1Ftj30L3suIcSCKCluLialue41lt+HsO7FMuKm7tX816iiIAtDcfnnMaXsXlo+yu2bs+e3RPg==",
        "LOGIN_URL":"WMg3kg+NHsoPp8XfnUETz2OjbXQJdzz/EL0sgU5/UdjfAmA0WmzauOkHAMyDbQO0qCvs3/CdtIAHVnKMRC7iEb1mRtFXT6nXotetuhlz7XZgxSYpvSb1+DIzCMrHrySh",
        "LOGIN_URL":"WMg3kg+NHsoPp8XfnUETz2OjbXQJdzz/EL0sgU5/UdjfAmA0WmzauOkHAMyDbQO0hJ4t+hRR9t380eCu8StxI/FhveLUWLEqKkPl7/OEra9IFmidwo7K8D0l+MMRYzOA",
        "LOGOUT_URL":"UB9HlXporv6/Lpkgo3MgmLitmQL8u6B3h974HQ3fH2NkAbCDiELy9k9MQIaVItAbea4qrlTpuMkrpw8dTOvdGBdvOJbrmsyB2uPRSW4JdQdq84q2+Dd/326h7n7nFMxH74FPQQ9YXRSRFRwb2gl3tavoFhJZEdie9dKKXEBs/a42U0c78s/2U26h7n7nFMxHpNv0vfC6M9yUlIso8g3vYWYAj/9mXWOAGE6y953PDk8=",
        "REGISTER_URL":"UB9HlXporv6/Lpkgo3MgmLitmQL8u6B3h974HQ3fH2O5yriHzTJJpR21nzdeL39iWAPOeOIEvKfbODeaWOtffQT0SLw+JiQer+fQftJYQX4sCHuVc4nBN28hqzPrwiVT7kyXQG6Bh5i7GVVEBne5Dlz34GJ67vYCOxoyMM8BVk/hhSGV4+2n+Q==",
        "Notes":"ajax",
formManagement/src/app/app.component.ts
@@ -188,7 +188,7 @@
            this.showFlg = false;
            window.parent.location.href = urlHref.replace("?loginKey=main", "");
            $(window.parent.document.getElementsByClassName('wrapper')).hide();
            window.parent.location.reload();
            // window.parent.location.reload();
            this.router.navigate(['main']);
        } else {
            
formManagement/src/app/core/config.service.ts
@@ -44,11 +44,10 @@
        this.SERVER_PUBLISH = decryptByDES(response.config.SERVER_PUBLISH,this.encryptKey);
        this.LOGIN_URL = decryptByDES(response.config.LOGIN_URL,this.encryptKey);
        this.LOGOUT_URL = decryptByDES(response.config.LOGOUT_URL,this.encryptKey);
        this.REGISTER_URL = decryptByDES(response.config.LOGOUT_URL,this.encryptKey);
        this.REGISTER_URL = decryptByDES(response.config.REGISTER_URL,this.encryptKey);
        this.WHETHERENCRYPTION = decryptByDES(response.config.WHETHERENCRYPTION,this.encryptKey);
        Config.SERVER_URL = this.SERVER_URL;
        Config.SERVER = this.SERVER;
        console.log(this.encryptKey,this.SERVER_URL,this.SERVER,this.SERVER_PUBLISH,this.LOGIN_URL,this.LOGOUT_URL,this.REGISTER_URL,this.WHETHERENCRYPTION);
    }
    getPowerJson(){
formManagement/src/app/services/PermissionGuard.ts
@@ -45,15 +45,15 @@
            this.setcookies();
            this.getToken();
            var reg = new RegExp("/","g");
            var url = nextState.url.replace(reg,"");
            var qwe: boolean = this.checkPermission(url,true);
            //
            if (!qwe) {
                this.router.navigate(['/NoPermission']);
                return false;
            }
            this.checkPermission('formPreview');
            // var reg = new RegExp("/","g");
            // var url = nextState.url.replace(reg,"");
            // var qwe: boolean = this.checkPermission(url,true);
            // //
            // if (!qwe) {
            //     this.router.navigate(['/NoPermission']);
            //     return false;
            // }
            // this.checkPermission('formPreview');
            return true;
        }
        
@@ -66,11 +66,11 @@
            
            sessionStorage.setItem("permissionData",JSON.stringify(res.data));
            this.permissionData = res.data;
            if(res.data){
                if(res.data.functionPermissionSet.length>0){
                    this.router.navigate(['industryCategory']);
                }
            }
            // if(res.data){
            //     if(res.data.functionPermissionSet.length>0){
            //         this.router.navigate(['industryCategory']);
            //     }
            // }
        });
    }
@@ -132,7 +132,7 @@
    setcookies(){
        var expireDate = new Date();
        expireDate.setTime(expireDate.getTime()+30*60*1000);
        if(this._cookieService.get("token")==null||this._cookieService.get("token")==undefined||sessionStorage.getItem("userInfo")==undefined||sessionStorage.getItem("userInfo")==null){
        if(this._cookieService.get("token")==null||this._cookieService.get("token")==undefined){
            
            this.quitLogin();
        }else{