登录接口联调

lihua
Showing 18 changed files with 282 additions and 198 deletions
.env.development
package.json
pnpm-lock.yaml
src/api/modules/dataAnonymization.ts
src/api/modules/dataAsset.ts
src/api/modules/dataDelivery.ts
src/api/modules/dataIdentify.ts
src/api/modules/dataRequire.ts
src/api/modules/dataSmartContract.ts
src/api/modules/idaas.ts
src/api/modules/queryService.ts
src/api/modules/workFlowService.ts
src/components/Retrievepassword/index.vue
src/layouts/components/Tools/index.vue
src/layouts/index.vue
src/utils/request.ts
src/views/data_basic/departmentInfoList.vue
src/views/portal/portalLogin.vue
--- a/.env.development
View file @72f8f1f
+++ b/.env.development
View file @72f8f1f
@@ -4,10 +4,16 @@ VITE_APP_TITLE = 可信数据服务平台
 # VITE_API_BASEURL = https://www.zgsjzc.com/api
 # VITE_API_BASEURL = https://swzl-test.csbr.cn/api
 #  VITE_API_BASEURL = http://localhost:9000
-VITE_API_BASEURL = http://192.168.6.20:58052/
+VITE_API_BASEURL = http://10.4.82.30:58053/
 VITE_IDASS_BASEURL = https://idaas-test.csbr.cn/login
+# idaas测试环境
+VITE_API_IDAAS_URL = http://114.115.131.96:18080
+# 可信空间连接器通用的平台用户接口地址
+VITE_API_COMMON_URL = ms-connector-trust-data-space-service
 # 平台用户 接口请地址
 VITE_APP_USER_API_BASEURL = gateway-server
--- a/package.json
View file @72f8f1f
+++ b/package.json
View file @72f8f1f
@@ -49,6 +49,7 @@
    "pinia-plugin-persistedstate": "^2.2.0",
    "pinyin-pro": "^3.24.2",
    "sortablejs": "^1.15.1",
+    "uuid": "^13.0.0",
    "vant": "^4.9.8",
    "vue": "^3.2.47",
    "vue-router": "^4.1.6",
--- a/pnpm-lock.yaml
View file @72f8f1f
+++ b/pnpm-lock.yaml
View file @72f8f1f
@@ -107,6 +107,9 @@ dependencies:
  sortablejs:
    specifier: ^1.15.1
    version: 1.15.4
+  uuid:
+    specifier: ^13.0.0
+    version: 13.0.0
  vant:
    specifier: ^4.9.8
    version: 4.9.9(vue@3.5.13)
@@ -9347,6 +9350,11 @@ packages:
      base64-arraybuffer: 1.0.2
    dev: false
+  /uuid@13.0.0:
+    resolution: {integrity: sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==}
+    hasBin: true
+    dev: false
  /v8flags@4.0.1:
    resolution: {integrity: sha512-fcRLaS4H/hrZk9hYwbdRM35D0U8IYMfEClhXxCivOojl+yTRAZH3Zy2sSy6qVCiGbV9YAtPssP6jaChqC9vPCg==}
    engines: {node: '>= 10.13.0'}
--- a/src/api/modules/dataAnonymization.ts
View file @72f8f1f
+++ b/src/api/modules/dataAnonymization.ts
View file @72f8f1f
@@ -5,39 +5,39 @@ import request from "@/utils/request";
 /** 获取标签列表。 */
 export const getDataLabelList = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/label/page-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/label/page-list`,
  method: 'post',
  data: params
 })
 /** 修改标签启用禁用状态 */
 export const updateLabelState = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/label/update-state`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/label/update-state`,
  method: 'put',
  params
 })
 export const saveLabel = (data) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/label/save`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/label/save`,
  method: 'post',
  data
 })
 export const deleteLabel = (data) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/label/delete`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/label/delete`,
  method: 'delete',
  data
 })
 export const updateLabel = (data) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/label/update`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/label/update`,
  method: 'put',
  data
 })
 /** 获取标签详情 */
 export const getLabelDetail = (guid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/label/detail?guid=${guid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/label/detail?guid=${guid}`,
  method: 'get'
 })
