登录接口联调

@@ -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
 

@@ -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",

@@ -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'}

@@ -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
 })

@@ -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

@@ -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
 })

@@ -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'
 })
 

@@ -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`,
-  method: 'get',
+  url: `/user/validate-code/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'
 });
 
@@ -77,3 +97,13 @@ export const getWebAuth4jLogin = (data) => request({
   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

@@ -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
 })

@@ -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
 })

 <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,6 +51,7 @@
         </el-form>
       </div>
       <template #footer>
+        <div class="dialog-footer">
           <el-button @click="closeDialog">取 消</el-button>
           <el-button v-show="formType === 'validate'" :loading="sendCodeLoading" type="primary"
             @click="handleSendCaptcha">发送验证码至手机</el-button>
@@ -59,6 +60,7 @@
             @click.prevent="handleReset">修改密码</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) {
-      imgCaptchaBase64.value = res.data.data?.imageBase64 || "";
-      validateCodeGuid.value = res.data.data?.guid || "";
+    if (res?.code == proxy.$passCode) {
+      imgCaptchaBase64.value = res.data?.imageBase64 || "";
+      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) => {
-    if (res.data.code == proxy.$passCode) {
+  resetPwd(params).then((res: any) => {
+    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>
+
+<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

@@ -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>

@@ -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 searchParams = new URLSearchParams(params);
-    financeStore.setCircuGUid(searchParams.get("guid") || '');
-    financeStore.setGoodsName(searchParams.get("goodsName") || "");
+   // let params = item.jumpUrl.substring(index + 1);
+   // let searchParams = new URLSearchParams(params);
+    // financeStore.setCircuGUid(searchParams.get("guid") || '');
+    // financeStore.setGoodsName(searchParams.get("goodsName") || "");
     let goPath = item.jumpUrl.substring(0, index);
     router.push({
       path: goPath

@@ -58,6 +58,9 @@ 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") {
         // 文件流，文件名称相同时会判定同一个请求。

@@ -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,
         })

@@ -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=>{
-      if (res.data.code == proxy.$passCode) {
+    sendLoginCode(params.mobileNo).then((res: any) => {
+      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 redirect_uri = params.redirect_uri = proxy.$route.query.redirect_uri;
+  let client_id = params.client_id = route.query.client_id;
+  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;
-    let scope = result.data.authorities?.map(a => a.authority).join(' ');
+    //const result = isJsonString(res) ? JSON.parse(res) : res;
+    // 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 redirect_uri = proxy.$route.query.redirect_uri;
+        let client_id = route.query.client_id;
+        let redirect_uri = route.query.redirect_uri;
         if (!client_id) {
           client_id = sysConfigStore().getConfig('appKey');
         }