Browse Source

token改为operatio_token避免与管理端冲突

dev
mk 5 months ago
parent
commit
fca045888c
  1. 2
      epmet-oper-web/.env.production.uat
  2. 2
      epmet-oper-web/src/components/ren-process-detail/src/ren-process-detail.vue
  3. 4
      epmet-oper-web/src/js/ajax.js
  4. 2
      epmet-oper-web/src/main.js
  5. 2
      epmet-oper-web/src/mixins/view-module-post.js
  6. 2
      epmet-oper-web/src/mixins/view-module.js
  7. 4
      epmet-oper-web/src/utils/request.js
  8. 4
      epmet-oper-web/src/views/modules/activiti/model.vue
  9. 2
      epmet-oper-web/src/views/modules/activiti/process-deploy.vue
  10. 2
      epmet-oper-web/src/views/modules/activiti/process-initiation.vue
  11. 2
      epmet-oper-web/src/views/modules/activiti/process.vue
  12. 2
      epmet-oper-web/src/views/modules/message/mail-template-add-or-update.vue
  13. 2
      epmet-oper-web/src/views/modules/oss/oss-upload.vue
  14. 2
      epmet-oper-web/src/views/modules/sys/news-add-or-update.vue
  15. 2
      epmet-oper-web/src/views/modules/sys/upgrade-version-history.vue
  16. 2
      epmet-oper-web/src/views/pages/indexWork.vue
  17. 4
      epmet-oper-web/src/views/pages/login.vue
  18. 4
      epmet-oper-web/src/views/pages/loginWork.vue

2
epmet-oper-web/.env.production.uat

@ -1,4 +1,4 @@
NODE_ENV=production NODE_ENV=production
VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api VUE_APP_API_SERVER = http://192.168.1.140/api
VUE_APP_NODE_ENV=prod:uat VUE_APP_NODE_ENV=prod:uat
VUE_APP_PUBLIC_PATH=epmet-oper VUE_APP_PUBLIC_PATH=epmet-oper

2
epmet-oper-web/src/components/ren-process-detail/src/ren-process-detail.vue