@@ -62,45 +62,45 @@ export const fieldTypeList = [{
 /** 获取泛化文件列表 */
 export const getGeneralizeFileList =  (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/generalize-file/page-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/generalize-file/page-list`,
  method: 'post',
  data: params
 })
 /** 获取泛化文件列表,包括名称和guid */
 export const getGeneralizeFileNameList =  () => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/generalize-file/name-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/generalize-file/name-list`,
  method: 'post'
 })
 export const saveGeneralizeFile = (data) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/generalize-file/save`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/generalize-file/save`,
  method: 'post',
  data
 })
 /** 删除泛化文件 */
 export const deleteGeneralizeFile = (data) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/generalize-file/delete`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/generalize-file/delete`,
  method: 'delete',
  data
 })
 /** 获取泛化文件详情 */
 export const getGeneralizeFileDetail = (guid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/generalize-file/detail?guid=${guid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/generalize-file/detail?guid=${guid}`,
  method: 'get'
 })
 export const updateGeneralizeFile = (data) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/generalize-file/update`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/generalize-file/update`,
  method: 'put',
  data
 })
 /** 获取泛化文件解析结果 */
 export const parseGeneralizeFileData = (data) =>  request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/generalize-file/parse-file`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/generalize-file/parse-file`,
  method: 'post',
  data
 })
@@ -110,35 +110,35 @@ export const parseGeneralizeFileData = (data) =>  request({
 /** 获取敏感数据识别任务列表 */
 export const getSensitiveDataTaskList = (params) =>  request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/sensitive-data-task/page-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/sensitive-data-task/page-list`,
  method: 'post',
  data: params
 })
 /** 新增敏感数据识别任务 */
 export const saveSensitiveDataTask = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/sensitive-data-task/save`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/sensitive-data-task/save`,
  method: 'post',
  data: params
 })
 /** 编辑修改敏感数据识别任务 */
 export const updateSensitiveDataTask = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/sensitive-data-task/update`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/sensitive-data-task/update`,
  method: 'put',
  data: params
 })
 /** 删除敏感数据识别任务 */
 export const deleteSensitiveDataTask = (data) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/sensitive-data-task/delete`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/sensitive-data-task/delete`,
  method: 'delete',
  data
 })
 /** 手动执行敏感任务 */
 export const execSensitiveDataTask = (guid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/sensitive-data-task/exec-task?taskGuid=${guid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/sensitive-data-task/exec-task?taskGuid=${guid}`,
  method: 'get'
 })
@@ -163,54 +163,54 @@ export const getDatabase = (params) => request({
 /** 获取敏感数据任务执行的数据表列表 */
 export const getExecSensitiveTable = (execGuid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/sensitive-data-task/get-exec-sensitive-table?execGuid=${execGuid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/sensitive-data-task/get-exec-sensitive-table?execGuid=${execGuid}`,
  method: 'get'
 })
 /** 根据数据源或表获取敏感数据任务执行的字段列表 */
 export const getExecSensitiveFieldTable = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/sensitive-data-task/get-exec-sensitive-field`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/sensitive-data-task/get-exec-sensitive-field`,
  method: 'post',
  data: params
 })
 /** 获取当前数据表下的执行字段 */
 export const getExecSensitiveFieldColumnListByCondition = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/sensitive-data-task/column-list-by-condition`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/sensitive-data-task/column-list-by-condition`,
  method: 'post',
  data: params
 })
 /** 获取敏感数据识别任务执行后的统计结果 */
 export const getStatisticsNum = (params) =>  request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/sensitive-data-task/statistics-num`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/sensitive-data-task/statistics-num`,
  method: 'get',
  params
 })
 /** 修改敏感数据识别字段标签 */
 export const updateSensitiveDataTaskFieldLabel = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/sensitive-data-task/batch-update-label`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/sensitive-data-task/batch-update-label`,
  method: 'put',
  data: params
 })
 /** 批量修改确认状态 */
 export const batchUpdateSensitiveDataTaskFieldStatus = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/sensitive-data-task/batch-change-status`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/sensitive-data-task/batch-change-status`,
  method: 'post',
  data: params
 })
 /** 修改任务状态 */
 export const confirmTaskStatus = (guid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/sensitive-data-task/confirm-task?execGuid=${guid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/sensitive-data-task/confirm-task?execGuid=${guid}`,
  method: 'get'
 })
 /** 获取敏感数据识别任务执行日志 */
 export const getSensitiveDataTaskExecLog = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/sensitive-data-task/get-exec-sensitive-exec-log`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/sensitive-data-task/get-exec-sensitive-exec-log`,
  method: 'post',
  data: params
 })
@@ -219,73 +219,73 @@ export const getSensitiveDataTaskExecLog = (params) => request({
 /** 获取匿名化任务列表 */
 export const getAnonTaskList = (params) =>  request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/anon-task/page-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/anon-task/page-list`,
  method: 'post',
  data: params
 })
 /** 删除匿名化任务 */
 export const deleteAnonTask =  (data) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/anon-task/delete`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/anon-task/delete`,
  method: 'delete',
  data
 })
 /** 保存匿名化任务 */
 export const saveAnonTask = (params) =>  request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/anon-task/save`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/anon-task/save`,
  method: 'post',
  data: params
 })
 /** 更新匿名化任务 */
 export const updateAnonTask = (params) =>  request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/anon-task/update`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/anon-task/update`,
  method: 'put',
  data: params
 })
 /** 获取匿名化任务详情 */
 export const getAnonTaskDetail = (guid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/anon-task/detail?guid=${guid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/anon-task/detail?guid=${guid}`,
  method: 'get'
 })
 /** 执行匿名化任务 */
 export const execAnonTask = (taskGuid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/anon-task/exec-task?taskGuid=${taskGuid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/anon-task/exec-task?taskGuid=${taskGuid}`,
  method: 'post'
 })
 /** 匿名化任务检验接口 */
 export const anonTaskCheck  = (params) =>  request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/anon-task/check`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/anon-task/check`,
  method: 'post',
  data: params
 })
 /** 获取匿名化任务分析结果数据 */
 export const getAnonAnalyzeResult = (execGuid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/anon-task/get-anon-analyze?taskExecGuid=${execGuid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/anon-task/get-anon-analyze?taskExecGuid=${execGuid}`,
  method: 'get'
 })
 /** 获取匿名化任务分析结果数据 */
 export const getLastAnonAnalyzeResult = (execGuid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/anon-task/get-anon-analyze?isResult=true&taskExecGuid=${execGuid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/anon-task/get-anon-analyze?isResult=true&taskExecGuid=${execGuid}`,
  method: 'get'
 })
 /** 获取匿名化任务分析结果统计分页数据 */
 export const getAnonAnalyzePageData = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/anon-task/page-anon-analyze-data`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/anon-task/page-anon-analyze-data`,
  method: 'post',
  data: params
 })
 /** 获取匿名化任务结果数据 */
 export const getAnonPageData = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/anon-task/page-anon-data`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/anon-task/page-anon-data`,
  method: 'post',
  data: params
 })
@@ -320,27 +320,27 @@ export const  getDsTableSampleData = (params) => request({
 /** 根据字段名称获取敏感数据识别标签 */
 export const getLableByFieldName = (fieldName) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/sensitive-data-task/get-label-by-field-name?fieldName=${fieldName}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/sensitive-data-task/get-label-by-field-name?fieldName=${fieldName}`,
  method: 'get'
 });
 /** 验证样本数据 */
 export const validateAnonRule = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/anon-task/check`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/anon-task/check`,
  method: 'post',
  data: params
 })
 /** 导出匿名化结果数据 */
 export const exportAnonExecData = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/anon-task/export-anon-data?taskGuid=${params.taskGuid}&taskExecGuid=${params.execGuid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/anon-task/export-anon-data?taskGuid=${params.taskGuid}&taskExecGuid=${params.execGuid}`,
  method: 'get',
  responseType: 'blob'
 })
 /** 下载匿名化评估报告 */
 export const exportAnonReport = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/anon-task/download-report?taskGuid=${params.taskGuid}&taskExecGuid=${params.execGuid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/anon-task/download-report?taskGuid=${params.taskGuid}&taskExecGuid=${params.execGuid}`,
  method: 'post',
  responseType: 'blob'
 })
@@ -353,29 +353,29 @@ export const htmlToWord = (params) => request({
 })
 export const scanFolder = (dirPath = '') => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/anon-task/directory/scan?dirPath=${dirPath}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/anon-task/directory/scan?dirPath=${dirPath}`,
  method: 'get'
 })
 /** 获取扫描文件结果 */
 export const getDicomMeta = (taskGuid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/anon-task/get-dicom-meta?taskGuid=${taskGuid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/anon-task/get-dicom-meta?taskGuid=${taskGuid}`,
  method: 'get'
 })
 /** 获取扫描文件统计结果 */
 export const getDicomStatistics = (taskGuid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/anon-task/get-dicom-statistics?taskGuid=${taskGuid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/anon-task/get-dicom-statistics?taskGuid=${taskGuid}`,
  method: 'get'
 })
 export const retryDicom =  (taskGuid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/anon-task/dicom/retry?taskGuid=${taskGuid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/anon-task/dicom/retry?taskGuid=${taskGuid}`,
  method: 'get'
 })
 export const downDicomPath = (taskExecGuid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/anon-task/down-dicom-path?taskExecGuid=${taskExecGuid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/anon-task/down-dicom-path?taskExecGuid=${taskExecGuid}`,
  method: 'get',
  responseType: 'blob'
 })
