vue2-client 1.10.27 → 1.10.30

package/src/services/DataModel.js

@@ -1,30 +1,30 @@
-import { post } from '@vue2-client/services/api'
-import { message } from 'ant-design-vue'
-
-export default class DataModel {
-  // 用url及pageSize构造
-  // url - 加载数据的url
-  // params - 除正常查询条件外，附加到后台sql中的参数，可以为空。格式为:{参数名:参数值}
-  constructor ({ billUrl, serviceName, ...params }) {
-    this.billUrl = billUrl
-    this.params = params
-    this.serviceName = serviceName
-    this.data = undefined
-  }
-
-  // 执行查询过程，加载数据汇总信息
-  // condition - 查询组件产生的查询条件
-  // model - 查询组件收集到的输入数据
-  search () {
-    return post(`/api/${this.serviceName}/report/${this.billUrl}`, { data: this.params }).then(
-      (res) => {
-        this.data = res.value || res
-      }
-    ).catch(
-      () => {
-        this.data = undefined
-        message.error('获取票据信息失败')
-      }
-    )
-  }
-}
+import { post } from '@vue2-client/services/api'
+import { message } from 'ant-design-vue'
+
+export default class DataModel {
+  // 用url及pageSize构造
+  // url - 加载数据的url
+  // params - 除正常查询条件外，附加到后台sql中的参数，可以为空。格式为:{参数名:参数值}
+  constructor ({ billUrl, serviceName, ...params }) {
+    this.billUrl = billUrl
+    this.params = params
+    this.serviceName = serviceName
+    this.data = undefined
+  }
+
+  // 执行查询过程，加载数据汇总信息
+  // condition - 查询组件产生的查询条件
+  // model - 查询组件收集到的输入数据
+  search () {
+    return post(`/api/${this.serviceName}/report/${this.billUrl}`, { data: this.params }).then(
+      (res) => {
+        this.data = res.value || res
+      }
+    ).catch(
+      () => {
+        this.data = undefined
+        message.error('获取票据信息失败')
+      }
+    )
+  }
+}

package/src/services/LodopFuncs.js