@ -69,7 +69,7 @@ export default {
// (xml/image)url // (xml/image)url
getResourceURL () { getResourceURL () {
var params = qs.stringify({ var params = qs.stringify({
'token': Cookies.get('token'), 'token': Cookies.get('operatio_token'),
'processInstanceId': this.dataForm.processInstanceId 'processInstanceId': this.dataForm.processInstanceId
}) })
return `${window.SITE_CONFIG['apiURL']}/activiti/his/getInstImage?${params}` return `${window.SITE_CONFIG['apiURL']}/activiti/his/getInstImage?${params}`

4
epmet-oper-web/src/js/ajax.js

@ -46,8 +46,8 @@ function endLoading () {
axios.interceptors.request.use( axios.interceptors.request.use(
(config) => { (config) => {
config.headers['Accept-Language'] = Cookies.get('language') || 'zh-CN' config.headers['Accept-Language'] = Cookies.get('language') || 'zh-CN'
config.headers['token'] = Cookies.get('token') || '' config.headers['token'] = Cookies.get('operatio_token') || ''
config.headers['Authorization'] = Cookies.get('token') || '' config.headers['Authorization'] = Cookies.get('operatio_token') || ''
// 默认参数 // 默认参数
var defaults = {} var defaults = {}
// 防止缓存,GET请求默认带_t参数 // 防止缓存,GET请求默认带_t参数

2
epmet-oper-web/src/main.js

@ -63,7 +63,7 @@ window.SITE_CONFIG['storeState'] = cloneDeep(store.state)
// el-uploader的header配置 // el-uploader的header配置
Vue.prototype.$getElUploadHeaders = () => ({ Vue.prototype.$getElUploadHeaders = () => ({
Authorization: Cookies.get('token') || '' Authorization: Cookies.get('operatio_token') || ''
// Authorization: localStorage.getItem('token') || '' // Authorization: localStorage.getItem('token') || ''
}) })

2
epmet-oper-web/src/mixins/view-module-post.js

@ -170,7 +170,7 @@ export default {
// 导出 // 导出
exportHandle() { exportHandle() {
var params = qs.stringify({ var params = qs.stringify({
token: Cookies.get('token'), token: Cookies.get('operatio_token'),
...this.dataForm ...this.dataForm
}) })
window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportURL}?${params}` window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportURL}?${params}`

2
epmet-oper-web/src/mixins/view-module.js

@ -171,7 +171,7 @@ export default {
// 导出 // 导出
exportHandle () { exportHandle () {
var params = qs.stringify({ var params = qs.stringify({
'token': Cookies.get('token'), 'token': Cookies.get('operatio_token'),
...this.dataForm ...this.dataForm
}) })
window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportURL}?${params}` window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportURL}?${params}`

4
epmet-oper-web/src/utils/request.js

@ -16,8 +16,8 @@ const http = axios.create({
*/ */
http.interceptors.request.use(config => { http.interceptors.request.use(config => {
config.headers['Accept-Language'] = Cookies.get('language') || 'zh-CN' config.headers['Accept-Language'] = Cookies.get('language') || 'zh-CN'
config.headers['token'] = Cookies.get('token') || '' config.headers['token'] = Cookies.get('operatio_token') || ''
config.headers['Authorization'] = Cookies.get('token') || '' config.headers['Authorization'] = Cookies.get('operatio_token') || ''
// 默认参数 // 默认参数
var defaults = {} var defaults = {}
// 防止缓存,GET请求默认带_t参数 // 防止缓存,GET请求默认带_t参数

4
epmet-oper-web/src/views/modules/activiti/model.vue

@ -83,7 +83,7 @@ export default {
// 线url // 线url
getModelerURL (id) { getModelerURL (id) {
var params = qs.stringify({ var params = qs.stringify({
'token': Cookies.get('token'), 'token': Cookies.get('operatio_token'),
'modelId': id 'modelId': id
}) })
return `${window.SITE_CONFIG['apiURL']}/activiti/modeler.html?${params}` return `${window.SITE_CONFIG['apiURL']}/activiti/modeler.html?${params}`
@ -91,7 +91,7 @@ export default {
// url // url
getExportURL (id) { getExportURL (id) {
var params = qs.stringify({ var params = qs.stringify({
'token': Cookies.get('token') 'token': Cookies.get('operatio_token')
}) })
return `${window.SITE_CONFIG['apiURL']}/activiti/model/export/${id}?${params}` return `${window.SITE_CONFIG['apiURL']}/activiti/model/export/${id}?${params}`
}, },

2
epmet-oper-web/src/views/modules/activiti/process-deploy.vue

@ -39,7 +39,7 @@ export default {
this.visible = true this.visible = true
this.url = `${ this.url = `${
window.SITE_CONFIG['apiURL'] window.SITE_CONFIG['apiURL']
}/activiti/process/deploy?token=${Cookies.get('token')}` }/activiti/process/deploy?token=${Cookies.get('operatio_token')}`
this.fileList = [] this.fileList = []
}, },
// //

2
epmet-oper-web/src/views/modules/activiti/process-initiation.vue

@ -85,7 +85,7 @@ export default {
// (xml/image)url // (xml/image)url
getResourceURL (id, name) { getResourceURL (id, name) {
var params = qs.stringify({ var params = qs.stringify({
'token': Cookies.get('token'), 'token': Cookies.get('operatio_token'),
'deploymentId': id, 'deploymentId': id,
'resourceName': name 'resourceName': name
}) })

2
epmet-oper-web/src/views/modules/activiti/process.vue

@ -101,7 +101,7 @@ export default {
// (xml/image)url // (xml/image)url
getResourceURL (id, name) { getResourceURL (id, name) {
var params = qs.stringify({ var params = qs.stringify({
'token': Cookies.get('token'), 'token': Cookies.get('operatio_token'),
'deploymentId': id, 'deploymentId': id,
'resourceName': name 'resourceName': name
}) })

2
epmet-oper-web/src/views/modules/message/mail-template-add-or-update.vue

@ -145,7 +145,7 @@ export default {
// (使element upload) // (使element upload)
this.uploadUrl = `${ this.uploadUrl = `${
window.SITE_CONFIG['apiURL'] window.SITE_CONFIG['apiURL']
}/oss/file/upload?token=${Cookies.get('token')}` }/oss/file/upload?token=${Cookies.get('operatio_token')}`
this.quillEditor.getModule('toolbar').addHandler('image', () => { this.quillEditor.getModule('toolbar').addHandler('image', () => {
this.$refs.uploadBtn.$el.click() this.$refs.uploadBtn.$el.click()
}) })

2
epmet-oper-web/src/views/modules/oss/oss-upload.vue

@ -40,7 +40,7 @@ export default {
this.visible = true this.visible = true
this.url = `${ this.url = `${
window.SITE_CONFIG['apiURL'] window.SITE_CONFIG['apiURL']
}/oss/file/upload?token=${Cookies.get('token')}` }/oss/file/upload?token=${Cookies.get('operatio_token')}`
this.num = 0 this.num = 0
this.fileList = [] this.fileList = []
}, },

2
epmet-oper-web/src/views/modules/sys/news-add-or-update.vue

@ -147,7 +147,7 @@ export default {
// (使element upload) // (使element upload)
this.uploadUrl = `${ this.uploadUrl = `${
window.SITE_CONFIG['apiURL'] window.SITE_CONFIG['apiURL']
}/sys/oss/upload?token=${Cookies.get('token')}` }/sys/oss/upload?token=${Cookies.get('operatio_token')}`
this.quillEditor.getModule('toolbar').addHandler('image', () => { this.quillEditor.getModule('toolbar').addHandler('image', () => {
this.$refs.uploadBtn.$el.click() this.$refs.uploadBtn.$el.click()
}) })

2
epmet-oper-web/src/views/modules/sys/upgrade-version-history.vue

@ -151,7 +151,7 @@ export default {
}) })
// (使element upload) // (使element upload)
this.uploadUrl = `${window.SITE_CONFIG['apiURL'] this.uploadUrl = `${window.SITE_CONFIG['apiURL']
}/oss/file/upload?token=${Cookies.get('token')}` }/oss/file/upload?token=${Cookies.get('operatio_token')}`
this.quillEditor.getModule('toolbar').addHandler('image', () => { this.quillEditor.getModule('toolbar').addHandler('image', () => {
this.$refs.uploadBtn.$el.click() this.$refs.uploadBtn.$el.click()
}) })

2
epmet-oper-web/src/views/pages/indexWork.vue

@ -73,7 +73,7 @@ export default {
localStorage.setItem('customerId', res.data.customerId) localStorage.setItem('customerId', res.data.customerId)
localStorage.setItem('userType', 'work') localStorage.setItem('userType', 'work')
localStorage.setItem('showHeader', '0') localStorage.setItem('showHeader', '0')
Cookies.set('token', res.data.token) Cookies.set('operatio_token', res.data.token)
this.$router.replace({ name: 'home' }) this.$router.replace({ name: 'home' })
}) })
.catch(() => {}) .catch(() => {})

4
epmet-oper-web/src/views/pages/login.vue

@ -177,8 +177,8 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
localStorage.setItem('userType', 'oper') localStorage.setItem('userType', 'oper')
localStorage.setItem('token', res.data.token) localStorage.setItem('operatio_token', res.data.token)
Cookies.set('token', res.data.token) Cookies.set('operatio_token', res.data.token)
this.$router.replace({ name: 'home' }).catch(() => {}) this.$router.replace({ name: 'home' }).catch(() => {})
}) })
.catch(() => {}) .catch(() => {})

4
epmet-oper-web/src/views/pages/loginWork.vue

@ -270,7 +270,7 @@ export default {
localStorage.setItem('customerId', res.data.customerId) localStorage.setItem('customerId', res.data.customerId)
localStorage.setItem('userType', 'work') localStorage.setItem('userType', 'work')
localStorage.setItem('showHeader', '0') localStorage.setItem('showHeader', '0')
Cookies.set('token', res.data.token) Cookies.set('operatio_token', res.data.token)
this.$router.replace({ name: 'home' }) this.$router.replace({ name: 'home' })
}).catch(() => { }).catch(() => {
}) })
@ -296,7 +296,7 @@ export default {
localStorage.setItem('userType', 'work') localStorage.setItem('userType', 'work')
Cookies.set('token', res.data.token) Cookies.set('operatio_token', res.data.token)
this.$router.replace({ name: 'home' }).catch(() => { }) this.$router.replace({ name: 'home' }).catch(() => { })
}).catch(() => { }).catch(() => {
}) })

Loading…
Cancel
Save