\ No newline at end of file
--- a/src/api/modules/dataAsset.ts
View file @72f8f1f
+++ b/src/api/modules/dataAsset.ts
View file @72f8f1f
@@ -280,7 +280,7 @@ export const getParamsList = (params) => request({
 })
 export const getDamTypesList = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/connector-invoke/dam/get-by-dictType`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/connector-invoke/dam/get-by-dictType`,
  method: 'get',
  params
 })
--- a/src/api/modules/dataDelivery.ts
View file @72f8f1f
+++ b/src/api/modules/dataDelivery.ts
View file @72f8f1f
@@ -3,98 +3,98 @@ import request from "@/utils/request";
 /** 数据交付 */
 export const getPageList = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-delivery/page-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-delivery/page-list`,
  method: 'post',
  data: params
 })
 export const deleteDeliveryContract = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-delivery/delete`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-delivery/delete`,
  method: 'delete',
  data: params
 });
 /** 获取查看核验信息明细接口 */
 export const getDeliveryVerifyDetail = (guid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-delivery/verify-detail?deliveryGuid=${guid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-delivery/verify-detail?deliveryGuid=${guid}`,
  method: 'get'
 });
 /** 检验是否通过的提示 */
 export const verifyDetailStatusChange = (guid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-delivery/verify-is-reject?deliveryGuid=${guid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-delivery/verify-is-reject?deliveryGuid=${guid}`,
  method: 'get'
 });
 /** 更新核验状态 */
 export const verifyStatusChange = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-delivery/verify-status-change`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-delivery/verify-status-change`,
  method: 'post',
  data: params
 })
 /** 交付合约 */
 export const deliveryContract = (guid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-delivery/delivery?deliveryGuid=${guid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-delivery/delivery?deliveryGuid=${guid}`,
  method: 'post'
 })
 /** 数据使用 */
 export const getDataUsePageList = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-use/page-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-use/page-list`,
  method: 'post',
  data: params
 })
 /** 删除数据使用 */
 export const deleteDataUse = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-use/delete`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-use/delete`,
  method: 'delete',
  data: params
 });
 /** 下载数据 */
 export const downloadTableData = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-use/download?userGuid=${params.userGuid}&subjectGuid=${params.subjectGuid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-use/download?userGuid=${params.userGuid}&subjectGuid=${params.subjectGuid}`,
  method: 'get',
  responseType: 'blob'
 });
 /** 下载数据前的检查 */
 export const downloadTableDataCheck = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-use/download-check?userGuid=${params.userGuid}&subjectGuid=${params.subjectGuid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-use/download-check?userGuid=${params.userGuid}&subjectGuid=${params.subjectGuid}`,
  method: 'get'
 });
 /** 数据使用中查看资产表的数据 */
 export const queryUseData = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-use/read?userGuid=${params.userGuid}&subjectGuid=${params.subjectGuid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-use/read?userGuid=${params.userGuid}&subjectGuid=${params.subjectGuid}`,
  method: 'get'
 });
 /** 数据使用中复制 */
 export const queryCopyData = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-use/copy?userGuid=${params.userGuid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-use/copy?userGuid=${params.userGuid}`,
  method: 'get'
 });
 /** 分发连接器 */
 export const distributeContract = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-use/distribute`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-use/distribute`,
  method: 'post',
  data: params
 })
 /** 分发提前校验接口 */
 export const checkDistributeContract = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-use/check-distribute`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-use/check-distribute`,
  method: 'post',
  data: params
 })
 /** 获取数据使用对应的策略信息 */
 export const getContractStrategy = (useGuid ) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-use/get-policy?useGuid=${useGuid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-use/get-policy?useGuid=${useGuid}`,
  method: 'get'
 });
\ No newline at end of file
--- a/src/api/modules/dataIdentify.ts
View file @72f8f1f
+++ b/src/api/modules/dataIdentify.ts
View file @72f8f1f
@@ -5,49 +5,49 @@ import request from "@/utils/request";
 /** 企业认证 **/
 // 企业认证分页
 export const getEnterpriseList = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/page-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/page-list`,
  method: 'post',
  data: params
 })
 // 企业认证详情
 export const getEnterpriseDetail = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/detail`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/detail`,
  method: 'get',
  params
 })
 // 企业认证新增
 export const enterpriseSave = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/save`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/save`,
  method: 'post',
  data: params
 })
 // 企业认证修改
 export const enterpriseUpdate = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/update`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/update`,
  method: 'put',
  data: params
 })
 // 企业认证删除
 export const enterpriseDelete = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/delete`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/delete`,
  method: 'delete',
  data: params
 })
 // 企业认证变更删除
 export const enterpriseChangeDelete = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/change/delete`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/change/delete`,
  method: 'delete',
  data: params
 })
 // 企业认证最后一级审批
 export const enterpriseApprove = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/last-approve`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/last-approve`,
  method: 'post',
  data: params
 })
@@ -75,7 +75,7 @@ export const getTaskExecutionLog = (params) => request({
 // 获取企业认证流程列表
 export const getFlowEnterpriseList = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/flow/page-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/flow/page-list`,
  method: 'post',
  data: params
 })
@@ -89,14 +89,14 @@ export const getUserTenant = () => request({
 // 获取企业信息
 export const getEnterpriseData = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/detail-by-logonUser`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/detail-by-logonUser`,
  method: 'get',
  params
 })
 // 修改需求上架状态
 export const updateDemandGrounding = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/demand/update-grounding-pick`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/demand/update-grounding-pick`,
  method: 'post',
  data: params
 })
