去除token，混淆问题

.env.development

@@ -11,10 +11,10 @@ VITE_GLOB_PUBLIC_PATH = /
 # VITE_PROXY = [["/api","http://192.168.2.225/api"]]
 
 # 线上演示环境
-VITE_PROXY = [["/api","http://117.174.10.73:19200"],["/agent","http://117.174.10.73:31895"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"],["/xldAnalysisApi","http://192.168.119.47:2214/xldanalyst"]]
+# VITE_PROXY = [["/api","http://117.174.10.73:19200"],["/agent","http://117.174.10.73:31895"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"],["/xldAnalysisApi","http://192.168.119.47:2214/xldanalyst"]]
 # VITE_PROXY = [["/api","http://192.168.49.163:20043"],["/agent","http://192.168.49.163:20043"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
 # VITE_PROXY = [["/api","http://127.0.0.1:20043"],["/agent","http://127.0.0.1:20043"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
-# VITE_PROXY = [["/api","http://192.168.49.163:20043"],["/agent","http://192.168.49.163:20043"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
+VITE_PROXY = [["/api","http://192.168.49.163:20043"],["/agent","http://192.168.49.163:20043"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
 # VITE_PROXY = [["/api","http://127.0.0.1:8008"],["/agent","http://127.0.0.1:8008"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
 # VITE_PROXY = [["/api","http://127.0.0.1:8008"],["/agent","http://127.0.0.1:8008"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
 # VITE_PROXY = [["/api","http://192.168.119.143:9200"],["/agent","http://192.168.119.143:31895"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"]]                                                            

src/api/resource/plat.ts

@@ -29,7 +29,7 @@ export function list() {
     const formData = new FormData();
     formData.append("interfaceName", "antu.space.provider.sservicebase.ServiceBaseMetaDataViewProvider");
     formData.append("methodName", "getResourcePagedList");
-    formData.append("args[]", session.getItem('token'));
+    formData.append("args[]", session.getItem('tokenSpace'));
     formData.append("args[]", '{ "type": "MR", "fields": { "DATA": ["serviceid", "servicename", "servicetype", "servicealiasname"], "METADATA": ["publisher ", "publishdate"] }, "pageIndex": 1, "pageSize": 4 }');
     return new Promise<void>((resolve, reject) => {
         defHttp.post({ url: Api.CallProvider, params: formData, ...interfaceType })

src/api/sys/dirManager.ts

@@ -29,7 +29,7 @@ export const getTreeList = (params: any) => {
  */
 export const getTreeRootId = (params: any) => {
     return new Promise<void>((resolve) => {//sjl,之前是， joinParamsToUrl: true
-        defHttp.post({ ...locationType, url: Api.FindRoot, params: params }, { joinParamsToUrl: false }).then((res) => {
+        defHttp.post({ ...locationType, url: Api.FindRoot, params: params }, { joinParamsToUrl: true }).then((res) => {
             resolve(res)
         })
     })

src/api/sys/user.ts

@@ -66,7 +66,7 @@ export function loginApi(params: LoginParams, mode: ErrorMessageMode = 'modal')
       .then((r) => {
         r.refreshToken = r.refresh_token;
         r.token = r.access_token;
-        session.setItem('token', r.access_token);
+        session.setItem('tokenSpace', r.access_token);
         resolve(r);
         allSys();
         // loginCallProvider();
@@ -95,13 +95,15 @@ export function loginCallProvider() {
 
 
 export function getMyInfo() {
-  var a = session.getItem('loginFrom');
+  var a1 = session.getItem('loginFrom');
   const formData = new URLSearchParams();
   formData.append('interfaceName', 'atp-provider.controller.AtpController');
   formData.append('methodName', 'misLogin');
   formData.append('args[]', 'space');
-  formData.append('args[]', a.username);
-  formData.append('args[]', md5(a.password));
+  // formData.append('args[]', a.username);
+  // formData.append('args[]', md5(a.password));
+  formData.append('args[]', a1.username.toUpperCase());//地灾使用这个
+  formData.append('args[]', md5('Tofly@028'));//地灾使用这个
   formData.append('args[]', '');
   return new Promise<void>((resolve, reject) => {
     defHttp.post<UserInfoModel>({
@@ -113,6 +115,13 @@ export function getMyInfo() {
         var u = JSON.parse(i.result);
         console.log(u);
 
+        if (!u.EMPLOYEE) {
+          u.EMPLOYEE = {};
+          // u.EMPLOYEE_MIS.EMPLOYEE_ID = a1.username;
+          u.EMPLOYEE.NAME = a1.username;
+          u.EMPLOYEE.LOGIN_NAME = a1.username;
+        }
+
         //插入登录日志记录
         let addRecordParam = {
           systemLog: {

src/components/Application/src/AppLogo.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="anticon" :class="getAppLogoClass" @click="goHome" style="margin-right: 184px;width: 260px !important;">
     <!-- <img v-if="getLogo" :src="getLogo" /> -->
-    <!-- 地灾 -->
-    <img src="/src/assets/images/logo.png"
-      style="width: 52px;height: 30px;filter: brightness(0) invert(1) grayscale(1);" />
+    <!-- 地灾去掉下面的图片 -->
+    <!-- <img src="/src/assets/images/logo.png"
+      style="width: 52px;height: 30px;filter: brightness(0) invert(1) grayscale(1);" /> -->
     <div class="headerName ml-2 truncate md:opacity-100" :class="getTitleClass" v-show="showTitle">
       <!-- {{ getTitle }} -->
       空间数据管理平台

src/enums/cacheEnum.ts

@@ -1,7 +1,7 @@
 // token key
 export const TOKEN_KEY = 'TOKEN__';
 
-export const JWT_TOKEN_KEY = 'JWT_TOKEN';
+export const JWT_TOKEN_KEY = 'JWT_TOKEN_SPACE';
 
 export const REFRESH_TOKEN_KEY = 'REFRESH_TOKEN';
 

src/layouts/default/header/components/user-dropdown/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dropdown placement="bottomLeft" :overlayClassName="`${prefixCls}-dropdown-overlay`" @click="handleMenuClick">
+  <Dropdown placement="bottomLeft" :overlayClassName="`${prefixCls}-dropdown-overlay`" @click="handleMenuClick2">
     <span :class="[prefixCls, `${prefixCls}--${theme}`]" class="flex">
       <!-- <img :class="`${prefixCls}__header`" :src="getUserInfo.avatar" />  sjl-->
       <img :src="userImg" alt="" srcset="" style="width: 26px;height: 26px;">
@@ -11,11 +11,11 @@
     </span>
 
     <!-- 地灾才使用 -->
-    <!-- <template #overlay>
+    <template #overlay>
       <Menu @click="handleMenuClick2">
         <MenuItem key="personal" text="返回门户" icon="ion:document-text-outline" />
       </Menu>
-    </template> -->
+    </template>
 
     <!-- <template #overlay>
       <Menu @click="handleMenuClick">
@@ -144,7 +144,7 @@ export default defineComponent({
       switch (e.key) {
         case 'personal':
           var t = sessionStorage.getItem('adminToken');
-          if (t) sessionStorage.setItem('token', t);
+          if (t) sessionStorage.setItem('tokenSpace', t);
           window.location.href = '/admin/index.html#/lifeline/bigscreen/systemNavigation'
           break;
       }

src/router/guard/permissionGuard.ts

@@ -8,6 +8,7 @@ import { getMenuList } from '/@/api/sys/menu';
 import { USER_INFO_KEY } from '/@/enums/cacheEnum';
 import { getAuthCache } from '/@/utils/auth';
 import { session } from '/@/utils/Memory';
+import md5 from 'js-md5';
 
 const LOGIN_PATH = PageEnum.BASE_LOGIN;
 const DEVICE_LIST = PageEnum.DEVICE_LIST;
@@ -18,25 +19,15 @@ export async function createPermissionGuard(router: Router) {
   const userStore = useUserStoreWithOut();
   const permissionStore = usePermissionStoreWithOut();
   const userStore2 = useUserStore();
-  var token = session.getItem('token')
+  var token = session.getItem('tokenSpace')
   var tokenV2 = session.getItem('tokenV2')
   if ((location.href.indexOf('refreshToken') > -1) && (!token || !tokenV2)) {
     var o = session.getItem('loginParams');
-
-    await userStore2.login({
-      // password: 'Tofly@028',
-      // username: 'ADMIN2',
-      password: o.password,
-      username: o.username,
-      mode: 'modal', //不要默认的错误提示
-    }).catch((data) => {
-      console.log("自动登录:", data);
-    });
+    await userStore2.login({ password: 'Tofly@028', username: o.username.toUpperCase(), mode: 'modal' })//地灾使用这个
     //修改地址栏链接
     window.history.pushState('', '', location.href.split('?')[0]);
   }
 
-
   router.beforeEach(async (to, from, next) => {
     const userInfo = await getAuthCache(USER_INFO_KEY);
     if (

src/store/modules/user.ts

@@ -139,6 +139,8 @@ export const useUserStore = defineStore({
       try {
         const { goHome = true, mode, ...loginParams } = params;
         const data = await loginApi(loginParams, mode);
+        // data.token = data.refresh_token;
+        // data.refreshToken = data.refresh_token;
         if (data.token) {
           return this.process(data, goHome);
         } else {

src/views/app/index.vue

@@ -19,7 +19,7 @@ export default defineComponent({
         onMounted(() => iframe())
         function iframe() {
             if (!mic.show) {
-                var token = sessionStorage.getItem('token');
+                var token = sessionStorage.getItem('tokenSpace');
                 var login = session.getItem("loginFrom")
                 if (token && login) {
                     token = token.replace(/['"]/g, '');

src/views/interface/item/child/ActionMock.vue

@@ -248,7 +248,7 @@ export default defineComponent({
         //打开获取token弹窗
         const openGetToken = () => {
             visible.value = true
-            accessToken.value = session.getItem('token')
+            accessToken.value = session.getItem('tokenSpace')
         }
         // 获取token提交
         // const getTokenSubmit = () => {

src/views/interface/item/child/applyModal/ApplyModal.vue

@@ -41,7 +41,7 @@ export default defineComponent({
       ids = data.sqzys;
       console.log("ids:", ids);
     });
-    
+
     //得到页面标题
     const getTitle = "提交申请";
     //提交按钮

src/views/twoThree/index.vue

@@ -19,7 +19,7 @@ export default defineComponent({
         onMounted(() => iframe())
         function iframe() {
             if (!mic.show) {
-                var token = sessionStorage.getItem('token');
+                var token = sessionStorage.getItem('tokenSpace');
                 var login = session.getItem("loginFrom")
                 if (token && login) {
                     token = token.replace(/['"]/g, '');