@@ -1,137 +1,137 @@
-import { message } from 'ant-design-vue'
-
-let CreatedOKLodop7766 = null
-
-function loadScriptAsync (src) {
-  return new Promise((resolve, reject) => {
-    const script = document.createElement('script')
-    script.src = src
-    script.async = true
-    script.onload = resolve
-    script.onerror = reject
-    document.head.appendChild(script)
-  })
-}
-
-// ====判断是否需要安装CLodop云打印服务器:====
-function needCLodop () {
-  // return false;
-  try {
-    // 看是什么浏览器
-    const ua = navigator.userAgent
-    // windows，安装
-    if (ua.match(/Windows\sPhone/i) != null) return true
-    // iPhone, 安装
-    if (ua.match(/iPhone|iPod/i) != null) return true
-    // Android, 安装
-    if (ua.match(/Android/i) != null) return true
-    // Edge，安装
-    if (ua.match(/Edge\D?\d+/i) != null) return true
-    // QQ，不安装
-    if (ua.match(/QQBrowser/i) != null) return false
-
-    const verTrident = ua.match(/Trident\D?\d+/i)
-    const verIE = ua.match(/MSIE\D?\d+/i)
-    let verOPR = ua.match(/OPR\D?\d+/i)
-    let verFF = ua.match(/Firefox\D?\d+/i)
-    const x64 = ua.match(/x64/i)
-    if ((verTrident == null) && (verIE == null) && (x64 !== null)) {
-      return true
-    } else if (verFF !== null) {
-      verFF = verFF[0].match(/\d+/)
-      if (verFF[0] >= 42) return true
-    } else if (verOPR !== null) {
-      verOPR = verOPR[0].match(/\d+/)
-      if (verOPR[0] >= 32) return true
-    } else if ((verTrident == null) && (verIE == null)) {
-      let verChrome = ua.match(/Chrome\D?\d+/i)
-      if (verChrome !== null) {
-        verChrome = verChrome[0].match(/\d+/)
-        if (verChrome[0] >= 42) return true
-      }
-    }
-    return false
-  } catch (err) {
-    return true
-  }
-}
-
-// ====页面引用CLodop云打印必须的JS文件：====
-if (needCLodop()) {
-  loadScriptAsync('http://localhost:18000/CLodopfuncs.js?priority=1')
-}
-
-// ====获取LODOP对象的主过程：====
-function getLodop (oOBJECT, oEMBED) {
-  // 显示提示用的内容
-  // const strHtmInstall = "<br><font color='#FF00FF'>打印控件未安装!点击这里<a href='http://113.10.155.131/install_lodop32.zip' target='_self'>执行安装</a>,安装后请刷新页面或重新进入。</font>"
-  // const strHtmUpdate = "<br><font color='#FF00FF'>打印控件需要升级!点击这里<a href='http://113.10.155.131/install_lodop32.zip' target='_self'>执行升级</a>,升级后请重新进入。</font>"
-  // const strHtm64_Install = "<br><font color='#FF00FF'>打印控件未安装!点击这里<a href='http://113.10.155.131/install_lodop64.zip' target='_self'>执行安装</a>,安装后请刷新页面或重新进入。</font>"
-  // const strHtm64_Update = "<br><font color='#FF00FF'>打印控件需要升级!点击这里<a href='http://113.10.155.131/install_lodop64.zip' target='_self'>执行升级</a>,升级后请重新进入。</font>"
-  // const strHtmFireFox = "<br><br><font color='#FF00FF'>（注意：如曾安装过Lodop旧版附件npActiveXPLugin,请在【工具】->【附加组件】->【扩展】中先卸它）</font>"
-  // const strHtmChrome = "<br><br><font color='#FF00FF'>(如果此前正常，仅因浏览器升级或重安装而出问题，需重新执行以上安装）</font>"
-  // const strCLodopInstall = "<br><font color='#FF00FF'>CLodop云打印服务(localhost本地)未安装启动!点击这里<a href='CLodopPrint_Setup_for_Win32NT.zip' target='_self'>执行安装</a>,安装后请刷新页面。</font>"
-  // const strCLodopUpdate = "<br><font color='#FF00FF'>CLodop云打印服务需升级!点击这里<a href='CLodopPrint_Setup_for_Win32NT.zip' target='_self'>执行升级</a>,升级后请刷新页面。</font>"
-
-  let LODOP
-  try {
-    const isIE = (navigator.userAgent.indexOf('MSIE') >= 0) || (navigator.userAgent.indexOf('Trident') >= 0)
-    if (needCLodop()) {
-      try {
-        // 调用脚本中的获取打印对象
-        // eslint-disable-next-line no-undef
-        LODOP = getCLodop()
-      } catch (err) {
-      }
-      // 如果没找到打印控件
-      if (!LODOP && document.readyState !== 'complete') {
-        message.warning('C-Lodop没准备好，请稍后再试！')
-        return
-      }
-      if (!LODOP) {
-        message.warning('CLodop云打印服务(localhost本地)未安装启动!请开启后补打!')
-        return
-      } else { // 找到后的处理
-        // eslint-disable-next-line no-undef
-        if (CLODOP.CVERSION < '2.0.6.2') {
-          message.warning('CLodop云打印运行异常!')
-        }
-        if (oEMBED && oEMBED.parentNode) oEMBED.parentNode.removeChild(oEMBED)
-        if (oOBJECT && oOBJECT.parentNode) oOBJECT.parentNode.removeChild(oOBJECT)
-      }
-    } else {
-      // =====如果页面有Lodop就直接使用，没有则新建:==========
-      if (oOBJECT !== undefined || oEMBED !== undefined) {
-        if (isIE) LODOP = oOBJECT
-        else LODOP = oEMBED
-      } else if (CreatedOKLodop7766 == null) {
-        LODOP = document.createElement('object')
-        LODOP.setAttribute('width', 0)
-        LODOP.setAttribute('height', 0)
-        LODOP.setAttribute('style', 'position:absolute;left:0px;top:-100px;width:0px;height:0px;')
-        if (isIE) LODOP.setAttribute('classid', 'clsid:2105C259-1E0C-4534-8141-A753534CB4CA')
-        else LODOP.setAttribute('type', 'application/x-print-lodop')
-        document.documentElement.appendChild(LODOP)
-        CreatedOKLodop7766 = LODOP
-      } else LODOP = CreatedOKLodop7766
-      // =====Lodop插件未安装时提示下载地址:==========
-      if ((LODOP == null) || (typeof (LODOP.VERSION) === 'undefined')) {
-        message.warning('CLodop云打印运行异常!')
-        return LODOP
-      }
-    }
-
-    // 检查版本
-    if (LODOP.VERSION < '6.2.0.3') {
-      message.warning('CLodop云打印运行异常!')
-      return LODOP
-    }
-    // ===如下空白位置适合调用统一功能(如注册语句、语言选择等):===
-    LODOP.SET_LICENSES('西安奥枫软件有限公司', '552C41D5AB0D146FCF77D05CD8AA15A1', '', '')
-    return LODOP
-  } catch (err) {
-    alert('getLodop出错:' + err)
-  }
-}
-
-export default getLodop
+import { message } from 'ant-design-vue'
+
+let CreatedOKLodop7766 = null
+
+function loadScriptAsync (src) {
+  return new Promise((resolve, reject) => {
+    const script = document.createElement('script')
+    script.src = src
+    script.async = true
+    script.onload = resolve
+    script.onerror = reject
+    document.head.appendChild(script)
+  })
+}
+
+// ====判断是否需要安装CLodop云打印服务器:====
+function needCLodop () {
+  // return false;
+  try {
+    // 看是什么浏览器
+    const ua = navigator.userAgent
+    // windows，安装
+    if (ua.match(/Windows\sPhone/i) != null) return true
+    // iPhone, 安装
+    if (ua.match(/iPhone|iPod/i) != null) return true
+    // Android, 安装
+    if (ua.match(/Android/i) != null) return true
+    // Edge，安装
+    if (ua.match(/Edge\D?\d+/i) != null) return true
+    // QQ，不安装
+    if (ua.match(/QQBrowser/i) != null) return false
+
+    const verTrident = ua.match(/Trident\D?\d+/i)
+    const verIE = ua.match(/MSIE\D?\d+/i)
+    let verOPR = ua.match(/OPR\D?\d+/i)
+    let verFF = ua.match(/Firefox\D?\d+/i)
+    const x64 = ua.match(/x64/i)
+    if ((verTrident == null) && (verIE == null) && (x64 !== null)) {
+      return true
+    } else if (verFF !== null) {
+      verFF = verFF[0].match(/\d+/)
+      if (verFF[0] >= 42) return true
+    } else if (verOPR !== null) {
+      verOPR = verOPR[0].match(/\d+/)
+      if (verOPR[0] >= 32) return true
+    } else if ((verTrident == null) && (verIE == null)) {
+      let verChrome = ua.match(/Chrome\D?\d+/i)
+      if (verChrome !== null) {
+        verChrome = verChrome[0].match(/\d+/)
+        if (verChrome[0] >= 42) return true
+      }
+    }
+    return false
+  } catch (err) {
+    return true
+  }
+}
+
+// ====页面引用CLodop云打印必须的JS文件：====
+if (needCLodop()) {
+  loadScriptAsync('http://localhost:18000/CLodopfuncs.js?priority=1')
+}
+
+// ====获取LODOP对象的主过程：====
+function getLodop (oOBJECT, oEMBED) {
+  // 显示提示用的内容
+  // const strHtmInstall = "<br><font color='#FF00FF'>打印控件未安装!点击这里<a href='http://113.10.155.131/install_lodop32.zip' target='_self'>执行安装</a>,安装后请刷新页面或重新进入。</font>"
+  // const strHtmUpdate = "<br><font color='#FF00FF'>打印控件需要升级!点击这里<a href='http://113.10.155.131/install_lodop32.zip' target='_self'>执行升级</a>,升级后请重新进入。</font>"
+  // const strHtm64_Install = "<br><font color='#FF00FF'>打印控件未安装!点击这里<a href='http://113.10.155.131/install_lodop64.zip' target='_self'>执行安装</a>,安装后请刷新页面或重新进入。</font>"
+  // const strHtm64_Update = "<br><font color='#FF00FF'>打印控件需要升级!点击这里<a href='http://113.10.155.131/install_lodop64.zip' target='_self'>执行升级</a>,升级后请重新进入。</font>"
+  // const strHtmFireFox = "<br><br><font color='#FF00FF'>（注意：如曾安装过Lodop旧版附件npActiveXPLugin,请在【工具】->【附加组件】->【扩展】中先卸它）</font>"
+  // const strHtmChrome = "<br><br><font color='#FF00FF'>(如果此前正常，仅因浏览器升级或重安装而出问题，需重新执行以上安装）</font>"
+  // const strCLodopInstall = "<br><font color='#FF00FF'>CLodop云打印服务(localhost本地)未安装启动!点击这里<a href='CLodopPrint_Setup_for_Win32NT.zip' target='_self'>执行安装</a>,安装后请刷新页面。</font>"
+  // const strCLodopUpdate = "<br><font color='#FF00FF'>CLodop云打印服务需升级!点击这里<a href='CLodopPrint_Setup_for_Win32NT.zip' target='_self'>执行升级</a>,升级后请刷新页面。</font>"
+
+  let LODOP
+  try {
+    const isIE = (navigator.userAgent.indexOf('MSIE') >= 0) || (navigator.userAgent.indexOf('Trident') >= 0)
+    if (needCLodop()) {
+      try {
+        // 调用脚本中的获取打印对象
+        // eslint-disable-next-line no-undef
+        LODOP = getCLodop()
+      } catch (err) {
+      }
+      // 如果没找到打印控件
+      if (!LODOP && document.readyState !== 'complete') {
+        message.warning('C-Lodop没准备好，请稍后再试！')
+        return
+      }
+      if (!LODOP) {
+        message.warning('CLodop云打印服务(localhost本地)未安装启动!请开启后补打!')
+        return
+      } else { // 找到后的处理
+        // eslint-disable-next-line no-undef
+        if (CLODOP.CVERSION < '2.0.6.2') {
+          message.warning('CLodop云打印运行异常!')
+        }
+        if (oEMBED && oEMBED.parentNode) oEMBED.parentNode.removeChild(oEMBED)
+        if (oOBJECT && oOBJECT.parentNode) oOBJECT.parentNode.removeChild(oOBJECT)
+      }
+    } else {
+      // =====如果页面有Lodop就直接使用，没有则新建:==========
+      if (oOBJECT !== undefined || oEMBED !== undefined) {
+        if (isIE) LODOP = oOBJECT
+        else LODOP = oEMBED
+      } else if (CreatedOKLodop7766 == null) {
+        LODOP = document.createElement('object')
+        LODOP.setAttribute('width', 0)
+        LODOP.setAttribute('height', 0)
+        LODOP.setAttribute('style', 'position:absolute;left:0px;top:-100px;width:0px;height:0px;')
+        if (isIE) LODOP.setAttribute('classid', 'clsid:2105C259-1E0C-4534-8141-A753534CB4CA')
+        else LODOP.setAttribute('type', 'application/x-print-lodop')
+        document.documentElement.appendChild(LODOP)
+        CreatedOKLodop7766 = LODOP
+      } else LODOP = CreatedOKLodop7766
+      // =====Lodop插件未安装时提示下载地址:==========
+      if ((LODOP == null) || (typeof (LODOP.VERSION) === 'undefined')) {
+        message.warning('CLodop云打印运行异常!')
+        return LODOP
+      }
+    }
+
+    // 检查版本
+    if (LODOP.VERSION < '6.2.0.3') {
+      message.warning('CLodop云打印运行异常!')
+      return LODOP
+    }
+    // ===如下空白位置适合调用统一功能(如注册语句、语言选择等):===
+    LODOP.SET_LICENSES('西安奥枫软件有限公司', '552C41D5AB0D146FCF77D05CD8AA15A1', '', '')
+    return LODOP
+  } catch (err) {
+    alert('getLodop出错:' + err)
+  }
+}
+
+export default getLodop