--- a/src/api/modules/dataRequire.ts
View file @72f8f1f
+++ b/src/api/modules/dataRequire.ts
View file @72f8f1f
@@ -2,7 +2,7 @@ import request from "@/utils/request";
 // 最后一级节点审批通过
 export const contractApprove = (params, serviceTenantGuid:any = null) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/data-contract/submit-flow${serviceTenantGuid?`?serviceTenantGuid=${serviceTenantGuid}`:''}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/data-contract/submit-flow${serviceTenantGuid?`?serviceTenantGuid=${serviceTenantGuid}`:''}`,
  method: 'post',
  data: params
 })
@@ -10,49 +10,49 @@ export const contractApprove = (params, serviceTenantGuid:any = null) => request
 /** 企业认证 **/
 // 企业认证分页
 export const getEnterpriseList = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/page-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/page-list`,
  method: 'post',
  data: params
 })
 // 企业认证详情
 export const getEnterpriseDetail = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/detail`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/detail`,
  method: 'get',
  params
 })
 // 企业认证新增
 export const enterpriseSave = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/save`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/save`,
  method: 'post',
  data: params
 })
 // 企业认证修改
 export const enterpriseUpdate = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/update`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/update`,
  method: 'put',
  data: params
 })
 // 企业认证删除
 export const enterpriseDelete = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/delete`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/delete`,
  method: 'delete',
  data: params
 })
 // 企业认证变更删除
 export const enterpriseChangeDelete = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/change/delete`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/change/delete`,
  method: 'delete',
  data: params
 })
 // 企业认证最后一级审批
 export const enterpriseApprove = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/last-approve`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/last-approve`,
  method: 'post',
  data: params
 })
