更新

.env.development

@@ -11,7 +11,7 @@ VUE_APP_MODE = 'development'
 # http://1.14.244.91:182/
 
 # VUE_APP_BASE_API = 'http://192.168.3.86:83/op/base'
-VUE_APP_BASE_API = 'http://xnpt.citupro.com/op/base'
+VUE_APP_BASE_API = 'http://192.168.3.143:5500'
 # VUE_APP_BASE_API = 'http://192.168.3.180/op/base'
 
 

.env.production

@@ -5,7 +5,7 @@ NODE_ENV = 'production'
 VUE_APP_MODE = 'production'
 # base api
 
-VUE_APP_BASE_API = 'http://192.168.3.143'
+VUE_APP_BASE_API = 'http://192.168.3.143:5500'
 
 
 #预览api地址

public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": 1741945443886
+  "version": 1742369418606
 }

src/api/dataGovernance.js

@@ -1,144 +1,41 @@
 
-import _http from '@/utils/request'
+import http from '@/utils/request'
 // import axios from 'axios'
 
 // 获取ddl 旧版
 export function getDDL (params) {
-  return _http.post('/dataFactory/data/meta/data/combination/ddl', params)
+  return http.post('/dataFactory/data/meta/data/combination/ddl', params)
 }
-// 是否是本地配置
-// const isLocal = process.env.NODE_ENV !== 'production'
-// const root = 'http://192.168.3.175'
-// const root = 'http://xnpt.citupro.com/op/base'
-// const localHttp = {
-//   post: (url, param) => {
-//     return new Promise((resolve, reject) => {
-//       axios.post(`${root}${url}`, param, {
-//         headers: {
-//           'Content-Type': 'application/json',
-//           Accept: 'application/json'
-//         }
-//       })
-//         .then(({ data }) => {
-//           const res = data
-//           if (res.code !== 20000) {
-//             return reject(res.msg?.error || res.msg)
-//           }
-//           resolve(res)
-//         })
-//         .catch(err => {
-//           reject(err)
-//         })
-//     })
-//   },
-//   get: (url, params) => {
-//     return new Promise((resolve, reject) => {
-//       axios.get(`${root}${url}`, { params }, {})
-//         .then(({ data }) => {
-//           const res = data
-//           if (res.code !== 20000) {
-//             return reject(res.msg?.error || res.msg)
-//           }
-//           resolve(res)
-//         })
-//         .catch(err => {
-//           reject(err)
-//         })
-//     })
-//   },
-//   upload: (url, param) => {
-//     return new Promise((resolve, reject) => {
-//       axios.post(`${root}${url}`, param, {
-//         timeout: 600000,
-//         headers: {
-//           'Content-Type': 'multipart/form-data'
-//         }
-//       })
-//         .then(({ data }) => {
-//           const res = data
-//           if (res.code !== 20000) {
-//             return reject(res.msg?.error || res.msg)
-//           }
-//           resolve(res)
-//         })
-//         .catch(err => {
-//           reject(err)
-//         })
-//     })
-//   },
-//   formData (url, param) {
-//     return new Promise((resolve, reject) => {
-//       axios.post(`${root}${url}`, param, {
-//         timeout: 600000,
-//         headers: {
-//           'Content-Type': 'application/x-www-form-urlencoded'
-//         }
-//       })
-//         .then(({ data }) => {
-//           const res = data
-//           if (res.code !== 20000) {
-//             return reject(res.msg?.error || res.msg)
-//           }
-//           resolve(res)
-//         })
-//         .catch(err => {
-//           reject(err)
-//         })
-//     })
-//   },
-//   download: (url, param) => {
-//     return new Promise((resolve, reject) => {
-//       axios.post(`${root}${url}`, param, {
-//         timeout: 10000,
-//         headers: {
-//           'Content-Type': 'application/json'
-//         },
-//         responseType: 'blob'
-//       })
-//         .then((res) => {
-//           resolve({
-//             data: res.data,
-//             name: ''
-//           })
-//         })
-//         .catch(err => {
-//           reject(err)
-//         })
-//     })
-//   }
-// }
-
-// const _http = isLocal ? localHttp : http
 
 // 元数据相关
 const metadata = {
   // 新增元数据
   metadataAdd (params) {
-    return _http.post('/DataOps-platform/meta/node/add', params)
+    return http.post('/DataOps-platform/meta/node/add', params)
   },
   // 更新元数据
   metadataUpdate (params) {
-    return _http.post('/DataOps-platform/meta/node/update', params)
+    return http.post('/DataOps-platform/meta/node/update', params)
   },
   // 删除元数据
   deleteMetadata: (param) => {
-    return _http.post('/DataOps-platform/meta/node/delete', param)
+    return http.post('/DataOps-platform/meta/node/delete', param)
   },
   // 查看元数据
   getMetadataDetails: (param) => {
-    return _http.post('/DataOps-platform/meta/node/edit', param)
+    return http.post('/DataOps-platform/meta/node/edit', param)
   },
   // 元数据列表
   getMetaDataList: (param) => {
-    return _http.post('/DataOps-platform/meta/node/list', param)
+    return http.post('/DataOps-platform/meta/node/list', param)
   },
   // 元数据图谱
   getMetaDataGraph: (param) => {
-    return _http.post('/DataOps-platform/meta/node/graph', param)
+    return http.post('/DataOps-platform/meta/node/graph', param)
   },
   // 元数据图谱
   getMetaDataById: (param) => {
-    return _http.post('/DataOps-platform/id/data/search', param)
+    return http.post('/DataOps-platform/id/data/search', param)
   }
 }
 