package/src/services/api/TicketDetailsViewApi.js

@@ -1,46 +1,46 @@
-const TicketDetailsViewApi = {
-  // 查询：获取工单流转详情
-  getTicketWorkFlowDetails: '/api/af-system/logic/getTicketWorkFlowDetails',
-  // 查询：获取工单详情
-  getTicketDetails: '/api/af-system/logic/getTicketDetails',
-  // 手动关闭工单
-  manualCloseTicket: '/api/af-system/logic/manualCloseTicket',
-  // 转交工单给其他人
-  transferTicketToOthers: '/api/af-system/logic/transferTicketToOthers',
-  // 确认工单，开始处理
-  confirmTicket: '/api/af-system/logic/confirmTicket',
-  // 查询：获取订单详情用于订单追踪
-  getTicketDetailsForUploader: '/api/af-system/logic/getTicketDetailsForUploader',
-  // 更新：将工单优先级增加
-  rushTicket: '/api/af-system/logic/rushTicket',
-  // 客户手动关闭工单
-  manualCloseTicketByCustomer: '/api/af-system/logic/manualCloseTicketByCustomer',
-  // 在工单提交页面删除照片
-  revocationImage: '/api/af-system/logic/revocationImage',
-  // 在工单提交页面删除照片
-  getTicketImages: '/api/af-system/logic/getTicketImages',
-  // 用户填写附加信息时取消了操作，将已上传的照片清空
-  removeAllImages: '/api/af-system/logic/removeAllImages',
-  // 提交用户填写附加信息
-  AddonDescriptionToTicket: '/api/af-system/logic/AddonDescriptionToTicket',
-  // 获取用户填写附加信息
-  getAddonDescription: '/api/af-system/logic/getAddonDescription',
-  // 发起售后工单流程
-  createTicket: '/api/af-system/logic/createTicket',
-  // 查询：获取所有员工名，供前端展示备选项
-  getAllEmployeeName: '/api/af-system/logic/getAllEmployeeName',
-  // 改变报装进度
-  updateApplySubState: '/api/af-system/logic/updateApplySubState',
-  // 保存工作流日志
-  saveApplyWorkflowLog: '/api/af-system/logic/saveApplyWorkflowLog',
-  // 完工确认后更改报装状态
-  afterApplyFinalStepSubmit: '/api/af-system/logic/afterApplyFinalStepSubmit',
-  // 保存用户每一步输入的表单内容
-  saveApplyStepFormData: '/api/af-system/logic/saveApplyStepFormData',
-  // 用户点击 回退/提交 修改工单状态
-  clientSubmit: '/api/af-system/logic/clientSubmit',
-  // 获取已经完成步骤的用户填写数据
-  getApplyCompletedStepData: '/api/af-system/logic/getApplyCompletedStepData',
-}
-
-export { TicketDetailsViewApi }
+const TicketDetailsViewApi = {
+  // 查询：获取工单流转详情
+  getTicketWorkFlowDetails: '/api/af-system/logic/getTicketWorkFlowDetails',
+  // 查询：获取工单详情
+  getTicketDetails: '/api/af-system/logic/getTicketDetails',
+  // 手动关闭工单
+  manualCloseTicket: '/api/af-system/logic/manualCloseTicket',
+  // 转交工单给其他人
+  transferTicketToOthers: '/api/af-system/logic/transferTicketToOthers',
+  // 确认工单，开始处理
+  confirmTicket: '/api/af-system/logic/confirmTicket',
+  // 查询：获取订单详情用于订单追踪
+  getTicketDetailsForUploader: '/api/af-system/logic/getTicketDetailsForUploader',
+  // 更新：将工单优先级增加
+  rushTicket: '/api/af-system/logic/rushTicket',
+  // 客户手动关闭工单
+  manualCloseTicketByCustomer: '/api/af-system/logic/manualCloseTicketByCustomer',
+  // 在工单提交页面删除照片
+  revocationImage: '/api/af-system/logic/revocationImage',
+  // 在工单提交页面删除照片
+  getTicketImages: '/api/af-system/logic/getTicketImages',
+  // 用户填写附加信息时取消了操作，将已上传的照片清空
+  removeAllImages: '/api/af-system/logic/removeAllImages',
+  // 提交用户填写附加信息
+  AddonDescriptionToTicket: '/api/af-system/logic/AddonDescriptionToTicket',
+  // 获取用户填写附加信息
+  getAddonDescription: '/api/af-system/logic/getAddonDescription',
+  // 发起售后工单流程
+  createTicket: '/api/af-system/logic/createTicket',
+  // 查询：获取所有员工名，供前端展示备选项
+  getAllEmployeeName: '/api/af-system/logic/getAllEmployeeName',
+  // 改变报装进度
+  updateApplySubState: '/api/af-system/logic/updateApplySubState',
+  // 保存工作流日志
+  saveApplyWorkflowLog: '/api/af-system/logic/saveApplyWorkflowLog',
+  // 完工确认后更改报装状态
+  afterApplyFinalStepSubmit: '/api/af-system/logic/afterApplyFinalStepSubmit',
+  // 保存用户每一步输入的表单内容
+  saveApplyStepFormData: '/api/af-system/logic/saveApplyStepFormData',
+  // 用户点击 回退/提交 修改工单状态
+  clientSubmit: '/api/af-system/logic/clientSubmit',
+  // 获取已经完成步骤的用户填写数据
+  getApplyCompletedStepData: '/api/af-system/logic/getApplyCompletedStepData',
+}
+
+export { TicketDetailsViewApi }

