更新

src/api/modules/division.js

@@ -1,4 +1,4 @@
-import { httpApi } from '../../request/httpApi'
+import { httpApi } from '../request/httpApi'
 
 export default {
 

src/api/modules/user.js

@@ -1,97 +1,12 @@
 import { httpApi } from '../request/httpApi'
-import website from '~src/config/index'
-import md5 from 'js-md5'
 
-export const userLogin = ({ tenantId, deptId, roleId, username, password, type, key, code }, msg = true) => httpApi({
-    url: '/api/blade-auth/oauth/token',
-    method: 'post',
-    headers: {
-        'Tenant-Id': tenantId,
-        'Dept-Id': (website.switchMode ? deptId : ''),
-        'Role-Id': (website.switchMode ? roleId : ''),
-        'Captcha-Key': key,
-        'Captcha-Code': code,
+export default {
+    //登录
+    async login(form) {
+        return httpApi({
+            url: '/api/login',
+            method: 'post',
+            data: form,
+        }, false)
     },
-    params: {
-        tenantId,
-        username,
-        password: md5(password),
-        grant_type: (website.captchaMode ? 'captcha' : 'password'),
-        scope: 'all',
-        type,
-    },
-}, msg)
-
-export const refreshToken = (refresh_token, tenantId, deptId, roleId, msg = true) => httpApi({
-    url: '/api/blade-auth/oauth/token',
-    method: 'post',
-    headers: {
-        'Tenant-Id': tenantId,
-        'Dept-Id': (website.switchMode ? deptId : ''),
-        'Role-Id': (website.switchMode ? roleId : ''),
-    },
-    params: {
-        tenantId,
-        refresh_token,
-        grant_type: 'refresh_token',
-        scope: 'all',
-    },
-}, msg)
-
-export const logout = (msg = true) => httpApi({
-    url: '/api/blade-auth/oauth/logout',
-    method: 'get',
-}, msg)
-
-export const registerGuest = (form, oauthId, msg = true) => httpApi({
-    url: '/api/blade-user/register-guest',
-    method: 'post',
-    params: {
-        tenantId: form.tenantId,
-        name: form.name,
-        account: form.account,
-        password: form.password,
-        oauthId,
-    },
-}, msg)
-
-export const getProjectAndContract = (msg = true) => httpApi({
-    url: '/api/blade-business/userViewProjectContract/queryUserViewProjectAndContract',
-    method: 'get',
-}, msg)
-
-export const getCaptcha = (msg = true) => httpApi({
-    url: '/api/blade-auth/oauth/captcha',
-    method: 'get',
-}, msg)
-
-export const getUserInfo = (msg = true) => httpApi({
-    url: '/api/blade-auth/oauth/user-info',
-    method: 'get',
-}, msg)
-
-export const sendLogs = (list, msg = true) => httpApi({
-    url: '/api/blade-auth/oauth/logout',
-    method: 'post',
-    data: list,
-}, msg)
-
-export const clearCache = (msg = true) => httpApi({
-    url: '/api/blade-auth/oauth/clear-cache',
-    method: 'get',
-}, msg)
-
-export const loginByToken = (form, msg = true) => httpApi({
-    url: '/api/blade-user/loginByToken',
-    method: 'post',
-    params: form,
-}, msg)
-
-//获取租户ID
-export const getTenantID = (domain, msg = true) => httpApi({
-    url: '/api/blade-system/tenant/info',
-    method: 'get',
-    params: {
-        domain,
-    },
-}, msg)
+}

src/api/request/header.js

@@ -1,10 +1,8 @@
-import { Base64 } from 'js-base64'
 import website from '~src/config'
 import { getToken } from '~src/api/util/auth'
 
 export function getTokenHeader(text = false) {
     let headers = {}
-    headers['Authorization'] = `Basic ${Base64.encode(`${website.clientId}:${website.clientSecret}`)}`
     //让每个请求携带token
     const token = getToken()
     if (token) headers[website.tokenHeader] = 'bearer ' + token

src/api/request/index.js

@@ -1,9 +1,7 @@
 import axios from 'axios'
-import { Base64 } from 'js-base64'
-import website from '~src/config'
 import router from '~src/router/index'
 import { getToken } from '~src/api/util/auth'
-import { getObjValue, toSerialize } from 'js-fast-way'
+import { toSerialize } from 'js-fast-way'
 
 //默认超时时间
 axios.defaults.timeout = 0
@@ -18,11 +16,10 @@ axios.defaults.withCredentials = true
 axios.interceptors.request.use(config => {
     const meta = (config['meta'] || {})
     const isToken = meta['isToken'] === false
-    config.headers['Authorization'] = `Basic ${Base64.encode(`${website.clientId}:${website.clientSecret}`)}`
     //让每个请求携带token
     const token = getToken()
     if (token && !isToken) {
-        config.headers[website.tokenHeader] = 'bearer ' + token
+        config.headers['Blade-Auth'] = 'bearer ' + token
     }
     //headers中配置text请求
     if (config['text'] === true) {

src/config/index.js

@@ -3,16 +3,9 @@ import config from './index.json'
 //主要配置
 export default {
     title: '数据可视化展示平台',
-    key: 'client', // 配置主键,目前用于存储
-    clientId: 'client', // 客户端id
-    clientSecret: 'client_secret', // 客户端密钥
-    tenantMode: true, // 是否开启租户模式
-    tenantId: '000000', // 管理组租户编号
-    captchaMode: false, // 是否开启验证码模式
-    switchMode: false, // 是否开启部门切换模式
+    key: 'data_visual',
     tokenTime: 1740,
-    tokenHeader: 'Blade-Auth',
-    tokenKey: 'client-access-token',
-    refreshTokenKey: 'client-refresh-token',
+    tokenKey: 'data-access-token',
+    refreshTokenKey: 'data-refresh-token',
     ...config,
 }

src/config/index.json

@@ -1,6 +1,6 @@
 {
     "version": "20230607160059",
-    "target": "http://47.110.251.215:8090",
+    "target": "http://192.168.0.107:9999",
     "smsPhone": "",
     "vite": {
         "port": 5174,

src/views/login/index.vue

@@ -39,6 +39,7 @@
 <script setup>
 import { ref } from 'vue'
 import { useRouter } from 'vue-router'
+import mainApi from '~api/user'
 const router = useRouter()
 
 //图片资源
@@ -55,10 +56,19 @@ const formModel = ref({
 })
 
 //登录页
-const loginClick = () => {
-    router.push({
-        name: 'home-index',
-    })
+const loginClick = async () => {
+    const { username, password } = formModel.value
+    if (!username) {
+        window.$message.warning('请输入账号')
+    } else if (!password) {
+        window.$message.warning('请输入密码')
+    } else {
+        const { data } = await mainApi.login(formModel.value)
+        console.log(data)
+        /*router.push({
+            name: 'home-index',
+        })*/
+    }
 }
 </script>