@@ -146,66 +43,70 @@ const metadata = {
 const dataResource = {
   // 资源列表
   getResourceList: (param) => {
-    return _http.post('/DataOps-platform/meta/data/list', param)
+    return http.post('/DataOps-platform/meta/data/list', param)
   },
   getResourceDetails: (param) => {
-    return _http.post('/DataOps-platform/data/resource/detail', param)
+    return http.post('/DataOps-platform/data/resource/detail', param)
   },
   // 查看资源图谱
   getResourceListToGraph: (param) => {
-    return _http.post('/DataOps-platform/data/resource/list/graph', param)
+    return http.post('/DataOps-platform/data/resource/list/graph', param)
   },
   // 结构化资源列表
   getStructureResource: (param) => {
-    return _http.post('/DataOps-platform/id/structure/retrieval', param)
+    return http.post('/DataOps-platform/id/structure/retrieval', param)
   },
   // 非结构化资源列表
   getUnstructuredResource: (param) => {
-    return _http.post('/DataOps-platform/id/text/retrieval', param)
+    return http.post('/DataOps-platform/id/text/retrieval', param)
   },
   // 删除资源
   deleteSource: (param) => {
-    return _http.post('/DataOps-platform/data/resource/delete', param)
+    return http.post('/DataOps-platform/data/resource/delete', param)
   },
   // 大模型模型翻译元数据
   resourceTranslate: (param) => {
-    return _http.formData('/DataOps-platform/data/resource/translate', param)
+    return http.formData('/DataOps-platform/data/resource/translate', param)
+  },
+  // 保存数据资源
+  createResource: (param) => {
+    return http.post('/api/resource/create', param)
   },
   // 保存数据资源
-  saveResource: (param) => {
-    return _http.post('/DataOps-platform/data/resource/save', param)
+  updateResource: (param) => {
+    return http.put('/api/resource/update', param)
   },
   // 数据资源上传
   uploadResource: (param) => {
-    return _http.upload('/DataOps-platform/data/resource/upload', param)
+    return http.upload('/DataOps-platform/data/resource/upload', param)
   },
   // 获取数据资源文件流
   getResourceFile: (param) => {
-    return _http.download('/DataOps-platform/data/resource/display', param)
+    return http.download('/DataOps-platform/data/resource/display', param)
   },
   // 解析非结构化文本展示信息
   getUnstructured: (param) => {
-    return _http.post('/DataOps-platform/text/resource/translate', param)
+    return http.post('/DataOps-platform/text/resource/translate', param)
   },
   // 保存非结构化文本解析
   saveUnstructured: (param) => {
-    return _http.post('/DataOps-platform/text/resource/save', param)
+    return http.post('/DataOps-platform/text/resource/save', param)
   },
   // 获取资源血缘关系
   getResourceRelationList: (param) => {
-    return _http.post('/DataOps-platform/model/relatives/relation', param)
+    return http.post('/DataOps-platform/model/relatives/relation', param)
   },
   // 查看资源图谱
   getResourceGraph: (param) => {
-    return _http.post('/DataOps-platform/data/resource/graph/all', param)
+    return http.post('/DataOps-platform/data/resource/graph/all', param)
   },
   // 查看资源图谱
   resourceParseByDDL: (param) => {
-    return _http.upload('/DataOps-platform/sql/ddl/identify', param)
+    return http.upload('/DataOps-platform/sql/ddl/identify', param)
   },
   // 更新 ddl
   resourceUpdateByDDL: (param) => {
-    return _http.post('/DataOps-platform/data/resource/update', param)
+    return http.post('/DataOps-platform/data/resource/update', param)
   }
 }
 
@@ -213,43 +114,43 @@ const dataResource = {
 const dataModel = {
   // 血缘关系查看
   getModelRelation: (param) => {
-    return _http.post('/DataOps-platform/model/data/relation', param)
+    return http.post('/DataOps-platform/model/data/relation', param)
   },
   // 模型列表
   getModelList: (param) => {
-    return _http.post('/DataOps-platform/data/model/list', param)
+    return http.post('/DataOps-platform/data/model/list', param)
   },
   getModelDetails: (param) => {
-    return _http.post('/DataOps-platform/data/model/detail', param)
+    return http.post('/DataOps-platform/data/model/detail', param)
   },
   // 查看模型图谱
   getModelListToGraph: (param) => {
-    return _http.post('/DataOps-platform/data/model/list/graph', param)
+    return http.post('/DataOps-platform/data/model/list/graph', param)
   },
   // 保存模型
   saveModel: (param) => {
-    return _http.post('/DataOps-platform/model/data/search', param)
+    return http.post('/DataOps-platform/model/data/search', param)
   },
   // 删除模型
   deleteModel: (param) => {
-    return _http.post('/DataOps-platform/data/model/delete', param)
+    return http.post('/DataOps-platform/data/model/delete', param)
   },
   // 新增模型：模型选择模型
   addModelByModel: (param) => {
-    return _http.post('/DataOps-platform/model/data/model/add', param)
+    return http.post('/DataOps-platform/model/data/model/add', param)
   },
   // 查看模型图谱
   getModelGraph: (param) => {
-    return _http.post('/DataOps-platform/data/model/graph/all', param)
+    return http.post('/DataOps-platform/data/model/graph/all', param)
   },
   updateModel: (param) => {
-    return _http.post('/DataOps-platform/data/model/update', param)
+    return http.post('/DataOps-platform/data/model/update', param)
   },
   // addModelByDDL: (param) => {
-  //   return _http.post('/DataOps-platform/model/data/sql', param)
+  //   return http.post('/DataOps-platform/model/data/sql', param)
   // },
   saveModelByDDL: (param) => {
-    return _http.post('/DataOps-platform/data/model/save', param)
+    return http.post('/DataOps-platform/data/model/save', param)
   }
 }
 
@@ -257,23 +158,23 @@ const dataModel = {
 const dataLabel = {
   // 列表
   dataLabelList: (param) => {
-    return _http.post('/DataOps-platform/data/label/list', param)
+    return http.post('/DataOps-platform/data/label/list', param)
   },
   // 新增
   dataLabelAdd: (param) => {
-    return _http.post('/DataOps-platform/data/label/add', param)
+    return http.post('/DataOps-platform/data/label/add', param)
   },
   // 详情
   dataLabelDetails: (param) => {
-    return _http.post('/DataOps-platform/data/label/detail', param)
+    return http.post('/DataOps-platform/data/label/detail', param)
   },
   // 详情
   dataLabelGraph: (param) => {
-    return _http.post('/DataOps-platform/data/label/graph/all', param)
+    return http.post('/DataOps-platform/data/label/graph/all', param)
   },
   // 数据标签动态识别分组
   dataLabelIdentifyGroup: (param) => {
-    return _http.post('/DataOps-platform/data/label/dynamic/identify', param)
+    return http.post('/DataOps-platform/data/label/dynamic/identify', param)
   }
 }
 
@@ -281,23 +182,23 @@ const dataLabel = {
 const dataStandard = {
   // 标准列表
   dataStandardList: (param) => {
-    return _http.post('/DataOps-platform/data/standard/list', param)
+    return http.post('/DataOps-platform/data/standard/list', param)
   },
   // 新增
   dataStandardAdd: (param) => {
-    return _http.post('/DataOps-platform/data/standard/add', param)
+    return http.post('/DataOps-platform/data/standard/add', param)
   },
   // 详情
   dataStandardDetails: (param) => {
-    return _http.post('/DataOps-platform/data/standard/detail', param)
+    return http.post('/DataOps-platform/data/standard/detail', param)
   },
   // 生成操作代码
   dataStandardCodeGenerate: (param) => {
-    return _http.post('/DataOps-platform/data/standard/code', param)
+    return http.post('/DataOps-platform/data/standard/code', param)
   },
   // 生成操作代码
   dataStandardGraph: (param) => {
-    return _http.post('/DataOps-platform/data/standard/graph/all', param)
+    return http.post('/DataOps-platform/data/standard/graph/all', param)
   }
 }
 
@@ -305,35 +206,35 @@ const dataStandard = {
 const dataIndicator = {
   // 指标列表
   dataIndicatorList: (param) => {
-    return _http.post('/DataOps-platform/data/metric/list', param)
+    return http.post('/DataOps-platform/data/metric/list', param)
   },
   // 指标列表切换图谱
   dataIndicatorListToGraph: (param) => {
-    return _http.post('/DataOps-platform/data/metric/list/graph', param)
+    return http.post('/DataOps-platform/data/metric/list/graph', param)
   },
   // 新增指标
   dataIndicatorAdd: (param) => {
-    return _http.post('/DataOps-platform/data/metric/add', param)
+    return http.post('/DataOps-platform/data/metric/add', param)
   },
   // 新增更新
   dataIndicatorUpdate: (param) => {
-    return _http.post('/DataOps-platform/data/metric/update', param)
+    return http.post('/DataOps-platform/data/metric/update', param)
   },
   // 指标详情
   dataIndicatorDetails: (param) => {
-    return _http.post('/DataOps-platform/data/metric/detail', param)
+    return http.post('/DataOps-platform/data/metric/detail', param)
   },
   // 指标血缘关系检测
   dataIndicatorRelation: (param) => {
-    return _http.post('/DataOps-platform/data/metric/relation', param)
+    return http.post('/DataOps-platform/data/metric/relation', param)
   },
   dataIndicatorCodeGenerate: (param) => {
-    return _http.post('/DataOps-platform/data/metric/code', param)
+    return http.post('/DataOps-platform/data/metric/code', param)
   },
   // 指标图谱
   dataIndicatorGraph: (param) => {
-    // return _http.post('/DataOps-platform/data/metric/graph', param)
-    return _http.post('/DataOps-platform/data/metric/graph/all', param)
+    // return http.post('/DataOps-platform/data/metric/graph', param)
+    return http.post('/DataOps-platform/data/metric/graph/all', param)
   }
 }
 
@@ -341,68 +242,68 @@ const LLM = {
 
   // 模型训练
   setDDLTrain: (param) => {
-    return _http.post('/vanna/api/v0/train', param)
+    return http.post('/vanna/api/v0/train', param)
   },
   // 图表sql信息
   getSql: (param) => {
-    return _http.get('/vanna/api/v0/generate_sql', param)
+    return http.get('/vanna/api/v0/generate_sql', param)
   },
   // 图表sql信息
   getToTable: (param) => {
-    return _http.get('/vanna/api/v0/run_sql', param)
+    return http.get('/vanna/api/v0/run_sql', param)
   },
   // 知识库+图谱问答
   ask: (param) => {
-    return _http.post('/rag/ask', param)
+    return http.post('/rag/ask', param)
   },
   // 产品知识库问答 RAG
   askToProduct: (param) => {
-    return _http.post('/rag/ask/rag', param)
+    return http.post('/rag/ask/rag', param)
   },
   // 非结构化知识库问答 RAG + Graph
   askToUnstructured: (param) => {
-    return _http.post('/rag/ask/unstructure/rag', param)
+    return http.post('/rag/ask/unstructure/rag', param)
   }
 }
 
 const other = {
 // 资源 & 模型 列表
   getResourceAndModelList: (param) => {
-    return _http.post('/DataOps-platform/resource/model/list', param)
+    return http.post('/DataOps-platform/resource/model/list', param)
   },
   // 查看图谱
   dataGraphById: (param) => {
-    return _http.post('/DataOps-platform/id/data/graph', param)
+    return http.post('/DataOps-platform/id/data/graph', param)
   },
 
   // 生产线调度
   productionLineDispatch: (param) => {
-    return _http.post('/DataOps-platform/id/data/save', param)
+    return http.post('/DataOps-platform/id/data/save', param)
   },
   // 获取资源ddl
   getDDL: (param) => {
-    return _http.post('/DataOps-platform/id/data/ddl', param)
+    return http.post('/DataOps-platform/id/data/ddl', param)
   },
 
   // 生产线执行非结构化文档 实体 关系
   runUnstructured: (param) => {
-    return _http.post('/DataOps-platform/text/resource/node', param)
+    return http.post('/DataOps-platform/text/resource/node', param)
   },
   // 生产线执行非结构化文档 元数据内容
   runUnstructuredMetadata: (param) => {
-    return _http.post('/DataOps-platform/processing/unstructured/data', param)
+    return http.post('/DataOps-platform/processing/unstructured/data', param)
   },
   // 产品知识库列表
   productKnowledgeBaseList: (param) => {
-    return _http.post('/DataOps-platform/text/product/list', param)
+    return http.post('/DataOps-platform/text/product/list', param)
   },
   // 直接删除图谱元素
   graphDataDelete: (param) => {
-    return _http.post('/DataOps-platform/metric/label/standard/delete', param)
+    return http.post('/DataOps-platform/metric/label/standard/delete', param)
   },
   // 直接删除图谱元素
   getGraphMetadataById: (param) => {
-    return _http.post('/DataOps-platform/graph/meta/include', param)
+    return http.post('/DataOps-platform/graph/meta/include', param)
   }
 }
 

src/api/productionLine.js

@@ -14,7 +14,7 @@ import http from '@/utils/request'
 //       })
 //         .then(({ data }) => {
 //           const res = data
-//           if (res.code !== 20000) {
+//           if (res.code !== 200) {
 //             return reject(res.msg?.error || res.msg)
 //           }
 //           resolve(res)
@@ -29,7 +29,7 @@ import http from '@/utils/request'
 //       axios.get(`http://192.168.3.175${url}`, { params }, {})
 //         .then(({ data }) => {
 //           const res = data
-//           if (res.code !== 20000) {
+//           if (res.code !== 200) {
 //             return reject(res.msg?.error || res.msg)
 //           }
 //           resolve(res)
@@ -49,7 +49,7 @@ import http from '@/utils/request'
 //       })
 //         .then(({ data }) => {
 //           const res = data
-//           if (res.code !== 20000) {
+//           if (res.code !== 200) {
 //             return reject(res.msg?.error || res.msg)
 //           }
 //           resolve(res)
@@ -69,7 +69,7 @@ import http from '@/utils/request'
 //       })
 //         .then(({ data }) => {
 //           const res = data
-//           if (res.code !== 20000) {
+//           if (res.code !== 200) {
 //             return reject(res.msg?.error || res.msg)
 //           }
 //           resolve(res)

src/api/system.js

@@ -140,11 +140,6 @@ export function deleteAllMessageRead () {
   return http.post('/authentication/message/website/read/del')
 }
 
-// 单点登录token效验
-export function checkToken () {
-  return http.post('/gzIcbcCertification/check/token')
-}
-
 // 刷新token
 export function refreshToken () {
   return http.post('/authentication/user/token/refresh')

src/api/user.js

@@ -1,7 +1,7 @@
 import http from '@/utils/request'
 
 export function login (data) {
-  return http.post('/authentication/user/login3', data)
+  return http.post('/api/system/auth/login', data)
 }
 
 // 用户列表

src/permission.js

@@ -1,6 +1,5 @@
 import router from './router'
 // import Layout from '@/layout'
-// import { checkToken, refreshToken } from '@/api/system'
 import {
   getToken
   // deleteToken

src/store/modules/user.js

@@ -1,15 +1,14 @@
 import { login } from '@/api/user'
 import router, { resetRouter } from '@/router'
 import { setToken, deleteToken } from '@/utils/auth'
-import Base from '@/utils/base64ToPassword'
+// import Base from '@/utils/base64ToPassword'
 // import Vue from 'vue'
-// import { checkToken } from '@/api/system'
 
 // const defaultSingleSignOn = localStorage.getItem('SET_SINGLE_SIGN_ON') !== '0' // 默认单点登录
 
 const state = {
   singleSignOn: localStorage.getItem('SET_SINGLE_SIGN_ON') !== '0', // 单点登录
-  userInfo: !localStorage.getItem('userInfo') ? {} : JSON.parse(localStorage.getItem('userInfo'))
+  userInfo: {}
 }
 
 const mutations = {
@@ -25,12 +24,12 @@ const mutations = {
 
 const actions = {
   login ({ commit, dispatch }, params) {
-    const { username, password, ...query } = params
-    const newBase = new Base()
+    const { username, password } = params
+    // const newBase = new Base()
     const newParams = {
       username: username.trim(),
-      password: newBase.encode(password + (Math.random()).toString().slice(2, 8)),
-      ...query
+      password: password
+      // password: newBase.encode(password + (Math.random()).toString().slice(2, 8))
     }
     // 账号密码处理
     return new Promise((resolve, reject) => {
@@ -64,17 +63,6 @@ const actions = {
     // localStorage.removeItem('SET_SINGLE_SIGN_ON')
     // 跳转到登录菜单
 
-    // checkToken().catch(error => {
-    //   // 本地返回
-    //   if (error.data.redirectUrl !== 'local') {
-    //     router.push({ path: '/login-local' })
-    //     return
-    //   }
-    //   const windowBox = window.open(`${window?.g}/gzIcbcCertification/aam/logout`, 'new', 'location=no, toolbar=no')
-    //   windowBox.close()
-    //   // location.reload()
-    //   router.push({ path: '/reminder' })
-    // })
     if (!state.singleSignOn) {
       // 普通退出
       router.push({ path: '/login-local' })

src/utils/request.js

@@ -1,16 +1,9 @@
 import axios from 'axios'
-import store from '@/store'
 import { getToken } from '@/utils/auth'
-import { blobToJson } from '@/utils'
-import { checkToken } from '@/api/system'
-import route from '@/router'
 import qs from 'qs'
-// import Vue from 'vue'
-// create an axios instance
+import router from '@/router'
 const service = axios.create({
-  baseURL: window?.g?.VUE_APP_BASE_API ?? process.env.VUE_APP_BASE_API,
-  // baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
-  // withCredentials: true, // send cookies when cross-domain requests
+  baseURL: process.env.VUE_APP_BASE_API,
   timeout: 120000 // request timeout
 })
 
@@ -18,16 +11,10 @@ const service = axios.create({
 // 发送请求拦截器
 service.interceptors.request.use(
   config => {
-    // do something before request is sent
-    // if (getToken()) {
-    //   config.headers.token = getToken()
-    // }
-    config.headers.token = getToken()
+    config.headers.Authorization = `Bearer ${getToken()}`
     return config
   },
   error => {
-    // do something with request error
-    // console.error(error) // for debug
     return Promise.reject(error)
   }
 )
@@ -38,72 +25,24 @@ service.interceptors.response.use(
   async response => {
     const res = response.data
 
-    // console.log(response)
-
-    if (response.request.responseType === 'blob') {
-      // 返回的文件流当报错时转化成json
-      if (response.headers['content-type'] === 'application/json') {
-        try {
-          const result = await blobToJson(res)
-          return Promise.reject(result.msg)
-        } catch (error) {
-          return Promise.reject(error)
-        }
-      }
-      const name = response.headers['content-disposition']
-      // console.log(name)
-      return {
-        data: res,
-        name: name ? decodeURI(name.replace('attachment;filename=', '')) : '未命名'
-      }
-    }
-
-    // 多语言切分msg
-    if (res.msg && typeof res.msg === 'string') {
-      const msg = res.msg.split('|')
-      if (msg.length > 0) {
-        const list = ['zh', 'en']
-        res.msg = msg[list.indexOf(store.getters.lang)]
-      }
-    }
-
     // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
     if ([50008, 50012, 50014, 402000, 401].includes(res.code)) {
-      // Vue.prototype.$snackbar.error(res.msg)
-      // if (!store.getters.singleSignOn) {
-      //   // 删除token
-      //   deleteToken()
-      //   // route.push(`/login?redirect=${route.history.current.fullPath}`)
-      //   window.location.href = `/login-local?redirect=${route.history.current.fullPath}`
-      //   res.msg = '登陆过期，请重新登陆'
-      //   return Promise.reject(res.msg)
-      // }
-      try {
-        await checkToken()
-      } catch (error) {
-        if (!error?.data?.redirectUrl) return
-        // window.location.href = error.data.redirectUrl
-        const url = error.data.redirectUrl === 'local' ? `/login-local?redirect=${route.history.current.fullPath}` : error.data.redirectUrl
-        window.location.href = url
-      }
-      const msg = '登陆过期，请重新登陆'
-      return Promise.reject(msg)
+      router.push({ path: '/login-local' })
+      return Promise.reject(res.message)
     }
     // 登录验证码过期
     if (res.code === 60902) {
       return Promise.reject(res)
     }
-    if (res.code !== 20000) {
+    if (res.code !== 200) {
       if (res.data && Object.keys(res.data).length) {
         return Promise.reject(res)
       }
-      return Promise.reject(res.msg.error || res.msg)
+      return Promise.reject(res.message)
     }
     return res
   },
   error => {
-    // console.error(error)
-    // error = error.message || error
     return Promise.reject(error)
   }
 )
@@ -128,6 +67,16 @@ const http = {
       }
     })
   },
+  put (url, params) {
+    return service.put(url, {
+      params: params
+    })
+  },
+  del (url, params) {
+    return service.delete(url, {
+      params: params
+    })
+  },
   formData (url, params) {
     return service.post(url, params, {
       timeout: 600000,

src/views/login/components/forget.vue

@@ -116,7 +116,7 @@ export default {
       // console.log(this.$refs.form.$refs.form)
       // if (this.$refs.form.validate()) {
       //   userPhoneResetApi (this.form).then(res => {
-      //     if (res.code === 20000) {
+      //     if (res.code === 200) {
       //       this.text = '修改成功'
       //       this.color = 'success'
       //       this.snackbar = true

src/views/login/components/login.vue

@@ -1,9 +1,9 @@
 <template>
     <div>
         <form-data :item="config" ref="form" @keyUpEnter="handleLogin">
-            <template slot="verification">
+            <!-- <template slot="verification">
                 <img v-if="showVerify" class="imgCode" :src="verificationCodeSrc" title="获取验证码" @click="fetchGetVerificationCode" />
-            </template>
+            </template> -->
             <template slot="default">
                 <v-btn
                     :loading="loading"
@@ -62,49 +62,49 @@ export default {
             keyupEnterNative: this.handleLogin,
             clickAppend: this.clickAppendPasswordType,
             change: this.handleChange
-          },
-          {
-            label: '验证码',
-            type: 'text',
-            key: 'verificationCode',
-            slotName: 'verification',
-            rules: [v => !!v || '请填写验证码'],
-            hide: true,
-            value: '',
-            outlined: true,
-            prependInnerIcon: 'mdi-email',
-            keyupEnterNative: this.handleLogin,
-            change: this.handleChange
           }
+          // {
+          //   label: '验证码',
+          //   type: 'text',
+          //   key: 'verificationCode',
+          //   slotName: 'verification',
+          //   rules: [v => !!v || '请填写验证码'],
+          //   hide: true,
+          //   value: '',
+          //   outlined: true,
+          //   prependInnerIcon: 'mdi-email',
+          //   keyupEnterNative: this.handleLogin,
+          //   change: this.handleChange
+          // }
         ]
       },
       queryForm: {
         username: '',
-        password: '',
-        verificationCode: ''
+        password: ''
+        // verificationCode: ''
       },
       passwordType: false,
       errorCount: 0,
       errorCountTop: 3,
       showVerify: false,
-      verificationCodeSrc: '',
+      // verificationCodeSrc: '',
       query: '1'
     }
   },
-  watch: {
-    error (val) {
-      if (val) {
-        this.open()
-      }
-    }
-  },
+  // watch: {
+  //   error (val) {
+  //     if (val) {
+  //       this.open()
+  //     }
+  //   }
+  // },
   methods: {
     ...mapMutations('system', ['SET_SYSTEM_INFO']),
-    open () {
-      this.config.options.find(e => e.key === 'verificationCode').hide = false
-      this.fetchGetVerificationCode()
-      this.showVerify = true
-    },
+    // open () {
+    //   this.config.options.find(e => e.key === 'verificationCode').hide = false
+    //   this.fetchGetVerificationCode()
+    //   this.showVerify = true
+    // },
     handleChange (v) {
       Object.assign(this.queryForm, v)
     },
@@ -132,13 +132,13 @@ export default {
           // this.handleBurialPoint()
           this.$router.push('/')
         } catch (error) {
-          if (typeof error === 'object' && error?.code) {
-            this.$snackbar.error(error.msg || error)
-            this.open()
-            return
-          }
-          // 生成验证码
-          this.fetchGetVerificationCode()
+          // if (typeof error === 'object' && error?.code) {
+          //   this.$snackbar.error(error.msg || error)
+          //   this.open()
+          //   return
+          // }
+          // // 生成验证码
+          // this.fetchGetVerificationCode()
           this.$snackbar.error(error)
         } finally {
           this.loading = false
@@ -152,12 +152,12 @@ export default {
     //     console.log('访问新增失败')
     //   }
     // },
-    fetchGetVerificationCode () {
-      const api = this.$api
-      const rand = Math.ceil(Math.random() * 10)
-      this.query = Math.ceil(Math.random() * 1000)
-      this.verificationCodeSrc = `${api}/authentication/get/verificationCode?type=login&rand=${rand}&query=${this.query}`
-    },
+    // fetchGetVerificationCode () {
+    //   const api = this.$api
+    //   const rand = Math.ceil(Math.random() * 10)
+    //   this.query = Math.ceil(Math.random() * 1000)
+    //   this.verificationCodeSrc = `${api}/authentication/get/verificationCode?type=login&rand=${rand}&query=${this.query}`
+    // },
     clickAppendPasswordType () {
       this.passwordType = !this.passwordType
       if (this.passwordType) {

src/views/login/components/register.vue

@@ -60,7 +60,7 @@ export default {
       //     }
       //     console.log('form', postForm)
       //     companyRegister2(postForm).then(res => {
-      //       if (res.code === 20000) {
+      //       if (res.code === 200) {
       //         this.text = '提交成功请等待管理员审核'
       //         this.color = 'success'
       //         this.snackbar = true

src/views/login/signAgain.vue

@@ -6,7 +6,6 @@
 </template>
 
 <script>
-import { checkToken } from '@/api/system'
 export default {
   data () {
     return {
@@ -16,17 +15,7 @@ export default {
   methods: {
     async signAgain () {
       if (!this.hasClicked) {
-        try {
-          window.alert('已点击登录,请等待加载')
-          await checkToken()
-        } catch (error) {
-          if (error.data.redirectUrl === 'local') {
-            return
-          }
-          window.location.href = error.data.redirectUrl
-        } finally {
-          this.hasClicked = true
-        }
+        window.alert('已点击登录,请等待加载')
       } else {
         window.alert('已点击登录,请等待加载')
       }

vue.config.js

@@ -22,7 +22,7 @@ module.exports = defineConfig({
   devServer: {
     open: true,
     // host: 'localhost',
-    port: 9002,
+    port: 18183,
     hot: true
     // https: false,
     // proxy: {