package/src/services/api/cas.js

@@ -1,79 +1,79 @@
-import { post } from '@vue2-client/services/api/restTools'
-import notification from 'ant-design-vue/lib/notification'
-import { logout } from '@vue2-client/services/user'
-import Cookie from 'js-cookie'
-
-const casApi = {
-  // 根据用户信息校验服务访问权限并生成ST
-  createSTByUserInfo: '/api/af-sso/logic/createSTByUserInfo',
-  // 根据TGC生成ST
-  createSTByTGC: '/api/af-sso/logic/createSTByTGC',
-  // 验证ST
-  serviceValidate: '/api/af-sso/logic/openapi/serviceValidate',
-  // 其他验证
-  otherValidate: '/api/af-sso/logic'
-}
-
-function setTGTCookie (cookie) {
-  return Cookie.set('TGT-Cookie', cookie)
-}
-function removeTGTCookie () {
-  return Cookie.remove('TGT-Cookie')
-}
-export function getTGTCookie () {
-  return Cookie.get('TGT-Cookie')
-}
-
-export function CASLoginByAuth (serviceKey) {
-  return new Promise((resolve, reject) => {
-    post(casApi.createSTByUserInfo, {
-      serviceKey: serviceKey
-    }).then(res => {
-      setTGTCookie(res.tgc)
-      resolve(res)
-    }).catch(msg => {
-      reject(msg)
-    })
-  })
-}
-
-export function CASLogin (serviceKey, inner) {
-  // 从第三方跳转登录
-  const tgc = getTGTCookie()
-  if (tgc && !inner) {
-    return new Promise((resolve, reject) => {
-      post(casApi.createSTByTGC, {
-        serviceKey: serviceKey,
-        tgc: tgc
-      }).then(res => {
-        resolve(res)
-      }).catch(msg => {
-        if (msg === '当前操作没有权限') {
-          removeTGTCookie()
-          notification.error({
-            message: '授权已过期，请重新登录',
-            description: '2秒后自动跳转回登陆页面'
-          })
-          logout().then(() => {
-            setTimeout(() => {
-              window.location.href = '/login?serviceKey=' + serviceKey
-            }, 1500)
-          })
-        } else {
-          reject(msg)
-        }
-      })
-    })
-  } else {
-    return CASLoginByAuth(serviceKey)
-  }
-}
-
-export function doOtherValidate (logicName, st, serviceKey) {
-  return post(casApi.otherValidate + '/' + logicName, {
-    st: st,
-    serviceKey: serviceKey
-  }, null)
-}
-
-export default casApi
+import { post } from '@vue2-client/services/api/restTools'
+import notification from 'ant-design-vue/lib/notification'
+import { logout } from '@vue2-client/services/user'
+import Cookie from 'js-cookie'
+
+const casApi = {
+  // 根据用户信息校验服务访问权限并生成ST
+  createSTByUserInfo: '/api/af-sso/logic/createSTByUserInfo',
+  // 根据TGC生成ST
+  createSTByTGC: '/api/af-sso/logic/createSTByTGC',
+  // 验证ST
+  serviceValidate: '/api/af-sso/logic/openapi/serviceValidate',
+  // 其他验证
+  otherValidate: '/api/af-sso/logic'
+}
+
+function setTGTCookie (cookie) {
+  return Cookie.set('TGT-Cookie', cookie)
+}
+function removeTGTCookie () {
+  return Cookie.remove('TGT-Cookie')
+}
+export function getTGTCookie () {
+  return Cookie.get('TGT-Cookie')
+}
+
+export function CASLoginByAuth (serviceKey) {
+  return new Promise((resolve, reject) => {
+    post(casApi.createSTByUserInfo, {
+      serviceKey: serviceKey
+    }).then(res => {
+      setTGTCookie(res.tgc)
+      resolve(res)
+    }).catch(msg => {
+      reject(msg)
+    })
+  })
+}
+
+export function CASLogin (serviceKey, inner) {
+  // 从第三方跳转登录
+  const tgc = getTGTCookie()
+  if (tgc && !inner) {
+    return new Promise((resolve, reject) => {
+      post(casApi.createSTByTGC, {
+        serviceKey: serviceKey,
+        tgc: tgc
+      }).then(res => {
+        resolve(res)
+      }).catch(msg => {
+        if (msg === '当前操作没有权限') {
+          removeTGTCookie()
+          notification.error({
+            message: '授权已过期，请重新登录',
+            description: '2秒后自动跳转回登陆页面'
+          })
+          logout().then(() => {
+            setTimeout(() => {
+              window.location.href = '/login?serviceKey=' + serviceKey
+            }, 1500)
+          })
+        } else {
+          reject(msg)
+        }
+      })
+    })
+  } else {
+    return CASLoginByAuth(serviceKey)
+  }
+}
+
+export function doOtherValidate (logicName, st, serviceKey) {
+  return post(casApi.otherValidate + '/' + logicName, {
+    st: st,
+    serviceKey: serviceKey
+  }, null)
+}
+
+export default casApi