只针对之江做token验证

src/app.tsx

@@ -1,7 +1,8 @@
 import { PageLoading } from '@ant-design/pro-layout';
 import { history, useModel } from 'umi';
 import { checkToken, reFreshCheckToken } from '@/services/ant-design-pro/environment';
-import userData from '@/config/user';
+import { projectId } from '@/config/api.js';
+import UserStorage from '@/config/user';
 const loginPath = '/noAuth';
 
 /** 获取用户信息比较慢的时候会展示一个 loading */
@@ -44,12 +45,14 @@ export async function getInitialState(): Promise<{
       //if (!access_token) return; //随后去掉
       //验证acces_token 获取用户数据
       const res = await checkToken({ token: access_token });
+
       var resUser = res.data;
     } catch (err) {
       history.push(loginPath);
     }
     if (resUser) {
-      var userObj = userData.getInstance();
+      //获取用户信息 并储存
+      var userObj = UserStorage.getInstance();
       userObj.setUser(resUser);
       return resUser;
     } else {
@@ -58,7 +61,19 @@ export async function getInitialState(): Promise<{
     }
   };
 
-  const currentUser = await fetchUser();
+  let currentUser = {};
+  //之江项目 验证token
+  if (projectId == 'Pj3301100002') {
+    currentUser = await fetchUser();
+  } else {
+    let tempUser = {
+      name: '行政测试',
+      phone: '17611228068',
+      id: '9a1ecfbacb6b4f249bf2dd3ec7793ead',
+    };
+    var userObj = UserStorage.getInstance();
+    userObj.setUser(tempUser);
+  }
 
   const reFreshUser = async () => {
     refresh_token = localStorage.getItem('refresh_token');

src/config/user.ts

@@ -1,11 +1,11 @@
-class UserData {
-  private static instance: UserData;
+class UserStorage {
+  private static instance: UserStorage;
   private constructor() {}
-  private user: any = { name: '' };
+  private user: any = { name: '', id: '' };
 
   static getInstance() {
     if (!this.instance) {
-      this.instance = new UserData();
+      this.instance = new UserStorage();
     }
     return this.instance;
   }
@@ -16,4 +16,4 @@ class UserData {
     return this.user;
   }
 }
-export default UserData;
+export default UserStorage;

src/services/ant-design-pro/environment.ts

@@ -1,7 +1,7 @@
 /** 登录接口 POST /api/login/account */
 import { request } from 'umi';
 import { projectId } from '@/config/api';
-import userData from '@/config/user';
+import UserStorage from '@/config/user';
 
 export async function getMapList(body: any, options?: { [key: string]: any }) {
   return request<API.MapInfoRes>(
@@ -64,9 +64,17 @@ function getProjectId() {
 }
 
 function commonParams() {
-  var userObj = userData.getInstance();
+  var userObj = UserStorage.getInstance();
   const user = userObj.getUser();
-  return `openid=${user.id}&pubname=sgadmin&projectId=${getProjectId()}&userId=${user.id}`;
+  var pubname = '';
+  if (getProjectId() == 'Pj3301100002') {
+    pubname = 'sgadmin';
+  } else {
+    pubname = 'sagacareAndtenantslink';
+  }
+  return `openid=${user.id}&pubname=${pubname}&projectId=${getProjectId()}&userId=${
+    user.id
+  }&userName=${user.name}`;
 }
 // chart
 export async function queryPropertyData(params: any, options?: { [key: string]: any }) {

src/services/ant-design-pro/equipment.js

@@ -1,6 +1,6 @@
 import { request } from 'umi';
 import { projectId } from '@/config/api.js';
-import userData from '@/config/user';
+import UserStorage from '@/config/user';
 
 function getProjectId() {
     //const id = window.localStorage.getItem('localProjectId')
@@ -9,11 +9,21 @@ function getProjectId() {
 }
 
 function commonParams() {
-    var userObj = userData.getInstance();
+    var userObj = UserStorage.getInstance();
      const user = userObj.getUser();
-    return `openid=${user.id}&pubname=sgadmin&projectId=${getProjectId()}&userId=${user.id}`;
+     var pubname='';
+     if(getProjectId()=='Pj3301100002'){
+        pubname='sgadmin'
+     }else{
+        pubname='sagacareAndtenantslink'
+     }
+    return `openid=${user.id}&pubname=${pubname}&projectId=${getProjectId()}&userId=${user.id}&userName=${user.name}`;
 }
 
+// function commonParams() {
+//     return `openid=9a1ecfbacb6b4f249bf2dd3ec7793ead&pubname=sagacareAndtenantslink&projectId=${getProjectId()}&userName=%E5%AE%89%E5%B0%8F%E9%9C%9E&userPhone=17611228068&userId=9a1ecfbacb6b4f249bf2dd3ec7793ead`;
+// }
+
 
 //窗帘  设置设备
 //窗帘  设置设备
@@ -70,7 +80,7 @@ export const setallLampHttp = (params) => {
     });
 };
 
-// 开关失败时 定时查询灯状态
+// 开关失败时 定时查询灯状态 
 export const getStatusHttp = (params) => {
     return request(`/sgadmin/duoduo-service/duoduoenv-service/light/onoff/setSatus?${commonParams()}`, {
         method: 'POST',