From 8cb21d0c4ba20f75f73dfda616e8e21023d96741 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Fri, 3 Nov 2023 09:34:48 +0800
Subject: [PATCH] AUTH

---
 src/api/request.js                            |  8 +++---
 src/components/patientRegister/LisRequest.vue |  4 +--
 .../patientRegister/PatientRegisterEdit.vue   |  8 +++---
 .../patientRegister/PatientRegisterList.vue   | 12 ++++-----
 src/components/report/BtnReport.vue           |  4 +--
 .../report/PatientRegisterListNobtn.vue       | 12 ++++-----
 src/components/sumDoctorCheck/ButtonList.vue  |  4 +--
 src/router/index.js                           |  6 ++---
 src/utlis/istoken.js                          | 27 ++++++++++++-------
 src/views/Home.vue                            | 22 ++++++++++-----
 src/views/charge/charge.vue                   |  4 +--
 src/views/login/Login.vue                     | 17 ++++++------
 src/views/user-list/OrganizationUnits.vue     |  6 ++---
 src/views/user-list/UserList.vue              |  2 +-
 14 files changed, 75 insertions(+), 61 deletions(-)

diff --git a/src/api/request.js b/src/api/request.js
index 911f0b4..ce67a31 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -14,13 +14,13 @@ const instance = axios.create({
 //请求拦截
 instance.interceptors.request.use(
   async function (config) {
-    //console.log('old token：',localStorage.getItem("token"))
-    //console.log('old expires_in',localStorage.getItem("expires_in"))
+    //console.log('old token：',window.sessionStorage.getItem("token"))
+    //console.log('old expires_in',window.sessionStorage.getItem("expires_in"))
     await yztoken();
 
-    let token = localStorage.getItem("token");
+    let token = window.sessionStorage.getItem("token");
 
-    let tokentype = localStorage.getItem("tokentype");
+    let tokentype = window.sessionStorage.getItem("tokentype");
     config.headers["Access-Control-Allow-Origin"] = "*";
     // config.headers.ContentType = 'application/x-www-form-urlencoded'
     config.headers.Authorization = `${tokentype} ${token}`;
diff --git a/src/components/patientRegister/LisRequest.vue b/src/components/patientRegister/LisRequest.vue
index f198cf2..53d6c37 100644
--- a/src/components/patientRegister/LisRequest.vue
+++ b/src/components/patientRegister/LisRequest.vue
@@ -189,8 +189,8 @@ export default {
 
     //条码打印
     lisPrint(ReportCode, isPreview) {
-      let token = localStorage.getItem("token");
-      let user = localStorage.getItem("user");
+      let token = window.sessionStorage.getItem("token");
+      let user = window.sessionStorage.getItem("user");
       let toOutShell = {
         ReportCode,
         token,
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 6356dcd..29942cc 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -1443,8 +1443,8 @@ export default {
         return       
       }
 
-      let token = localStorage.getItem('token');
-      let user = localStorage.getItem('user');
+      let token = window.sessionStorage.getItem('token');
+      let user = window.sessionStorage.getItem('user');
       let toOutShell = {
         ReportCode, token,
         preViewCanPrint: 'N',
@@ -1560,8 +1560,8 @@ export default {
         return       
       }
 
-      let token = localStorage.getItem('token');
-      let user = localStorage.getItem('user');
+      let token = window.sessionStorage.getItem('token');
+      let user = window.sessionStorage.getItem('user');
       let toOutShell = {
         ReportCode, token,
         Parameters: [
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index c7385f2..e86caea 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -594,8 +594,8 @@ export default {
         this.$message.info("此功能，需要在壳客户端才可运行！");
         return;
       }
-      let token = localStorage.getItem("token");
-      let user = localStorage.getItem("user");
+      let token = window.sessionStorage.getItem("token");
+      let user = window.sessionStorage.getItem("user");
       let toOutShell = {
         ReportCode,
         token,
@@ -1410,8 +1410,8 @@ export default {
         this.$message.info("此功能，需要在壳客户端才可运行！");
         return;
       }
-      let token = localStorage.getItem("token");
-      let user = localStorage.getItem("user");
+      let token = window.sessionStorage.getItem("token");
+      let user = window.sessionStorage.getItem("user");
       let toOutShell = {
         ReportCode,
         token,
@@ -1483,8 +1483,8 @@ export default {
         this.$message.info("此功能，需要在壳客户端才可运行！");
         return;
       }
-      let token = localStorage.getItem("token");
-      let user = localStorage.getItem("user");
+      let token = window.sessionStorage.getItem("token");
+      let user = window.sessionStorage.getItem("user");
       let toOutShell = {
         ReportCode,
         token,
diff --git a/src/components/report/BtnReport.vue b/src/components/report/BtnReport.vue
index 1790712..e6eccbf 100644
--- a/src/components/report/BtnReport.vue
+++ b/src/components/report/BtnReport.vue
@@ -288,8 +288,8 @@ export default {
 
             ///3a0c990e-5756-2dc0-19d5-69a617fe4048
             let ReportCode = '0005';
-            let token = localStorage.getItem('token');
-            let user = localStorage.getItem('user');
+            let token = window.sessionStorage.getItem('token');
+            let user = window.sessionStorage.getItem('user');
             let toOutShell = {
                 ReportCode, token,
                 preViewCanPrint: this.patientRegister.patientRegisterRd.isAudit,
diff --git a/src/components/report/PatientRegisterListNobtn.vue b/src/components/report/PatientRegisterListNobtn.vue
index 0b345c9..9e83978 100644
--- a/src/components/report/PatientRegisterListNobtn.vue
+++ b/src/components/report/PatientRegisterListNobtn.vue
@@ -226,8 +226,8 @@ export default {
 
     // 打印指引单(isPreview)
     async guidePrint(ReportCode, isPreview) {
-      let token = localStorage.getItem('token');
-      let user = localStorage.getItem('user');
+      let token = window.sessionStorage.getItem('token');
+      let user = window.sessionStorage.getItem('user');
       let toOutShell = {
         ReportCode, token,
         preViewCanPrint: 'N',
@@ -836,8 +836,8 @@ export default {
     //检验条码打印
     lisPrint(prId, ReportCode, isPreview) {
 
-      let token = localStorage.getItem('token');
-      let user = localStorage.getItem('user');
+      let token = window.sessionStorage.getItem('token');
+      let user = window.sessionStorage.getItem('user');
       let toOutShell = {
         ReportCode, token,
         preViewCanPrint: 'N',
@@ -898,8 +898,8 @@ export default {
     //pacs条码打印
     pacsPrint(prId, ReportCode, isPreview) {
 
-      let token = localStorage.getItem('token');
-      let user = localStorage.getItem('user');
+      let token = window.sessionStorage.getItem('token');
+      let user = window.sessionStorage.getItem('user');
       let toOutShell = {
         ReportCode, token,
         preViewCanPrint: 'Y',
diff --git a/src/components/sumDoctorCheck/ButtonList.vue b/src/components/sumDoctorCheck/ButtonList.vue
index d760b13..6cd7536 100644
--- a/src/components/sumDoctorCheck/ButtonList.vue
+++ b/src/components/sumDoctorCheck/ButtonList.vue
@@ -275,8 +275,8 @@ export default {
             }
             ///3a0c990e-5756-2dc0-19d5-69a617fe4048
             let ReportCode = '0005';
-            let token = localStorage.getItem('token');
-            let user = localStorage.getItem('user');
+            let token = window.sessionStorage.getItem('token');
+            let user = window.sessionStorage.getItem('user');
             let toOutShell = {
                 ReportCode, token,
                 preViewCanPrint: this.sumDoctorCheck.sumPREdit.isAudit,
diff --git a/src/router/index.js b/src/router/index.js
index 2300c74..21ac71a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -23,7 +23,7 @@ const routes = [{
         path: "/home",
         name: "home",
         component: () =>
-            import ( /* webpackChunkName: "about" */ "../views/Home.vue"),
+            import ("../views/Home.vue"),
         children: [{
                 path: "/role",
                 component: () =>
@@ -428,8 +428,8 @@ const router = new VueRouter({
 });
 
 router.beforeEach((to, form, next) => {
-    let token = localStorage.getItem("token");
-    let tokentype = localStorage.getItem("tokentype");
+    let token = window.sessionStorage.getItem("token");
+    let tokentype = window.sessionStorage.getItem("tokentype");
     if (to.path === "/login") {
         if (token != null) {
             next({
diff --git a/src/utlis/istoken.js b/src/utlis/istoken.js
index 8465973..8ec42dd 100644
--- a/src/utlis/istoken.js
+++ b/src/utlis/istoken.js
@@ -1,14 +1,21 @@
 import moment from "moment";
 import axios from "axios";
 import mm from "@/utlis/mm";
+import router from "../router";
 
 export const yztoken = async () => {
   //console.log("验证");
   //let dqtime = parseInt(new Date().getTime() / 1000); // 当前时间的时间戳
-  //let tokentime = parseInt(window.localStorage.getItem("expires_in")); //登录缓存后的时间戳
+  //let tokentime = parseInt(window.sessionStorage.getItem("expires_in")); //登录缓存后的时间戳
   let dqtime = new Date().getTime(); // 当前时间的时间戳
-  let expires_in = parseInt(window.localStorage.getItem("expires_in"))
-  //console.log("dqtime / expires_in",dqtime,expires_in)
+  let expires_in = parseInt(window.sessionStorage.getItem("expires_in"))
+
+  console.log("dqtime / expires_in",dqtime,expires_in)
+  if(!expires_in){
+    router.push({ path: "/Login" });
+    return;
+  }  
+
   if (dqtime > expires_in) {
     console.log("刷新 token dqtime / expires_in",dqtime,expires_in);
     //少于300秒 重新拉取
@@ -18,7 +25,7 @@ export const yztoken = async () => {
         {
           client_id: "Peis_App",
           grant_type: "refresh_token",
-          refresh_token: window.localStorage.getItem("refresh_token"),
+          refresh_token: window.sessionStorage.getItem("refresh_token"),
         },
         {
           headers: {
@@ -29,18 +36,18 @@ export const yztoken = async () => {
       .then((res) => {
         //console.log('connect/token',res.data)
         writetoken(res.data.expires_in);
-        window.localStorage.setItem("token", res.data.access_token);
-        window.localStorage.setItem("refresh_token", res.data.refresh_token);
+        window.sessionStorage.setItem("token", res.data.access_token);
+        window.sessionStorage.setItem("refresh_token", res.data.refresh_token);
 
-        //console.log('new token：',localStorage.getItem("token"))
-        //console.log('new expires_in',localStorage.getItem("expires_in"))
+        //console.log('new token：',window.sessionStorage.getItem("token"))
+        //console.log('new expires_in',window.sessionStorage.getItem("expires_in"))
 
       })
       .catch((err) =>{
         console.log(mm.apiurl + "/connect/token",{
           client_id: "Peis_App",
           grant_type: "refresh_token",
-          refresh_token: window.localStorage.getItem("refresh_token"),
+          refresh_token: window.sessionStorage.getItem("refresh_token"),
         },err)
       });
   }
@@ -52,5 +59,5 @@ export const writetoken = (addtime) => {
   // date.add(addtime, "s");
   // let lasttime = parseInt(new Date(date).getTime() / 1000);
   // console.log(lasttime);
-  window.localStorage.setItem("expires_in", lasttime); //写入  失效的时间戳
+  window.sessionStorage.setItem("expires_in", lasttime); //写入  失效的时间戳
 };
diff --git a/src/views/Home.vue b/src/views/Home.vue
index f8c9daa..3a3e336 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -794,10 +794,18 @@ export default {
     ...mapState(["changepassword", "router"]),
   },
   created() {
+    let expires_in = parseInt(window.sessionStorage.getItem("expires_in"))
+    //console.log("dqtime / expires_in",dqtime,expires_in)
+    if(!expires_in){
+      router.push({ path: "/Login" });
+      return;
+    }
+
     this.password = this.changepassword;
-    console.log(this.password);
-    console.log(this.$store.state.changepassword, "ssssssssssss");
-    this.user = localStorage.getItem("user");
+    // console.log(this.password);
+    // console.log(this.$store.state.changepassword, "ssssssssssss");
+    this.user = window.sessionStorage.getItem("user");
+
   },
   methods: {
     handleCommand(command) {
@@ -832,10 +840,10 @@ export default {
     },
     //退出登录
     logout() {
-      // localStorage.removeItem("tokentype");
-      // localStorage.removeItem("token");
-      // localStorage.removeItem(['expires_in','tokentype','refresh_token','user','token'])
-      localStorage.clear();
+      // window.sessionStorage.removeItem("tokentype");
+      // window.sessionStorage.removeItem("token");
+      // window.sessionStorage.removeItem(['expires_in','tokentype','refresh_token','user','token'])
+      window.sessionStorage.clear();
       this.$router.push({ path: "/login" });
     },
     aa(aa) {
diff --git a/src/views/charge/charge.vue b/src/views/charge/charge.vue
index 1c5dd59..0d53c0b 100644
--- a/src/views/charge/charge.vue
+++ b/src/views/charge/charge.vue
@@ -918,8 +918,8 @@ export default {
         return       
       }
 
-      let token = localStorage.getItem('token');
-      let user = localStorage.getItem('user');
+      let token = window.sessionStorage.getItem('token');
+      let user = window.sessionStorage.getItem('user');
       let toOutShell = {
         ReportCode, token,
         preViewCanPrint: 'Y',
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index 9a7e34a..bf6b7ca 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -74,20 +74,19 @@ export default {
             passWord: this.form.Password,
           })
             .then((res) => {
+              console.log(`/api/identity/users/login`,res)
               msgs = res.data.msg;
-              if (res.data.code == 1) {
+              if (res.code != -1) {
                 window.sessionStorage.setItem("peisid", res.data.peisid); //设置当前人员所属体检中心
                 writetoken(res.data.expires_in);
-                window.localStorage.setItem("token", res.data.access_token);
-                window.localStorage.setItem(
-                  "refresh_token",
-                  res.data.refresh_token
-                );
-                window.localStorage.setItem("tokentype", res.data.token_type);
-                window.localStorage.setItem("user", this.form.Username);
+                window.sessionStorage.setItem("token", res.data.access_token);
+                window.sessionStorage.setItem("refresh_token",res.data.refresh_token);
+                window.sessionStorage.setItem("tokentype", res.data.token_type);
+                window.sessionStorage.setItem("user", this.form.Username);
 
-                this.$router.push({ path: "home" });
+                this.$router.push({ path: "/home" });
                 this.$store.state.changepassword = this.form.Password;
+
               } else {
                 this.$message.warning(res.data.msg);
               }
diff --git a/src/views/user-list/OrganizationUnits.vue b/src/views/user-list/OrganizationUnits.vue
index 750439c..ca2198b 100644
--- a/src/views/user-list/OrganizationUnits.vue
+++ b/src/views/user-list/OrganizationUnits.vue
@@ -220,7 +220,7 @@ export default {
     cascaderchang(v) {
       console.log(this.departmentname);
       this.departmentnames = v[v.length - 1];
-      // localStorage.setItem("departmentname", v[v.length - 1]);
+      // window.sessionStorage.setItem("departmentname", v[v.length - 1]);
       // console.log(v[v.length-1]);
       // v.forEach((item) => {
       //   this.departmentname = item;
@@ -310,7 +310,7 @@ export default {
     },
     check(data) {
       console.log(data);
-      localStorage.setItem("dataidkes", data.id);
+      window.sessionStorage.setItem("dataidkes", data.id);
       //  this.$refs.tree.getCheckedKeys()
     },
     getonorganization() {
@@ -432,7 +432,7 @@ export default {
       // this.departmentname = a;
       console.log(a);
       console.log(this.departmentname);
-      // this.departmentname = localStorage.getItem("departmentname");
+      // this.departmentname = window.sessionStorage.getItem("departmentname");
       console.log(data, "data");
       this.dialogVisible = true;
       this.title = 2;
diff --git a/src/views/user-list/UserList.vue b/src/views/user-list/UserList.vue
index d89c5da..d19a10c 100644
--- a/src/views/user-list/UserList.vue
+++ b/src/views/user-list/UserList.vue
@@ -652,7 +652,7 @@ export default {
     console.log(this.password);
     this.btnQuery();
     this.gettreedata();
-    this.idkes = localStorage.getItem("dataidkes");
+    this.idkes = window.sessionStorage.getItem("dataidkes");
   },
 
   methods: {