@@ -80,7 +80,7 @@ export const getTaskExecutionLog = (params) => request({
 // 获取企业认证流程列表
 export const getFlowEnterpriseList = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/flow/page-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/flow/page-list`,
  method: 'post',
  data: params
 })
@@ -94,7 +94,7 @@ export const getUserTenant = () => request({
 // 获取企业信息
 export const getEnterpriseData = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/detail-by-logonUser`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/enterprise/detail-by-logonUser`,
  method: 'get',
  params
 })
@@ -103,47 +103,47 @@ export const getEnterpriseData = (params) => request({
 // 连接器分页
 export const getConnectorList = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/tds-connector-identity/page-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/tds-connector-identity/page-list`,
  method: 'post',
  data: params
 })
 /** 保存 */
 export const saveConnector = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/tds-connector-identity/save`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/tds-connector-identity/save`,
  method: 'post',
  data: params
 })
 /** 更新 */
 export const updateConnector = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/tds-connector-identity/update`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/tds-connector-identity/update`,
  method: 'put',
  data: params
 })
 /** 变更的重新提交 */
 export const changeSaveConnector = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/tds-connector-identity/change-save`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/tds-connector-identity/change-save`,
  method: 'post',
  data: params
 })
 /** 删除 */
 export const deleteConnector = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/tds-connector-identity/delete`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/tds-connector-identity/delete`,
  method: 'delete',
  data: params
 })
 export const getConnectorDetail = (guid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/tds-connector-identity/detail?guid=${guid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/tds-connector-identity/detail?guid=${guid}`,
  method: 'get'
 })
 /** 判断当前用户企业是否已申请连接器 */
 export const checkConnector = () => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/tds-connector-identity/check-connector `,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/tds-connector-identity/check-connector `,
  method: 'get'
 })
--- a/src/api/modules/dataSmartContract.ts
View file @72f8f1f
+++ b/src/api/modules/dataSmartContract.ts
View file @72f8f1f
@@ -27,35 +27,35 @@ export const contractStatusList = [{
 /** 获取策略模板的列表 */
 export const getPageList = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/policy-template/page-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/policy-template/page-list`,
  method: 'post',
  data: params
 })
 /** 新增策略模板 */
 export const savePolicyTemplate = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/policy-template/save`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/policy-template/save`,
  method: 'post',
  data: params
 });
 /** 修改策略模板 */
 export const updatePolicyTemplate = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/policy-template/update`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/policy-template/update`,
  method: 'put',
  data: params
 });
 /** 删除策略模板 */
 export const deletePolicyTemplate = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/policy-template/delete`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/policy-template/delete`,
  method: 'delete',
  data: params
 });
 /** 更新策略模板状态 */
 export const updateTemplateState = (params) => request({
- url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/policy-template/update-status`,
+ url: `${import.meta.env.VITE_API_COMMON_URL}/policy-template/update-status`,
  method: 'put',
  params
 });
@@ -63,88 +63,88 @@ export const updateTemplateState = (params) => request({
 /** --------------------------- 合约模板管理 -------------------------- */
 /** 获取策略模板的列表 */
 export const getContractTemplatePageList = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-template/page-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-template/page-list`,
  method: 'post',
  data: params
 })
 /** 新增合约模板状态 */
 export const saveContractTemplate = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-template/save`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-template/save`,
  method: 'post',
  data: params
 });
 /** 更新合约模板状态 */
 export const updateContractTemplate = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-template/update`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-template/update`,
  method: 'put',
  data: params
 });
 /** 更新合约模板状态 */
 export const updateContractTemplateState = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-template/update-status`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-template/update-status`,
  method: 'put',
  params
 });
 /** 删除策略模板 */
 export const deleteContractTemplate = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-template/delete`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-template/delete`,
  method: 'delete',
  data: params
 });
 /** 获取策略模板详情 */
 export const getContractTemplateDetail = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-template/detail`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-template/detail`,
  method: 'get',
  params
 });
 /** 复制合约模板 */
 export const copyContractTemplate = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-template/copy`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-template/copy`,
  method: 'get',
  params
 });
 /** 获取操作行为下拉列表 */
 export const getActionPolicyList =  () => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/connector-invoke/list-by-policy-type?policyType=XW`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/connector-invoke/list-by-policy-type?policyType=XW`,
  method: 'get'
 });
 /** 获取约束条件下拉列表 */
 export const getConstraintPolicyList =  () => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/connector-invoke/list-by-policy-type?policyType=YS`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/connector-invoke/list-by-policy-type?policyType=YS`,
  method: 'get'
 });
 /** 根据状态获取可用的数字合约模板 */
 export const getValidContractTemplateList = () => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/connector-invoke/list-by-biz-status`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/connector-invoke/list-by-biz-status`,
  method: 'get'
 });
 /** --------------------- 合约管理 ----------------------- */
 export const getContractPageList = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract/page-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract/page-list`,
  method: 'post',
  data: params
 })
 /** 合约备案列表 */
 export const getContractOverviewPageList = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract/overview-page-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract/overview-page-list`,
  method: 'post',
  data: params
 })
 /** 获取合约备案的发起主体下拉列表 */
 export const getContractOverviewTenantList = () => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract/tenant-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract/tenant-list`,
  method: 'get',
 });
@@ -156,146 +156,146 @@ export const getContractDataProduct = (tenantGuid) => request({
 /** 获取下拉数据产品列表的去重字段 */
 export const getDamFieldsByProductGuid = (productGuid, isTds = 'N', isAnnon = 'N') => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/connector-invoke/field-by-dam-guid?damGuid=${productGuid}&isTds=${isTds}&isAnnon=${isAnnon}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/connector-invoke/field-by-dam-guid?damGuid=${productGuid}&isTds=${isTds}&isAnnon=${isAnnon}`,
  method: 'get'
 })
 /** 创建合约 */
 export const saveContract = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract/save`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract/save`,
  method: 'post',
  data: params
 })
 /** 更新合约 */
 export const updateContract = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract/update`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract/update`,
  method: 'put',
  data: params
 })
 export const deleteContract = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract/delete`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract/delete`,
  method: 'delete',
  data: params
 });
 export const getContractDetail = (guid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract/detail?guid=${guid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract/detail?guid=${guid}`,
  method: 'get',
 });
 /** 查询协商信息详情 */
 export const getContractNegotiate = (guid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract/get-negotiate?guid=${guid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract/get-negotiate?guid=${guid}`,
  method: 'post',
 });
 /** 根据版本获取协商信息 */
 export const getContractNegoPlicyByVersion = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract/get-policy-by-version?contractGuid=${params.guid}&version=${params.version}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract/get-policy-by-version?contractGuid=${params.guid}&version=${params.version}`,
  method: 'get'
 });
 /** 拒绝本次合约 */
 export const rejectContract = (guid) =>  request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract/reject?guid=${guid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract/reject?guid=${guid}`,
  method: 'post',
 });
 /** 确认本次合约 */
 export const confirmContract = (guid) =>  request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract/confirm?guid=${guid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract/confirm?guid=${guid}`,
  method: 'post',
 });
 /** 继续本地合约协商 */
 export const continueContractNegotiate = (params) =>  request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract/continue-negotiate`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract/continue-negotiate`,
  method: 'post',
  data: params
 });
 /** 获取可选的企业下拉列表，认证过之后带标识的 */
 export const getContractTenantList = (tenantName = '') => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/connector-invoke/get-enterprise?tenantName=${tenantName}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/connector-invoke/get-enterprise?tenantName=${tenantName}`,
  method: 'get'
 })
 /** 撤回合约 */
 export const cancelContract = (guid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract/canal?guid=${guid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract/canal?guid=${guid}`,
  method: 'post',
 });
 /** 签署合约 */
 export const signContract = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-signature/save`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-signature/save`,
  method: 'post',
  data: params
 });
 /** 获取签署合约详情 */
 export const getSignListInfo = (guid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-signature/list-by-contract-guid?contractGuid=${guid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-signature/list-by-contract-guid?contractGuid=${guid}`,
  method: 'post',
 });
 /** ----------------- 合约履约信息 ----------------- */
 export const getContractProof = (guid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/proof-execution/proof-by-contract-guid?contractGuid=${guid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/proof-execution/proof-by-contract-guid?contractGuid=${guid}`,
  method: 'get'
 });
 /** 获取履约签名 */
 export const getContractExecList = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/proof-execution/execution-list-by-contract-guid`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/proof-execution/execution-list-by-contract-guid`,
  method: 'post',
  data: params
 });
 /** 解除合同 */
 export const terminateContract = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-terminate/save`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-terminate/save`,
  method: 'post',
  data: params
 });
 /** 获取终止合约信息 */
 export const getTerminateDetailInfo = (guid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-terminate/detail?contractGuid=${guid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-terminate/detail?contractGuid=${guid}`,
  method: 'get'
 });
 /** 日志管理-操作记录 */
 export const getContractOperationLog = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-operation-log/page-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-operation-log/page-list`,
  method: 'post',
  data: params
 }) 
 /** 操作记录详情 */
 export const getContractOperationLogDetail = (guid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-operation-log/detail?guid=${guid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-operation-log/detail?guid=${guid}`,
  method: 'get'
 }) 
 /** 日志管理-过程记录 */
 export const getContractProcessLog = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-process-log/page-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-process-log/page-list`,
  method: 'post',
  data: params
 }) 
 /** 整个系统日志管理 */
 export const getSysOperationLog = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/trust-data-space-log/page-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/trust-data-space-log/page-list`,
  method: 'post',
  data: params
 }) 
 export const getContractProcessLogDetail = (guid) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-process-log/detail?guid=${guid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-process-log/detail?guid=${guid}`,
  method: 'get'
 }) 
@@ -303,25 +303,25 @@ export const getContractProcessLogDetail = (guid) => request({
 /** 获取备案统计 */
 export const getContractStatis = () => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract/get-contract-statistics`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract/get-contract-statistics`,
  method: 'get'
 }) 
 export const getContractMonthStatis = () => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-signature/get-month-signature`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-signature/get-month-signature`,
  method: 'get'
 }) 
 /** 获取合约履行异常预警记录 */
 export const getLogTableList = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-process-log/page-abnormal-warning`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-process-log/page-abnormal-warning`,
  method: 'post',
  data: params
 }) 
 /** 生成数字签名文件 */
 export const getSignatureFile = (params, data) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/contract-signature/get-signature-base?pageIndex=${data.pageIndex}&yPosition=${data.yPosition}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/contract-signature/get-signature-base?pageIndex=${data.pageIndex}&yPosition=${data.yPosition}`,
  method: 'post',
  data: params,
  headers: {
@@ -331,13 +331,13 @@ export const getSignatureFile = (params, data) => request({
 /** ---------------------- 区块链日志 ---------------------- */
 export const getBlockChainPageList = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/blockchain-code/page-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/blockchain-code/page-list`,
  method: 'post',
  data: params
 }) 
 export const getBlockChainDetail = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/blockchain-detail/chain-page-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/blockchain-detail/chain-page-list`,
  method: 'post',
  data: params
 }) 
--- a/src/api/modules/idaas.ts
View file @72f8f1f
+++ b/src/api/modules/idaas.ts
View file @72f8f1f
@@ -16,26 +16,46 @@ export const getLoginWebAuthn = () => request({
 export const getPictureCode = () => request({
  url: `/user/get-picture-code`,
-  method: 'get',
+  method: 'idaasGet',
 })
 // 通用图形验证码
 export const commoncheckImgCode = () => request({
-  url: `/ms-daop-user-service/user/validate-code/get`,
+  url: `/user/validate-code/get`,
-  method: 'get',
+  method: 'idaasGet',
  responseType: 'blob'
 })
+export const sendCode = (params:{
+  logonUser: string,
+  mobileNo: string,
+  validateCodeGuid: string,
+  validateCode: string
+}) =>  request({
+  url: `/user/send-msg-code?logonUser=${params.logonUser}&mobileNo=${params.mobileNo}&validateCodeGuid=${params.validateCodeGuid}&validateCode=${params.validateCode}`,
+  method: 'idaasGet',
+})
+export const resetPwd = (params:{
+  mobileNo: string,
+  smsCode: string,
+  pwd: string,
+  logonUser: string
+}) =>  request({
+  url: `/user/reset-pwd?mobileNo=${params.mobileNo}&smsCode=${params.smsCode}&pwd=${params.pwd}&logonUser=${params.logonUser}`,
+  method: 'idaasput',
+})
 // 校验图形验证码
 export const checkImgCode = (params) => request({
-  url: `${import.meta.env.VITE_APP_AUTH_URL}/portal/check`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/portal/check`,
  method: 'post',
  data: params
 });
 // 获取图形验证码
 export const getImgCodeSrc = (params) => request({
-  url: `${import.meta.env.VITE_APP_AUTH_URL}/portal/get-captcha`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/portal/get-captcha`,
  method: 'get',
  params
 });
@@ -51,7 +71,7 @@ export const checkDeviceTypeRegist = (params) => request({
 * @returns 
 */
 export const checkLoginUser = (logonUser:string) => request({
-  url: `/ms-daop-user-service/user/check-login-user-password?logonUser=${logonUser}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/user/check-login-user-password?logonUser=${logonUser}`,
  method: 'get'
 });
@@ -68,7 +88,7 @@ export const signUp = (data) => request({
 /** 发送登录验证码到手机 */
 export const sendLoginCode = (mobileNo:string) => request({
-  url: `/ms-daop-user-service/user/get-login-sms-validate-code?mobileNo=${mobileNo}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/user/get-login-sms-validate-code?mobileNo=${mobileNo}`,
  method: 'get'
 });
@@ -76,4 +96,14 @@ export const getWebAuth4jLogin = (data) => request({
  url: `/webauthn/login`,
  method: 'idaasPost',
  data: data
+});
+/**
+ * 记录更新密码时间
+ * @param logonUser 
+ * @returns 
+ */
+export const recordUpdateTime = (logonUser: string) => request({
+  url: `${import.meta.env.VITE_API_COMMON_URL}/user/record-update-password-time?logonUser=${logonUser}`,
+  method: 'put'
 });
\ No newline at end of file
--- a/src/api/modules/queryService.ts
View file @72f8f1f
+++ b/src/api/modules/queryService.ts
View file @72f8f1f
@@ -31,10 +31,10 @@ export const getSystemMenu = (params, isAdmin = false) => {
    url:
      isAdmin
        ? `${
-            import.meta.env.VITE_APP_AUTH_URL
+            import.meta.env.VITE_API_COMMON_URL
          }/product-menu-permission/tenant/get-product-menu?tenantGuid=${params.tenantGuid}&platformSystemGuid=4149c763d70948b195eb3d4b997c1722`
        : `${
-            import.meta.env.VITE_APP_AUTH_URL
+            import.meta.env.VITE_API_COMMON_URL
          }/product-menu-permission/staff/get-product-menu-template?platformSystemGuid=4149c763d70948b195eb3d4b997c1722&funcPermissionTemplateGuid=${params.roleGuid}`,
    method: "get",
  });
@@ -43,7 +43,7 @@ export const getSystemMenu = (params, isAdmin = false) => {
 // 获取当前用户对应的产品和菜单
 export const getUserInfo = () => {
  return request({
-    url: `${import.meta.env.VITE_APP_API_BASEURL}/menu/data/get-product-menu-by-currentuser`,
+    url: `${import.meta.env.VITE_API_COMMON_URL}/menu/data/get-product-menu-by-currentuser`,
    method: 'get'
  })
 }
@@ -99,13 +99,13 @@ export const getTenantInfo = (params) => request({
 })
 // 查看平台会员详情
 export const getTenantDetailInfo = (params) => request({
-  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/tenant/getByGuid/${params}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/tenant/getByGuid/${params}`,
  method: 'get'
 })
 // 查看人员详情
 export const getStaffDetailInfo = (params) => request({
-  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/staff/getByGuid/${params}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/staff/getByGuid/${params}`,
  method: 'get'
 })
@@ -299,7 +299,7 @@ export const checkDataSourceConnectTest = (params) => request({
 });
 export const getParamsDictList = (dictType) => request({
-    url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/connector-invoke/platform/get-by-dictType?dictType=${dictType}`,
+    url: `${import.meta.env.VITE_API_COMMON_URL}/connector-invoke/platform/get-by-dictType?dictType=${dictType}`,
    method: 'get',
 })
@@ -327,7 +327,7 @@ export const exportTemplate = (params) => request({
 /** 获取字典列表数据 */
 export const getParamsList = (params) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/connector-invoke/platform/get-by-dictType`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/connector-invoke/platform/get-by-dictType`,
  method: 'get',
  params
 })
--- a/src/api/modules/workFlowService.ts
View file @72f8f1f
+++ b/src/api/modules/workFlowService.ts
View file @72f8f1f
@@ -22,7 +22,7 @@ export const rejectFlowData = (params, serviceTenantGuid:any=null) => request({
 })
 // 审批撤销
 export const revokeFlowData = (params, serviceTenantGuid:any=null) => request({
-  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/connector-invoke/data/canal-flow${ serviceTenantGuid ? `?serviceTenantGuid=${serviceTenantGuid}` : '' }`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/connector-invoke/data/canal-flow${ serviceTenantGuid ? `?serviceTenantGuid=${serviceTenantGuid}` : '' }`,
  method: 'post',
  data: params
 })
--- a/src/components/Retrievepassword/index.vue
View file @72f8f1f
+++ b/src/components/Retrievepassword/index.vue
View file @72f8f1f
 <template>
  <div>
    <DialogPlus modal-class="auth-user" append-to-body v-model="dialogVisible" @open="openedDialog" width="460px"
-      maxHeight="250px" :close-on-click-modal="false" title="用户身份认证">
+      maxHeight="280px" :close-on-click-modal="false" title="用户身份认证">
      <div class="select-tenant">
        <el-form v-show="formType == 'validate'" label-position="top" ref="registerFormRef" :model="registerForm"
          :rules="registerRules" class="login-form" auto-complete="on">
@@ -51,14 +51,16 @@
        </el-form>
      </div>
      <template #footer>
-        <el-button @click="closeDialog">取 消</el-button>
+        <div class="dialog-footer">
-        <el-button v-show="formType === 'validate'" :loading="sendCodeLoading" type="primary"
+          <el-button @click="closeDialog">取 消</el-button>
-          @click="handleSendCaptcha">发送验证码至手机</el-button>
+          <el-button v-show="formType === 'validate'" :loading="sendCodeLoading" type="primary"
-        <el-button v-show="formType === 'reset' && timeLeft > 0" :loading="saveLoading" type="primary"
+            @click="handleSendCaptcha">发送验证码至手机</el-button>
-          :disabled="!resetForm.smsCode || !resetForm.pwd || !resetForm.checkPwd"
+          <el-button v-show="formType === 'reset' && timeLeft > 0" :loading="saveLoading" type="primary"
-          @click.prevent="handleReset">修改密码</el-button>
+            :disabled="!resetForm.smsCode || !resetForm.pwd || !resetForm.checkPwd"
-        <el-button v-show="formType === 'reset' && timeLeft == 0" :loading="saveLoading" type="primary"
+            @click.prevent="handleReset">修改密码</el-button>
-          @click.prevent="recertification">重新认证</el-button>
+          <el-button v-show="formType === 'reset' && timeLeft == 0" :loading="saveLoading" type="primary"
+            @click.prevent="recertification">重新认证</el-button>
+        </div>
      </template>
    </DialogPlus>
  </div>
@@ -71,7 +73,10 @@ import type { FormRules } from 'element-plus'
 import { propTypes } from '@/utils/propTypes'
 import useIdaasStore from '@/store/modules/idaas';
 import {
-  getPictureCode
+  getPictureCode,
+  sendCode,
+  resetPwd,
+  recordUpdateTime
 } from "@/api/modules/idaas"
 import useLogin from '@/store/modules/login'
 import PasswordStrengthMeter from '../PasswordStrengthMeter/index.vue'
@@ -253,9 +258,11 @@ const refreshPictureCode = () => {
 function getPictureCodeInfo() {
  promise.value = getPictureCode().then((res: any) => {
    promise.value = null;
-    if (res.data.code == proxy.$passCode) {
+    if (res?.code == proxy.$passCode) {
-      imgCaptchaBase64.value = res.data.data?.imageBase64 || "";
+      imgCaptchaBase64.value = res.data?.imageBase64 || "";
-      validateCodeGuid.value = res.data.data?.guid || "";
+      validateCodeGuid.value = res.data?.guid || "";
+    }  else {
+      res?.msg && proxy.$ElMessage.error(res.msg);
    }
  });
 }
@@ -266,9 +273,9 @@ const handleSendCaptcha = () => {
      sendCodeLoading.value = true
      let params: any = { ...registerForm.value };
      params.validateCodeGuid = validateCodeGuid.value;
-      idaasApi.sendCode(params).then((res: any) => {
+      sendCode(params).then((res: any) => {
        sendCodeLoading.value = false;
-        if (res?.data.code == proxy.$passCode) {
+        if (res?.code == proxy.$passCode) {
          proxy.$ElMessage.success('验证码发送成功！');
          loginStore.firstUnmetRequirement = ''
          formType.value = 'reset';
@@ -290,14 +297,38 @@ async function handleReset() {
  if (!res) return
  let params = Object.assign({}, resetForm.value, { mobileNo: registerForm.value.mobileNo, logonUser: registerForm.value.logonUser });
  params.pwd = autoSalt(params.pwd, false, false);
-  idaasApi.resetPwd(params).then((res: any) => {
+  resetPwd(params).then((res: any) => {
-    if (res.data.code == proxy.$passCode) {
+    if (res?.code == proxy.$passCode) {
      proxy.$ElMessage.success('密码重置成功');
      dialogVisible.value = false;
-      userApi.recordUpdateTime(registerForm.value.logonUser)
+      recordUpdateTime(registerForm.value.logonUser)
+    } else {
+      res?.msg && proxy.$ElMessage.error(res.msg);
    }
  });
 }
-</script>
\ No newline at end of file
+</script>
+<style lang="scss" scoped> 
+.code-desc {
+  font-size: 12px;
+  color: #999999;
+  letter-spacing: 0;
+  line-height: 17px;
+  font-weight: 400;
+  margin-top: 2px;
+}
+.h-26px {
+  height: 26px;
+}
+:deep(.el-form-item) {
+  .el-form-item__label {
+    margin-bottom: 2px !important
+  }
+}
+</style>
\ No newline at end of file
--- a/src/layouts/components/Tools/index.vue
View file @72f8f1f
+++ b/src/layouts/components/Tools/index.vue
View file @72f8f1f
@@ -142,7 +142,7 @@ const verifyDialogBtnClick = (btn, info) => {
                {{ userStore.userName }}
              </div>
              <div class="text-left">
-                账号: {{ userData.mobileNo.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2') }}
+                账号: {{ userData.mobileNo?.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2') }}
              </div>
            </div>
          </div>
--- a/src/layouts/index.vue
View file @72f8f1f
+++ b/src/layouts/index.vue
View file @72f8f1f
@@ -16,13 +16,11 @@ import {
 } from "@element-plus/icons-vue";
 import { getAllMessageList, getMessageCount, updateMessageState, updateAllFinish } from '@/api/modules/queryService';
 import useUserStore from "@/store/modules/user";
-import useDataFinanceStore from "@/store/modules/dataFinance";
 import Moment from 'moment';
 const router = useRouter()
 const userStore = useUserStore();
 const userData = JSON.parse(userStore.userData)
-const financeStore = useDataFinanceStore();
 const { proxy } = getCurrentInstance() as any;
 const routeInfo = useRoute()
@@ -167,10 +165,10 @@ const messageJump = (item) => {
      proxy.$ElMessage.error('url地址不对');
      return;
    }
-    let params = item.jumpUrl.substring(index + 1);
+   // let params = item.jumpUrl.substring(index + 1);
-    let searchParams = new URLSearchParams(params);
+   // let searchParams = new URLSearchParams(params);
-    financeStore.setCircuGUid(searchParams.get("guid") || '');
+    // financeStore.setCircuGUid(searchParams.get("guid") || '');
-    financeStore.setGoodsName(searchParams.get("goodsName") || "");
+    // financeStore.setGoodsName(searchParams.get("goodsName") || "");
    let goPath = item.jumpUrl.substring(0, index);
    router.push({
      path: goPath
--- a/src/utils/request.ts
View file @72f8f1f
+++ b/src/utils/request.ts
View file @72f8f1f
@@ -58,7 +58,10 @@ service.interceptors.request.use(
      } else if (config.method === "idaasGet" || config.method === "idaasget") {
        config.baseURL = IDaaSBaseURL;
        config.method = "get";
-      }
+      } else if (config.method === "idaasPut" || config.method === "idaasput") {
+        config.baseURL = IDaaSBaseURL;
+        config.method = "put";
+      } 
      if (config.responseType == "blob") {
        // 文件流，文件名称相同时会判定同一个请求。
        config.headers.Authorization = localStorage.getItem('token');
--- a/src/views/data_basic/departmentInfoList.vue
View file @72f8f1f
+++ b/src/views/data_basic/departmentInfoList.vue
View file @72f8f1f
@@ -229,7 +229,7 @@ const toDetail = (scope) => {
 const toDelete = (scope) => {
  proxy.$openMessageBox("数据删除后不可恢复，确定是否删除？", "warning", () => {
    removeOrganisation([scope.row.guid]).then((res: any) => {
-      if (res.data.code === proxy.$passCode) {
+      if (res?.code === proxy.$passCode) {
        proxy.$ElMessage({
          type: 'success',
          message: '删除成功'
@@ -237,7 +237,7 @@ const toDelete = (scope) => {
        page.value.curr = 1;
        getTableData();
      } else {
-        proxy.$ElMessage({
+        res?.msg && proxy.$ElMessage({
          type: 'error',
          message: res.msg,
        })
--- a/src/views/portal/portalLogin.vue
View file @72f8f1f
+++ b/src/views/portal/portalLogin.vue
View file @72f8f1f
@@ -269,7 +269,7 @@ const loginTitle = computed(() => {
  return formTypeMap[formType.value] || '注册申请';
 });
-const formType = ref(proxy.$route.query.formType || 'beforeLogin');
+const formType = ref(route.query.formType || 'beforeLogin');
 const beforeLoginFormRef = ref() // 登录前表单
 const loginFormRef = ref() // 登录表单
 const registerForm = ref() // 注册表单
@@ -675,8 +675,8 @@ async function getLoginSmsCode() {
  let validate = await loginFormRef.value.formValidation(['mobileNo']);
  if (validate) {
    let params = await loginFormRef.value.getData()
-    sendLoginCode(params.mobileNo).then(res=>{
+    sendLoginCode(params.mobileNo).then((res: any) => {
-      if (res.data.code == proxy.$passCode) {
+      if (res?.code == proxy.$passCode) {
        sendCodeLoading2.value = true;
        disabledverifyUser.value = false;
        loginFormRef.value.formValidation(['smsCode']);
@@ -765,13 +765,16 @@ async function beforeLogin() {
  let validate = await beforeLoginFormRef.value.formValidation();
  if (!validate) return
  let formData = await beforeLoginFormRef.value.getData();
-  debugger
  let _logonUser = formData.logonUser;
  let password = formData.password;
  loginStore.encodePwd = CryptoJS.AES.encrypt(password, sysConfigStore().getConfig('appKey')).toString();
+  loading.value = true;
  let loginRes = await idaasStore.login(formData);
+  loading.value = false;
  if (!loginRes) return
+  loading.value = true;
  let res: any = await checkLoginUser(_logonUser)
+  loading.value = false;
  if (res?.code != '00000') {
     res?.msg && proxy.$message.error(res?.msg);
     return;
@@ -839,23 +842,23 @@ async function beforeLogin() {
 */
 async function handleLogin(params) {
  loading.value = true
-  let client_id = params.client_id = proxy.$route.query.client_id;
+  let client_id = params.client_id = route.query.client_id;
-  let redirect_uri = params.redirect_uri = proxy.$route.query.redirect_uri;
+  let redirect_uri: any = params.redirect_uri = route.query.redirect_uri;
  loginStore.smsValidateCode = params.smsCode
  idaasStore.login(params).then((res: any) => {
    loading.value = false
-    const result = isJsonString(res) ? JSON.parse(res) : res;
+    //const result = isJsonString(res) ? JSON.parse(res) : res;
-    let scope = result.data.authorities?.map(a => a.authority).join(' ');
+    // let scope = result.data.authorities?.map(a => a.authority).join(' ');
    if (!client_id) {
      client_id = sysConfigStore().getConfig('appKey');
    }
    let hrefOrigin = window.location.origin;
    if (!redirect_uri) {
-      redirect_uri = hrefOrigin + '/login';
+      redirect_uri = hrefOrigin + '/';
    }
    let state = createStateHashCode();
    let url = `${hrefOrigin}/idaas/oauth2/authorize?response_type=${LOGINCODE.response_type}&client_id=${client_id}&scope=other&state=${state}&redirect_uri=${encodeURIComponent(redirect_uri)}`
-    localStorage.setItem('idaas_code_url', url)
+   // localStorage.setItem('idaas_code_url', url)
    window.location.href = url
  }).catch(() => {
    loading.value = false
@@ -890,11 +893,11 @@ async function handleLogin(params) {
 //   })
 // }
-//const logout = ref(proxy.$route.query.logout);
+//const logout = ref(route.query.logout);
 // // 存储跳转其他系统的url参数
 // function saveQueryParams() {
-//   let query = proxy.$route.query;
+//   let query = route.query;
 //   routeStore.fromUrl = query.fromUrl
 //   routeStore.toUrl = query.toUrl
 //   routeStore.backUrl = query.backUrl
@@ -956,12 +959,14 @@ const passKeySign = async () => {
  let validate = await beforeLoginFormRef.value.submitForm()
  if (validate) {
    let params = await beforeLoginFormRef.value.getData()
+    debugger
+    let platform = navigator.userAgentData?.platform || navigator.platform;
    checkDeviceTypeRegist({
      logonUser: params.logonUser,
-      platform: navigator.userAgentData.platform
+      platform: platform
    }).then((response: any) => {
      console.log(response)
-      if (response.data.code === '00000') {
+      if (response?.code === '00000') {
        createCredential().then((credential: any) => {
          console.log(credential)
          let userRQVO = {
@@ -971,7 +976,7 @@ const passKeySign = async () => {
              clientDataJSON: Base64url.encodeBase64url(credential.response.clientDataJSON),
              attestationObject: Base64url.encodeBase64url(credential.response.attestationObject),
              clientExtensions: JSON.stringify(credential.getClientExtensionResults()),
-              deviceType: navigator.userAgentData.platform
+              deviceType: platform
            }
          }
          passKeyRegisterloading.value = true;
@@ -988,6 +993,8 @@ const passKeySign = async () => {
            passKeyRegisterloading.value = false;
          })
        })
+      } else {
+        response?.msg && proxy.$message.error(response.msg);
      }
    })
  }
@@ -1031,8 +1038,8 @@ const passKeyLogin = () => {
      passKeyLoginloading.value = false;
      const result = typeof res.data == 'string' ? JSON.parse(res.data) : res.data;
      if (result.code == '00000') {//第一次初始化登录。
-        let client_id = proxy.$route.query.client_id;
+        let client_id = route.query.client_id;
-        let redirect_uri = proxy.$route.query.redirect_uri;
+        let redirect_uri = route.query.redirect_uri;
        if (!client_id) {
          client_id = sysConfigStore().getConfig('appKey');
        }