合并

src/api/login.ts

@@ -1,96 +1,96 @@
 import request from '@/benyun/utils/request'
 
 // 登录方法
-export function login(username:string, password:string, code:string, uuid:string) {
-  return request({
-    url: '/auth/login',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    data: { username, password, code, uuid }
-  })
+export function login(username : string, password : string, code : string, uuid : string, tenantId : any) {
+	return request({
+		url: '/auth/login',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data: { username, password, code, uuid, tenantId }
+	})
 }
 
 // 注册方法
-export function register(data:any) {
-  return request({
-    url: '/auth/register',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    data: data
-  })
+export function register(data : any) {
+	return request({
+		url: '/auth/register',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data: data
+	})
 }
 
 // 刷新方法
 export function refreshToken() {
-  return request({
-    url: '/auth/refresh',
-    method: 'post'
-  })
+	return request({
+		url: '/auth/refresh',
+		method: 'post'
+	})
 }
 
 // 获取用户详细信息
 export function getInfo() {
-  return request({
-    url: '/system/user/getInfo',
-    method: 'get'
-  })
+	return request({
+		url: '/system/user/getInfo',
+		method: 'get'
+	})
 }
 
 // 退出方法
 export function logout() {
-  return request({
-    url: '/auth/logout',
-    method: 'delete'
-  })
+	return request({
+		url: '/auth/logout',
+		method: 'delete'
+	})
 }
 
 // 获取验证码
 export function getCodeImg() {
-  return request({
-    url: '/code',
-    headers: {
-      isToken: false
-    },
-    method: 'get',
-    timeout: 20000
-  })
+	return request({
+		url: '/code',
+		headers: {
+			isToken: false
+		},
+		method: 'get',
+		timeout: 20000
+	})
 }
 
 // 发起登录获取TGT和code
-export function ssoLogin(username:any, password:string, code:string, uuid:string, redirectUri:string, appId:string) {
-  return request({
-    url: '/sso/ssoLogin',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    data: { username, password, code, uuid, redirectUri, appId }
-  })
+export function ssoLogin(username : any, password : string, code : string, uuid : string, redirectUri : string, appId : string) {
+	return request({
+		url: '/sso/ssoLogin',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data: { username, password, code, uuid, redirectUri, appId }
+	})
 }
 
 // 如果已经登录会返回cdoe
-export function checkSsoLogin(redirectUri:string, appId:string) {
-  let data = { 'redirectUri': redirectUri, 'appId': appId }
-  return request({
-    url: '/sso/loginCheck',
-    method: 'get',
-    params: data,
-    headers: {
-      isToken: false
-    }
-  })
+export function checkSsoLogin(redirectUri : string, appId : string) {
+	let data = { 'redirectUri': redirectUri, 'appId': appId }
+	return request({
+		url: '/sso/loginCheck',
+		method: 'get',
+		params: data,
+		headers: {
+			isToken: false
+		}
+	})
 }
 // 退出
 export function ssoLogout() {
-  return request({
-    url: '/sso/ssoLogout',
-    method: 'get',
-    headers: {
-      isToken: false
-    }
-  })
-}
+	return request({
+		url: '/sso/ssoLogout',
+		method: 'get',
+		headers: {
+			isToken: false
+		}
+	})
+}

src/views/login.vue

@@ -76,7 +76,7 @@ export default {
         password: "admin123",
         rememberMe: false,
         code: "",
-        uuid: ""
+        uuid: "",
       },
       loginRules: {
         username: [
@@ -144,6 +144,7 @@ export default {
     },
     handleLogin() {
       this.$refs.loginForm.validate(valid => {
+				console.log('valid',valid);
         if (valid) {
           this.loading = true;
           if (this.loginForm.rememberMe) {

vue.config.js

@@ -34,7 +34,7 @@ module.exports = defineConfig({
         ws:false,
         // target: `http://192.168.1.79:9207`,
         target: `http://192.168.2.202:8080`,
-        // target: `http://192.168.2.202/prod-api/maindata`,
+        // target: `http://192.168.1.86:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''