ソースを参照

接口标头添加userid和username

ymy 1 年間 前
コミット
98adebe325
3 ファイル変更22 行追加2 行削除
  1. 1 1
      src/api/menu.ts
  2. 6 0
      src/benyun/utils/request.ts
  3. 15 1
      src/views/login.vue

+ 1 - 1
src/api/menu.ts

@@ -6,6 +6,6 @@ export const getRouters = () => {
 		url: '/system/menu/getRouters',
 		method: 'get',
 		// params: { tenantId: store.getters.userInfo.tenantId }
-		params: { tenantId: '000000' }
+		params: { tenantId: store.getters.userInfo && store.getters.userInfo.tenantId }
 	})
 }

+ 6 - 0
src/benyun/utils/request.ts

@@ -32,6 +32,12 @@ service.interceptors.request.use((config:any) => {
   if(user.tenantId){
     config.headers['tenantId'] = user.tenantId
   }
+  if(user.userId){
+    config.headers['user_id'] = user.userId
+  }
+  if(user.userName){
+    config.headers['username'] = user.userName
+  }
   if (getToken() && !isToken) {
     config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
   }

+ 15 - 1
src/views/login.vue

@@ -37,6 +37,11 @@
           <img :src="codeUrl" @click="getCode" class="login-code-img"/>
         </div>
       </el-form-item>
+      <!-- <el-form-item prop="tenantId">
+        <el-select v-model="loginForm.tenantId" placeholder="租户id" style="width: 63%">
+          <el-option v-for="item in tenantIdOptions" :key="item.value" :label="item.label" :value="item.value" :disabled="item.disabled"></el-option>
+        </el-select>
+      </el-form-item> -->
       <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
       <el-form-item style="width:100%;">
         <el-button
@@ -70,11 +75,19 @@ export default {
   name: "Login",
   data() {
     return {
+      tenantIdOptions:[{
+        value:'000000',
+        label:'000000'
+      },{
+        value:'000001',
+        label:'000001'
+      }],
       codeUrl: "",
       loginForm: {
         username: "admin",
         password: "admin123",
         rememberMe: false,
+        // tenantId:'',
         code: "",
         uuid: "",
       },
@@ -85,7 +98,8 @@ export default {
         password: [
           { required: true, trigger: "blur", message: "请输入您的密码" }
         ],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+        code: [{ required: true, trigger: "change", message: "请输入验证码" }],
+        // tenantId:[{ required: true, trigger: "change", message: "请选择租户id" }]
       },
       loading: false,
       // 验证码开关