From 32b8d8107f020331d42bd6f652567cc851e29987 Mon Sep 17 00:00:00 2001
From: wxz <wxz@qq.com>
Date: Mon, 11 Nov 2024 14:08:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86140=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E7=8E=AF=E5=A2=83=E7=9A=84=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-oper-web/.env.production.sit.project | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 epmet-oper-web/.env.production.sit.project

diff --git a/epmet-oper-web/.env.production.sit.project b/epmet-oper-web/.env.production.sit.project
new file mode 100644
index 0000000..582619c
--- /dev/null
+++ b/epmet-oper-web/.env.production.sit.project
@@ -0,0 +1,5 @@
+NODE_ENV=production
+VUE_APP_API_SERVER =  http://192.168.1.140/api
+# VUE_APP_API_SERVER =  http://192.168.1.140/api
+VUE_APP_NODE_ENV=prod:sit-project
+VUE_APP_PUBLIC_PATH=epmet-oper
\ No newline at end of file

From 9ed9eb3a31909cbe0a76c6df0f9a3bdfc0b8fe13 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 23 Dec 2024 14:06:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E5=90=8C=E5=9F=9F?=
 =?UTF-8?q?=E5=90=8D=E4=B8=8B=E4=B8=8E=E5=B7=A5=E4=BD=9C=E7=AB=AFtoken?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-oper-web/.env.development               |   4 +-
 epmet-oper-web/.vscode/settings.json          |   2 +-
 .../src/ren-process-detail.vue                |  49 +++--
 epmet-oper-web/src/js/ajax.js                 |  38 ++--
 epmet-oper-web/src/main.js                    |   4 +-
 epmet-oper-web/src/mixins/view-module-post.js |  45 +++--
 epmet-oper-web/src/mixins/view-module.js      |  18 +-
 epmet-oper-web/src/utils/request.js           |   6 +-
 .../src/views/modules/activiti/model.vue      |  41 ++--
 .../views/modules/activiti/process-deploy.vue |  33 +---
 .../modules/activiti/process-initiation.vue   |  48 +++--
 .../src/views/modules/activiti/process.vue    |  71 +++----
 .../message/mail-template-add-or-update.vue   |  60 ++----
 .../src/views/modules/oss/oss-upload.vue      |  33 +---
 .../views/modules/sys/news-add-or-update.vue  |  63 ++----
 .../modules/sys/upgrade-version-history.vue   | 182 ++++++++----------
 epmet-oper-web/src/views/pages/login.vue      |  54 ++----
 17 files changed, 316 insertions(+), 435 deletions(-)

diff --git a/epmet-oper-web/.env.development b/epmet-oper-web/.env.development
index 1dcd7c9..bc8d0ec 100644
--- a/epmet-oper-web/.env.development
+++ b/epmet-oper-web/.env.development
@@ -1,7 +1,7 @@
 NODE_ENV=development
 # VUE_APP_API_SERVER =  http://118.190.150.119:41080/api
-VUE_APP_API_SERVER =  http://localhost:8080/api
-# VUE_APP_API_SERVER =  http://192.168.1.144/api
+# VUE_APP_API_SERVER =  http://localhost:8080/api
+VUE_APP_API_SERVER =  http://192.168.1.144/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn/api
 
 VUE_APP_NODE_ENV=dev
diff --git a/epmet-oper-web/.vscode/settings.json b/epmet-oper-web/.vscode/settings.json
index 2eab4ad..a51fff7 100644
--- a/epmet-oper-web/.vscode/settings.json
+++ b/epmet-oper-web/.vscode/settings.json
@@ -31,7 +31,7 @@
     }
   },
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "git.enableSmartCommit": true
 }
diff --git a/epmet-oper-web/src/components/ren-process-detail/src/ren-process-detail.vue b/epmet-oper-web/src/components/ren-process-detail/src/ren-process-detail.vue
index 5eef7df..2e80d90 100644
--- a/epmet-oper-web/src/components/ren-process-detail/src/ren-process-detail.vue
+++ b/epmet-oper-web/src/components/ren-process-detail/src/ren-process-detail.vue
@@ -4,39 +4,34 @@
     <img :src="getResourceURL()" class="image">
     <h4>{{ $t('process.circulation') }}</h4>
     <div class="mod-sys__dict">
-      <el-table
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        @selection-change="dataListSelectionChangeHandle"
-        @sort-change="dataListSortChangeHandle"
-        style="width: 100%;">
-        <el-table-column prop="activityName"  :label="$t('process.taskName')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="assignee" :label="$t('process.assignee')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="startTime" :label="$t('task.startTime')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="endTime" :label="$t('task.endTime')"  header-align="center" align="center"></el-table-column>
-        <el-table-column prop="comment" :label="$t('process.comment')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="durationInSeconds" :label="$t('task.durationInSeconds')" header-align="center" align="center" width="180"></el-table-column>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle" style="width: 100%;">
+        <el-table-column prop="activityName" :label="$t('process.taskName')" header-align="center"
+          align="center"></el-table-column>
+        <el-table-column prop="assignee" :label="$t('process.assignee')" header-align="center"
+          align="center"></el-table-column>
+        <el-table-column prop="startTime" :label="$t('task.startTime')" header-align="center"
+          align="center"></el-table-column>
+        <el-table-column prop="endTime" :label="$t('task.endTime')" header-align="center"
+          align="center"></el-table-column>
+        <el-table-column prop="comment" :label="$t('process.comment')" header-align="center"
+          align="center"></el-table-column>
+        <el-table-column prop="durationInSeconds" :label="$t('task.durationInSeconds')" header-align="center"
+          align="center" width="180"></el-table-column>
       </el-table>
-      <el-pagination
-        v-if="dataForm.pid === '0'"
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
+      <el-pagination v-if="dataForm.pid === '0'" :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit"
+        :total="total" layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
     </div>
   </el-card>
 </template>
 <style scoped>
-  .image {
-    width: 60%;
-    display: block;
-    margin: 0 auto 30px auto;
-  }
+.image {
+  width: 60%;
+  display: block;
+  margin: 0 auto 30px auto;
+}
 </style>
 
 <script>
@@ -69,7 +64,7 @@ export default {
     // 获取流程(xml/image)url地址
     getResourceURL () {
       var params = qs.stringify({
-        'token': Cookies.get('token'),
+        'token': Cookies.get('oper_token'),
         'processInstanceId': this.dataForm.processInstanceId
       })
       return `${window.SITE_CONFIG['apiURL']}/activiti/his/getInstImage?${params}`
diff --git a/epmet-oper-web/src/js/ajax.js b/epmet-oper-web/src/js/ajax.js
index 837b401..adb093e 100644
--- a/epmet-oper-web/src/js/ajax.js
+++ b/epmet-oper-web/src/js/ajax.js
@@ -46,8 +46,8 @@ function endLoading () {
 axios.interceptors.request.use(
   (config) => {
     config.headers['Accept-Language'] = Cookies.get('language') || 'zh-CN'
-    config.headers['token'] = Cookies.get('token') || ''
-    config.headers['Authorization'] = Cookies.get('token') || ''
+    config.headers['token'] = Cookies.get('oper_token') || ''
+    config.headers['Authorization'] = Cookies.get('oper_token') || ''
     // 默认参数
     var defaults = {}
     // 防止缓存，GET请求默认带_t参数
@@ -96,7 +96,7 @@ axios.interceptors.response.use(
       // if (userType === 'work'){
       //   router.replace({ name: 'loginWork' })
       // }else {
-        router.replace({ name: 'login' })
+      router.replace({ name: 'login' })
       // }
 
       return Promise.reject(response.data.msg)
@@ -192,11 +192,11 @@ export default {
             if (data.code == 0) {
               //业务成功
               if (typeof cb_su === 'function') {
-                cb_su(data.data, data.msg )
+                cb_su(data.data, data.msg)
               }
             } else {
               //业务失败
-              if (typeof cb_err === 'function') cb_err(data.msg , data.data)
+              if (typeof cb_err === 'function') cb_err(data.msg, data.data)
             }
           } else {
             if (typeof cb_err === 'function') cb_err(res)
@@ -260,11 +260,11 @@ export default {
             if (data.code == 0) {
               //业务成功
               if (typeof cb_su === 'function') {
-                cb_su(data.data, data.msg )
+                cb_su(data.data, data.msg)
               }
             } else {
               //业务失败
-              if (typeof cb_err === 'function') cb_err(data.msg , data.data)
+              if (typeof cb_err === 'function') cb_err(data.msg, data.data)
             }
           } else {
             if (typeof cb_err === 'function') cb_err(res)
@@ -293,12 +293,12 @@ export default {
         if (res) {
           if (res.status === 200) {
             var data = res.data
-            cb_su(data, data.msg )
+            cb_su(data, data.msg)
           } else {
-            if (typeof cb_err === 'function') cb_err(data.msg , data)
+            if (typeof cb_err === 'function') cb_err(data.msg, data)
           }
         } else {
-          if (typeof cb_err === 'function') cb_err(data.msg , data)
+          if (typeof cb_err === 'function') cb_err(data.msg, data)
         }
       })
       .catch((err) => {
@@ -394,21 +394,21 @@ export default {
       responseType: 'blob',
     })
       .then((res) => {
-        
+
         if (res) {
           if (res.status === 200) {
             var data = res.data //直接返回blob
 
             // if (data.code == 0) {
-              //业务成功
-              if (typeof cb_su === 'function') {
-                cb_su(data)
-              }
-              else {
+            //业务成功
+            if (typeof cb_su === 'function') {
+              cb_su(data)
+            }
+            else {
               //业务失败
-               if (typeof cb_err === 'function') cb_err(errorMsg)
-             }
-          // } else {
+              if (typeof cb_err === 'function') cb_err(errorMsg)
+            }
+            // } else {
             // if (typeof cb_err === 'function') cb_err(errorMsg)
           }
         } else {
diff --git a/epmet-oper-web/src/main.js b/epmet-oper-web/src/main.js
index 20c7ad9..5e18d09 100644
--- a/epmet-oper-web/src/main.js
+++ b/epmet-oper-web/src/main.js
@@ -63,8 +63,8 @@ window.SITE_CONFIG['storeState'] = cloneDeep(store.state)
 
 // el-uploader的header配置
 Vue.prototype.$getElUploadHeaders = () => ({
-  Authorization: Cookies.get('token') || ''
-//   Authorization: localStorage.getItem('token') || ''
+  Authorization: Cookies.get('oper_token') || ''
+  //   Authorization: localStorage.getItem('token') || ''
 })
 
 new Vue({
diff --git a/epmet-oper-web/src/mixins/view-module-post.js b/epmet-oper-web/src/mixins/view-module-post.js
index bb036af..7a1e9cc 100644
--- a/epmet-oper-web/src/mixins/view-module-post.js
+++ b/epmet-oper-web/src/mixins/view-module-post.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import qs from 'qs'
 export default {
-  data() {
+  data () {
     /* eslint-disable */
     return {
       // 设置属性
@@ -29,19 +29,19 @@ export default {
     }
     /* eslint-enable */
   },
-  created() {
+  created () {
     if (this.mixinViewModuleOptions.createdIsNeed) {
       this.query()
     }
   },
-  activated() {
+  activated () {
     if (this.mixinViewModuleOptions.activatedIsNeed) {
       this.query()
     }
   },
   methods: {
     // 获取数据列表
-    query() {
+    query () {
       this.dataListLoading = true
       this.$http
         .post(this.mixinViewModuleOptions.getDataListURL, {
@@ -74,11 +74,11 @@ export default {
         })
     },
     // 多选
-    dataListSelectionChangeHandle(val) {
+    dataListSelectionChangeHandle (val) {
       this.dataListSelections = val
     },
     // 排序
-    dataListSortChangeHandle(data) {
+    dataListSortChangeHandle (data) {
       if (!data.order || !data.prop) {
         this.order = ''
         this.orderField = ''
@@ -89,13 +89,13 @@ export default {
       this.query()
     },
     // 分页, 每页条数
-    pageSizeChangeHandle(val) {
+    pageSizeChangeHandle (val) {
       this.page = 1
       this.limit = val
       this.query()
     },
     // 分页, 当前页
-    pageCurrentChangeHandle(val) {
+    pageCurrentChangeHandle (val) {
       this.page = val
       this.query()
     },
@@ -104,7 +104,7 @@ export default {
       this.query()
     },
     // 新增 / 修改
-    addOrUpdateHandle(id) {
+    addOrUpdateHandle (id) {
       this.addOrUpdateVisible = true
       this.$nextTick(() => {
         this.$refs.addOrUpdate.dataForm.id = id
@@ -112,7 +112,7 @@ export default {
       })
     },
     // 删除
-    deleteHandle(id) {
+    deleteHandle (id) {
       if (
         this.mixinViewModuleOptions.deleteIsBatch &&
         !id &&
@@ -136,18 +136,17 @@ export default {
         .then(() => {
           this.$http
             .delete(
-              `${this.mixinViewModuleOptions.deleteURL}${
-                this.mixinViewModuleOptions.deleteIsBatch ? '' : '/' + id
+              `${this.mixinViewModuleOptions.deleteURL}${this.mixinViewModuleOptions.deleteIsBatch ? '' : '/' + id
               }`,
               this.mixinViewModuleOptions.deleteIsBatch
                 ? {
-                    data: id
-                      ? [id]
-                      : this.dataListSelections.map(
-                          (item) =>
-                            item[this.mixinViewModuleOptions.deleteIsBatchKey]
-                        )
-                  }
+                  data: id
+                    ? [id]
+                    : this.dataListSelections.map(
+                      (item) =>
+                        item[this.mixinViewModuleOptions.deleteIsBatchKey]
+                    )
+                }
                 : {}
             )
             .then(({ data: res }) => {
@@ -163,14 +162,14 @@ export default {
                 }
               })
             })
-            .catch(() => {})
+            .catch(() => { })
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     // 导出
-    exportHandle() {
+    exportHandle () {
       var params = qs.stringify({
-        token: Cookies.get('token'),
+        token: Cookies.get('oper_token'),
         ...this.dataForm
       })
       window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportURL}?${params}`
diff --git a/epmet-oper-web/src/mixins/view-module.js b/epmet-oper-web/src/mixins/view-module.js
index 9c73fa4..384561e 100644
--- a/epmet-oper-web/src/mixins/view-module.js
+++ b/epmet-oper-web/src/mixins/view-module.js
@@ -138,21 +138,21 @@ export default {
               this.query()
             }
           })
-        }).catch(() => {})
-      }).catch(() => {})
+        }).catch(() => { })
+      }).catch(() => { })
     },
     // 删除
-   async deleteHandlePost (id) {
+    async deleteHandlePost (id) {
+
+
 
-      
-     
       this.$confirm(this.$t('prompt.info', { 'handle': this.$t('delete') }), this.$t('prompt.title'), {
         confirmButtonText: this.$t('confirm'),
         cancelButtonText: this.$t('cancel'),
         type: 'warning'
       }).then(() => {
         this.$http.post(this.mixinViewModuleOptions.deleteURL,
-           [id]
+          [id]
         ).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -165,13 +165,13 @@ export default {
               this.query()
             }
           })
-        }).catch(() => {})
-      }).catch(() => {})
+        }).catch(() => { })
+      }).catch(() => { })
     },
     // 导出
     exportHandle () {
       var params = qs.stringify({
-        'token': Cookies.get('token'),
+        'token': Cookies.get('oper_token'),
         ...this.dataForm
       })
       window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportURL}?${params}`
diff --git a/epmet-oper-web/src/utils/request.js b/epmet-oper-web/src/utils/request.js
index 050f5f6..ba4744a 100644
--- a/epmet-oper-web/src/utils/request.js
+++ b/epmet-oper-web/src/utils/request.js
@@ -16,8 +16,8 @@ const http = axios.create({
  */
 http.interceptors.request.use(config => {
   config.headers['Accept-Language'] = Cookies.get('language') || 'zh-CN'
-  config.headers['token'] = Cookies.get('token') || ''
-  config.headers['Authorization'] = Cookies.get('token') || ''
+  config.headers['token'] = Cookies.get('oper_token') || ''
+  config.headers['Authorization'] = Cookies.get('oper_token') || ''
   // 默认参数
   var defaults = {}
   // 防止缓存，GET请求默认带_t参数
@@ -58,7 +58,7 @@ http.interceptors.response.use(response => {
     // if (userType === 'work'){
     //   router.replace({ name: 'loginWork' })
     // }else {
-      router.replace({ name: 'login' })
+    router.replace({ name: 'login' })
     // }
     return Promise.reject(response.data.msg)
   }
diff --git a/epmet-oper-web/src/views/modules/activiti/model.vue b/epmet-oper-web/src/views/modules/activiti/model.vue
index 8ca2bb0..c08d224 100644
--- a/epmet-oper-web/src/views/modules/activiti/model.vue
+++ b/epmet-oper-web/src/views/modules/activiti/model.vue
@@ -18,35 +18,30 @@
           <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        @selection-change="dataListSelectionChangeHandle"
-        @sort-change="dataListSortChangeHandle"
-        style="width: 100%;">
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
         <el-table-column prop="name" :label="$t('model.name')" header-align="center" align="center"></el-table-column>
         <el-table-column prop="key" :label="$t('model.key')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="version" :label="$t('model.version')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createTime" :label="$t('model.createTime')" header-align="center" align="center" width="180"></el-table-column>
-        <el-table-column prop="lastUpdateTime" :label="$t('model.lastUpdateTime')" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="version" :label="$t('model.version')" header-align="center"
+          align="center"></el-table-column>
+        <el-table-column prop="createTime" :label="$t('model.createTime')" header-align="center" align="center"
+          width="180"></el-table-column>
+        <el-table-column prop="lastUpdateTime" :label="$t('model.lastUpdateTime')" header-align="center" align="center"
+          width="180"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <a :href="getModelerURL(scope.row.id)" target="_blank" class="el-button el-button--text el-button--small">{{ $t('model.design') }}</a>
+            <a :href="getModelerURL(scope.row.id)" target="_blank" class="el-button el-button--text el-button--small">{{
+              $t('model.design') }}</a>
             <el-button type="text" size="small" @click="deployHandle(scope.row.id)">{{ $t('model.deploy') }}</el-button>
-            <a :href="getExportURL(scope.row.id)" target="_blank" class="el-button el-button--text el-button--small">{{ $t('export') }}</a>
+            <a :href="getExportURL(scope.row.id)" target="_blank" class="el-button el-button--text el-button--small">{{
+              $t('export') }}</a>
             <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
+      <el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="total"
+        layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
@@ -83,7 +78,7 @@ export default {
     // 获取在线设计url地址
     getModelerURL (id) {
       var params = qs.stringify({
-        'token': Cookies.get('token'),
+        'token': Cookies.get('oper_token'),
         'modelId': id
       })
       return `${window.SITE_CONFIG['apiURL']}/activiti/modeler.html?${params}`
@@ -91,7 +86,7 @@ export default {
     // 获取导出url地址
     getExportURL (id) {
       var params = qs.stringify({
-        'token': Cookies.get('token')
+        'token': Cookies.get('oper_token')
       })
       return `${window.SITE_CONFIG['apiURL']}/activiti/model/export/${id}?${params}`
     },
@@ -114,8 +109,8 @@ export default {
               this.getDataList()
             }
           })
-        }).catch(() => {})
-      }).catch(() => {})
+        }).catch(() => { })
+      }).catch(() => { })
     }
   }
 }
diff --git a/epmet-oper-web/src/views/modules/activiti/process-deploy.vue b/epmet-oper-web/src/views/modules/activiti/process-deploy.vue
index 3cc8db5..3ce7a66 100644
--- a/epmet-oper-web/src/views/modules/activiti/process-deploy.vue
+++ b/epmet-oper-web/src/views/modules/activiti/process-deploy.vue
@@ -1,20 +1,8 @@
 <template>
-  <el-dialog
-    :visible.sync="visible"
-    :title="$t('process.deployFile')"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-  >
-    <el-upload
-      :headers="$getElUploadHeaders()"
-      name="processFile"
-      :action="url"
-      :file-list="fileList"
-      drag
-      :before-upload="beforeUploadHandle"
-      :on-success="successHandle"
-      class="text-center"
-    >
+  <el-dialog :visible.sync="visible" :title="$t('process.deployFile')" :close-on-click-modal="false"
+    :close-on-press-escape="false">
+    <el-upload :headers="$getElUploadHeaders()" name="processFile" :action="url" :file-list="fileList" drag
+      :before-upload="beforeUploadHandle" :on-success="successHandle" class="text-center">
       <i class="el-icon-upload"></i>
       <div class="el-upload__text" v-html="$t('upload.text')"></div>
       <div class="el-upload__tip" slot="tip">
@@ -27,7 +15,7 @@
 <script>
 import Cookies from 'js-cookie'
 export default {
-  data() {
+  data () {
     return {
       visible: false,
       url: '',
@@ -35,15 +23,14 @@ export default {
     }
   },
   methods: {
-    init() {
+    init () {
       this.visible = true
-      this.url = `${
-        window.SITE_CONFIG['apiURL']
-      }/activiti/process/deploy?token=${Cookies.get('token')}`
+      this.url = `${window.SITE_CONFIG['apiURL']
+        }/activiti/process/deploy?token=${Cookies.get('oper_token')}`
       this.fileList = []
     },
     // 上传之前
-    beforeUploadHandle(file) {
+    beforeUploadHandle (file) {
       if (
         !/.+\.zip$/.test(file.name) &&
         !/.+\.xml$/.test(file.name) &&
@@ -57,7 +44,7 @@ export default {
       }
     },
     // 上传成功
-    successHandle(res, file, fileList) {
+    successHandle (res, file, fileList) {
       if (res.code !== 0) {
         return this.$message.error(res.msg)
       }
diff --git a/epmet-oper-web/src/views/modules/activiti/process-initiation.vue b/epmet-oper-web/src/views/modules/activiti/process-initiation.vue
index bd053d2..5a437fb 100644
--- a/epmet-oper-web/src/views/modules/activiti/process-initiation.vue
+++ b/epmet-oper-web/src/views/modules/activiti/process-initiation.vue
@@ -12,43 +12,41 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        @selection-change="dataListSelectionChangeHandle"
-        @sort-change="dataListSortChangeHandle"
-        style="width: 100%;">
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
         <el-table-column prop="id" :label="$t('process.id')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deploymentId" :label="$t('process.deploymentId')" header-align="center" align="center" width="80"></el-table-column>
+        <el-table-column prop="deploymentId" :label="$t('process.deploymentId')" header-align="center" align="center"
+          width="80"></el-table-column>
         <el-table-column prop="name" :label="$t('process.name')" header-align="center" align="center"></el-table-column>
         <el-table-column prop="key" :label="$t('process.key')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="version" :label="$t('process.version')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="resourceName" :label="$t('process.resourceName')" header-align="center" align="center" :show-overflow-tooltip="true" width="100">
+        <el-table-column prop="version" :label="$t('process.version')" header-align="center"
+          align="center"></el-table-column>
+        <el-table-column prop="resourceName" :label="$t('process.resourceName')" header-align="center" align="center"
+          :show-overflow-tooltip="true" width="100">
           <template slot-scope="scope">
-            <a :href="getResourceURL(scope.row.deploymentId, scope.row.resourceName)" target="_blank">{{ scope.row.resourceName }}</a>
+            <a :href="getResourceURL(scope.row.deploymentId, scope.row.resourceName)" target="_blank">{{
+              scope.row.resourceName }}</a>
           </template>
         </el-table-column>
-        <el-table-column prop="diagramResourceName" :label="$t('process.diagramResourceName')" header-align="center" align="center" :show-overflow-tooltip="true" width="100">
+        <el-table-column prop="diagramResourceName" :label="$t('process.diagramResourceName')" header-align="center"
+          align="center" :show-overflow-tooltip="true" width="100">
           <template slot-scope="scope">
-            <a :href="getResourceURL(scope.row.deploymentId, scope.row.diagramResourceName)" target="_blank">{{ scope.row.diagramResourceName }}</a>
+            <a :href="getResourceURL(scope.row.deploymentId, scope.row.diagramResourceName)" target="_blank">{{
+              scope.row.diagramResourceName }}</a>
           </template>
         </el-table-column>
-        <el-table-column prop="deploymentTime" :label="$t('process.deploymentTime')" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="deploymentTime" :label="$t('process.deploymentTime')" header-align="center"
+          align="center" width="180"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="createProcessInstance(scope.row)">{{ $t('process.createInstance') }}</el-button>
+            <el-button type="text" size="small" @click="createProcessInstance(scope.row)">{{
+              $t('process.createInstance') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
+      <el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="total"
+        layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
@@ -85,7 +83,7 @@ export default {
     // 获取流程(xml/image)url地址
     getResourceURL (id, name) {
       var params = qs.stringify({
-        'token': Cookies.get('token'),
+        'token': Cookies.get('oper_token'),
         'deploymentId': id,
         'resourceName': name
       })
@@ -101,7 +99,7 @@ export default {
           return this.$message.error(this.$t('process.routeError'))
         }
         this.forwardUrl(res.data, row)
-      }).catch(() => {})
+      }).catch(() => { })
     },
     forwardUrl (data, row) {
       var routeParams = {
@@ -134,7 +132,7 @@ export default {
             this.getDataList()
           }
         })
-      }).catch(() => {})
+      }).catch(() => { })
     }
   }
 }
diff --git a/epmet-oper-web/src/views/modules/activiti/process.vue b/epmet-oper-web/src/views/modules/activiti/process.vue
index 2e80cd9..afbaf7c 100644
--- a/epmet-oper-web/src/views/modules/activiti/process.vue
+++ b/epmet-oper-web/src/views/modules/activiti/process.vue
@@ -18,52 +18,55 @@
           <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        @selection-change="dataListSelectionChangeHandle"
-        @sort-change="dataListSortChangeHandle"
-        style="width: 100%;">
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
         <el-table-column prop="id" :label="$t('process.id')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deploymentId" :label="$t('process.deploymentId')" header-align="center" align="center" width="80"></el-table-column>
+        <el-table-column prop="deploymentId" :label="$t('process.deploymentId')" header-align="center" align="center"
+          width="80"></el-table-column>
         <el-table-column prop="name" :label="$t('process.name')" header-align="center" align="center"></el-table-column>
         <el-table-column prop="key" :label="$t('process.key')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="version" :label="$t('process.version')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="resourceName" :label="$t('process.resourceName')" header-align="center" align="center" :show-overflow-tooltip="true" width="100">
+        <el-table-column prop="version" :label="$t('process.version')" header-align="center"
+          align="center"></el-table-column>
+        <el-table-column prop="resourceName" :label="$t('process.resourceName')" header-align="center" align="center"
+          :show-overflow-tooltip="true" width="100">
           <template slot-scope="scope">
-            <a :href="getResourceURL(scope.row.deploymentId, scope.row.resourceName)" target="_blank">{{ scope.row.resourceName }}</a>
+            <a :href="getResourceURL(scope.row.deploymentId, scope.row.resourceName)" target="_blank">{{
+              scope.row.resourceName }}</a>
           </template>
         </el-table-column>
-        <el-table-column prop="diagramResourceName" :label="$t('process.diagramResourceName')" header-align="center" align="center" :show-overflow-tooltip="true" width="100">
+        <el-table-column prop="diagramResourceName" :label="$t('process.diagramResourceName')" header-align="center"
+          align="center" :show-overflow-tooltip="true" width="100">
           <template slot-scope="scope">
-            <a :href="getResourceURL(scope.row.deploymentId, scope.row.diagramResourceName)" target="_blank">{{ scope.row.diagramResourceName }}</a>
+            <a :href="getResourceURL(scope.row.deploymentId, scope.row.diagramResourceName)" target="_blank">{{
+              scope.row.diagramResourceName }}</a>
           </template>
         </el-table-column>
-        <el-table-column prop="deploymentTime" :label="$t('process.deploymentTime')" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="deploymentTime" :label="$t('process.deploymentTime')" header-align="center"
+          align="center" width="180"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.suspended" type="text" size="small" @click="activeHandle(scope.row.id)">{{ $t('process.active') }}</el-button>
-            <el-button v-else type="text" size="small" @click="suspendHandle(scope.row.id)">{{ $t('process.suspend') }}</el-button>
-            <el-button type="text" size="small" @click="deleteHandle(scope.row.deploymentId)">{{ $t('delete') }}</el-button>
-            <el-button type="text" size="small" @click="convertToModelHandle(scope.row.id)">{{ $t('process.convertToModel') }}</el-button>
-            <el-button type="text" size="small" @click="setBizRoute(scope.row)">{{ $t('process.bizRouteSet') }}</el-button>
+            <el-button v-if="scope.row.suspended" type="text" size="small" @click="activeHandle(scope.row.id)">{{
+              $t('process.active') }}</el-button>
+            <el-button v-else type="text" size="small" @click="suspendHandle(scope.row.id)">{{ $t('process.suspend')
+              }}</el-button>
+            <el-button type="text" size="small" @click="deleteHandle(scope.row.deploymentId)">{{ $t('delete')
+              }}</el-button>
+            <el-button type="text" size="small" @click="convertToModelHandle(scope.row.id)">{{
+              $t('process.convertToModel') }}</el-button>
+            <el-button type="text" size="small" @click="setBizRoute(scope.row)">{{ $t('process.bizRouteSet')
+              }}</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
+      <el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="total"
+        layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <!-- 弹窗, 部署流程文件 -->
       <deploy v-if="deployVisible" ref="deploy" @refreshDataList="getDataList"></deploy>
-      <process-biz-route v-if="setBizRouteVisible" ref="processBizRoute" @refreshDataList="getDataList"></process-biz-route>
+      <process-biz-route v-if="setBizRouteVisible" ref="processBizRoute"
+        @refreshDataList="getDataList"></process-biz-route>
     </div>
   </el-card>
 </template>
@@ -101,7 +104,7 @@ export default {
     // 获取流程(xml/image)url地址
     getResourceURL (id, name) {
       var params = qs.stringify({
-        'token': Cookies.get('token'),
+        'token': Cookies.get('oper_token'),
         'deploymentId': id,
         'resourceName': name
       })
@@ -142,8 +145,8 @@ export default {
               this.getDataList()
             }
           })
-        }).catch(() => {})
-      }).catch(() => {})
+        }).catch(() => { })
+      }).catch(() => { })
     },
     // 挂起
     suspendHandle (id) {
@@ -164,8 +167,8 @@ export default {
               this.getDataList()
             }
           })
-        }).catch(() => {})
-      }).catch(() => {})
+        }).catch(() => { })
+      }).catch(() => { })
     },
     // 转换为模型
     convertToModelHandle (id) {
@@ -186,8 +189,8 @@ export default {
               this.getDataList()
             }
           })
-        }).catch(() => {})
-      }).catch(() => {})
+        }).catch(() => { })
+      }).catch(() => { })
     }
   }
 }
diff --git a/epmet-oper-web/src/views/modules/message/mail-template-add-or-update.vue b/epmet-oper-web/src/views/modules/message/mail-template-add-or-update.vue
index 2d7ad8a..ec5e3aa 100644
--- a/epmet-oper-web/src/views/modules/message/mail-template-add-or-update.vue
+++ b/epmet-oper-web/src/views/modules/message/mail-template-add-or-update.vue
@@ -1,41 +1,20 @@
 <template>
-  <el-dialog
-    :visible.sync="visible"
-    :title="!dataForm.id ? $t('add') : $t('update')"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-  >
-    <el-form
-      :model="dataForm"
-      :rules="dataRule"
-      ref="dataForm"
-      @keyup.enter.native="dataFormSubmitHandle()"
-      label-width="120px"
-    >
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false"
+    :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()"
+      label-width="120px">
       <el-form-item prop="name" :label="$t('mail.name')">
-        <el-input
-          v-model="dataForm.name"
-          :placeholder="$t('mail.name')"
-        ></el-input>
+        <el-input v-model="dataForm.name" :placeholder="$t('mail.name')"></el-input>
       </el-form-item>
       <el-form-item prop="subject" :label="$t('mail.subject')">
-        <el-input
-          v-model="dataForm.subject"
-          :placeholder="$t('mail.subject')"
-        ></el-input>
+        <el-input v-model="dataForm.subject" :placeholder="$t('mail.subject')"></el-input>
       </el-form-item>
       <el-form-item prop="content" :label="$t('mail.content')">
         <!-- 富文本编辑器, 容器 -->
         <div id="J_quillEditor"></div>
         <!-- 自定义上传图片功能 (使用element upload组件) -->
-        <el-upload
-          :headers="$getElUploadHeaders()"
-          :action="uploadUrl"
-          :show-file-list="false"
-          :before-upload="uploadBeforeUploadHandle"
-          :on-success="uploadSuccessHandle"
-          style="display: none"
-        >
+        <el-upload :headers="$getElUploadHeaders()" :action="uploadUrl" :show-file-list="false"
+          :before-upload="uploadBeforeUploadHandle" :on-success="uploadSuccessHandle" style="display: none">
           <el-button ref="uploadBtn" type="primary" size="small">{{
             $t('upload.button')
           }}</el-button>
@@ -57,7 +36,7 @@ import debounce from 'lodash/debounce'
 import 'quill/dist/quill.snow.css'
 import Quill from 'quill'
 export default {
-  data() {
+  data () {
     return {
       visible: false,
       quillEditor: null,
@@ -86,7 +65,7 @@ export default {
     }
   },
   computed: {
-    dataRule() {
+    dataRule () {
       var validateContent = (rule, value, callback) => {
         if (this.quillEditor.getLength() <= 1) {
           return callback(new Error(this.$t('validate.required')))
@@ -120,7 +99,7 @@ export default {
     }
   },
   methods: {
-    init() {
+    init () {
       this.visible = true
       this.$nextTick(() => {
         if (this.quillEditor) {
@@ -135,7 +114,7 @@ export default {
       })
     },
     // 富文本编辑器
-    quillEditorHandle() {
+    quillEditorHandle () {
       this.quillEditor = new Quill('#J_quillEditor', {
         modules: {
           toolbar: this.quillEditorToolbarOptions
@@ -143,9 +122,8 @@ export default {
         theme: 'snow'
       })
       // 自定义上传图片功能 (使用element upload组件)
-      this.uploadUrl = `${
-        window.SITE_CONFIG['apiURL']
-      }/oss/file/upload?token=${Cookies.get('token')}`
+      this.uploadUrl = `${window.SITE_CONFIG['apiURL']
+        }/oss/file/upload?token=${Cookies.get('oper_token')}`
       this.quillEditor.getModule('toolbar').addHandler('image', () => {
         this.$refs.uploadBtn.$el.click()
       })
@@ -155,7 +133,7 @@ export default {
       })
     },
     // 上传图片之前
-    uploadBeforeUploadHandle(file) {
+    uploadBeforeUploadHandle (file) {
       if (
         file.type !== 'image/jpg' &&
         file.type !== 'image/jpeg' &&
@@ -167,7 +145,7 @@ export default {
       }
     },
     // 上传图片成功
-    uploadSuccessHandle(res, file, fileList) {
+    uploadSuccessHandle (res, file, fileList) {
       if (res.code !== 0) {
         return this.$message.error(res.msg)
       }
@@ -178,7 +156,7 @@ export default {
       )
     },
     // 获取信息
-    getInfo() {
+    getInfo () {
       this.$http
         .get(`/message/mailtemplate/${this.dataForm.id}`)
         .then(({ data: res }) => {
@@ -188,7 +166,7 @@ export default {
           this.dataForm = res.data
           this.quillEditor.root.innerHTML = this.dataForm.content
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     // 表单提交
     dataFormSubmitHandle: debounce(
@@ -216,7 +194,7 @@ export default {
                 }
               })
             })
-            .catch(() => {})
+            .catch(() => { })
         })
       },
       1000,
diff --git a/epmet-oper-web/src/views/modules/oss/oss-upload.vue b/epmet-oper-web/src/views/modules/oss/oss-upload.vue
index dc9dd41..a4be87d 100644
--- a/epmet-oper-web/src/views/modules/oss/oss-upload.vue
+++ b/epmet-oper-web/src/views/modules/oss/oss-upload.vue
@@ -1,20 +1,8 @@
 <template>
-  <el-dialog
-    :visible.sync="visible"
-    :title="$t('oss.upload')"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-  >
-    <el-upload
-      :headers="$getElUploadHeaders()"
-      :action="url"
-      :file-list="fileList"
-      drag
-      multiple
-      :before-upload="beforeUploadHandle"
-      :on-success="successHandle"
-      class="text-center"
-    >
+  <el-dialog :visible.sync="visible" :title="$t('oss.upload')" :close-on-click-modal="false"
+    :close-on-press-escape="false">
+    <el-upload :headers="$getElUploadHeaders()" :action="url" :file-list="fileList" drag multiple
+      :before-upload="beforeUploadHandle" :on-success="successHandle" class="text-center">
       <i class="el-icon-upload"></i>
       <div class="el-upload__text" v-html="$t('upload.text')"></div>
       <div class="el-upload__tip" slot="tip">
@@ -27,7 +15,7 @@
 <script>
 import Cookies from 'js-cookie'
 export default {
-  data() {
+  data () {
     return {
       visible: false,
       url: '',
@@ -36,16 +24,15 @@ export default {
     }
   },
   methods: {
-    init() {
+    init () {
       this.visible = true
-      this.url = `${
-        window.SITE_CONFIG['apiURL']
-      }/oss/file/upload?token=${Cookies.get('token')}`
+      this.url = `${window.SITE_CONFIG['apiURL']
+        }/oss/file/upload?token=${Cookies.get('oper_token')}`
       this.num = 0
       this.fileList = []
     },
     // 上传之前
-    beforeUploadHandle(file) {
+    beforeUploadHandle (file) {
       if (
         file.type !== 'image/jpg' &&
         file.type !== 'image/jpeg' &&
@@ -58,7 +45,7 @@ export default {
       this.num++
     },
     // 上传成功
-    successHandle(res, file, fileList) {
+    successHandle (res, file, fileList) {
       if (res.code !== 0) {
         return this.$message.error(res.msg)
       }
diff --git a/epmet-oper-web/src/views/modules/sys/news-add-or-update.vue b/epmet-oper-web/src/views/modules/sys/news-add-or-update.vue
index 7aef348..03fa39e 100644
--- a/epmet-oper-web/src/views/modules/sys/news-add-or-update.vue
+++ b/epmet-oper-web/src/views/modules/sys/news-add-or-update.vue
@@ -1,47 +1,25 @@
 <template>
-  <el-dialog
-    :visible.sync="visible"
-    :title="!dataForm.id ? $t('add') : $t('update')"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-  >
-    <el-form
-      :model="dataForm"
-      :rules="dataRule"
-      ref="dataForm"
-      @keyup.enter.native="dataFormSubmitHandle()"
-      label-width="120px"
-    >
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false"
+    :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()"
+      label-width="120px">
       <el-form-item prop="title" :label="$t('news.title')">
-        <el-input
-          v-model="dataForm.title"
-          :placeholder="$t('news.title')"
-        ></el-input>
+        <el-input v-model="dataForm.title" :placeholder="$t('news.title')"></el-input>
       </el-form-item>
       <el-form-item prop="content" :label="$t('news.content')">
         <!-- 富文本编辑器, 容器 -->
         <div id="J_quillEditor"></div>
         <!-- 自定义上传图片功能 (使用element upload组件) -->
-        <el-upload
-          :headers="$getElUploadHeaders()"
-          :action="uploadUrl"
-          :show-file-list="false"
-          :before-upload="uploadBeforeUploadHandle"
-          :on-success="uploadSuccessHandle"
-          style="display: none"
-        >
+        <el-upload :headers="$getElUploadHeaders()" :action="uploadUrl" :show-file-list="false"
+          :before-upload="uploadBeforeUploadHandle" :on-success="uploadSuccessHandle" style="display: none">
           <el-button ref="uploadBtn" type="primary" size="small">{{
             $t('upload.button')
           }}</el-button>
         </el-upload>
       </el-form-item>
       <el-form-item prop="pubDate" :label="$t('news.pubDate')">
-        <el-date-picker
-          v-model="dataForm.pubDate"
-          type="datetime"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('news.pubDate')"
-        ></el-date-picker>
+        <el-date-picker v-model="dataForm.pubDate" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+          :placeholder="$t('news.pubDate')"></el-date-picker>
       </el-form-item>
     </el-form>
     <template slot="footer">
@@ -59,7 +37,7 @@ import debounce from 'lodash/debounce'
 import 'quill/dist/quill.snow.css'
 import Quill from 'quill'
 export default {
-  data() {
+  data () {
     return {
       visible: false,
       quillEditor: null,
@@ -88,7 +66,7 @@ export default {
     }
   },
   computed: {
-    dataRule() {
+    dataRule () {
       var validateContent = (rule, value, callback) => {
         if (this.quillEditor.getLength() <= 1) {
           return callback(new Error(this.$t('validate.required')))
@@ -122,7 +100,7 @@ export default {
     }
   },
   methods: {
-    init() {
+    init () {
       this.visible = true
       this.$nextTick(() => {
         if (this.quillEditor) {
@@ -137,7 +115,7 @@ export default {
       })
     },
     // 富文本编辑器
-    quillEditorHandle() {
+    quillEditorHandle () {
       this.quillEditor = new Quill('#J_quillEditor', {
         modules: {
           toolbar: this.quillEditorToolbarOptions
@@ -145,9 +123,8 @@ export default {
         theme: 'snow'
       })
       // 自定义上传图片功能 (使用element upload组件)
-      this.uploadUrl = `${
-        window.SITE_CONFIG['apiURL']
-      }/sys/oss/upload?token=${Cookies.get('token')}`
+      this.uploadUrl = `${window.SITE_CONFIG['apiURL']
+        }/sys/oss/upload?token=${Cookies.get('oper_token')}`
       this.quillEditor.getModule('toolbar').addHandler('image', () => {
         this.$refs.uploadBtn.$el.click()
       })
@@ -157,7 +134,7 @@ export default {
       })
     },
     // 上传图片之前
-    uploadBeforeUploadHandle(file) {
+    uploadBeforeUploadHandle (file) {
       if (
         file.type !== 'image/jpg' &&
         file.type !== 'image/jpeg' &&
@@ -169,7 +146,7 @@ export default {
       }
     },
     // 上传图片成功
-    uploadSuccessHandle(res, file, fileList) {
+    uploadSuccessHandle (res, file, fileList) {
       if (res.code !== 0) {
         return this.$message.error(res.msg)
       }
@@ -180,7 +157,7 @@ export default {
       )
     },
     // 获取信息
-    getInfo() {
+    getInfo () {
       this.$http
         .get(`/sys/news/${this.dataForm.id}`)
         .then(({ data: res }) => {
@@ -190,7 +167,7 @@ export default {
           this.dataForm = res.data
           this.quillEditor.root.innerHTML = this.dataForm.content
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     // 表单提交
     dataFormSubmitHandle: debounce(
@@ -218,7 +195,7 @@ export default {
                 }
               })
             })
-            .catch(() => {})
+            .catch(() => { })
         })
       },
       1000,
diff --git a/epmet-oper-web/src/views/modules/sys/upgrade-version-history.vue b/epmet-oper-web/src/views/modules/sys/upgrade-version-history.vue
index fd5c2a0..aa33d29 100644
--- a/epmet-oper-web/src/views/modules/sys/upgrade-version-history.vue
+++ b/epmet-oper-web/src/views/modules/sys/upgrade-version-history.vue
@@ -1,7 +1,6 @@
 <template>
   <div>
-    <el-card shadow="never"
-             class="aui-card--fill">
+    <el-card shadow="never" class="aui-card--fill">
 
       <!-- 按钮 -->
       <div class="btn-group">
@@ -12,9 +11,7 @@
       <!-- 数据列表 -->
       <div>
         <el-table :data="histories" border style="width: 100%">
-          <el-table-column
-              prop="versionNo"
-              label="版本">
+          <el-table-column prop="versionNo" label="版本">
           </el-table-column>
           <el-table-column label="操作" :width="250">
             <template slot-scope="scope">
@@ -26,13 +23,8 @@
       </div>
 
       <!-- 分页条-->
-      <el-pagination
-          background
-          layout="prev, pager, next"
-          @current-change="onCurrentPageChanged"
-          :current-page="this.pageArgs.pageNo"
-          :page-size="this.pageArgs.pageSize"
-          :total="this.pageArgs.total">
+      <el-pagination background layout="prev, pager, next" @current-change="onCurrentPageChanged"
+        :current-page="this.pageArgs.pageNo" :page-size="this.pageArgs.pageSize" :total="this.pageArgs.total">
       </el-pagination>
 
       <!--      <Tinymce
@@ -43,11 +35,8 @@
     </el-card>
 
     <!-- 新增/修改 -->
-    <el-dialog :visible.sync="publishVersionUpgradeShow"
-               v-if="publishVersionUpgradeShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="this.operation === 'create' ? '发布新版本' : '修改'">
+    <el-dialog :visible.sync="publishVersionUpgradeShow" v-if="publishVersionUpgradeShow" :close-on-click-modal="false"
+      :close-on-press-escape="false" :title="this.operation === 'create' ? '发布新版本' : '修改'">
       <el-form :model="createOrUpdateForm" ref="createOrUpdateForm">
         <el-form-item prop="versionNo" label="版本">
           <el-input v-model="createOrUpdateForm.versionNo">
@@ -56,23 +45,17 @@
 
         <el-form-item prop="richContent" label="内容">
           <!-- <el-input v-model="createOrUpdateForm.richContent"> -->
-        <!-- <Tinymce v-model="createOrUpdateForm.richContent" :height="300" placeholder="在这里输入文字" /> -->
-        
-        <!-- :customerId="customerId" -->
-        <div id="J_quillEditor"></div>
-        <!-- 自定义上传图片功能 (使用element upload组件) -->
-        <el-upload
-          :headers="$getElUploadHeaders()"
-          :action="uploadUrl"
-          :show-file-list="false"
-          :before-upload="uploadBeforeUploadHandle"
-          :on-success="uploadSuccessHandle"
-          style="display: none"
-        >
-          <el-button ref="uploadBtn" type="primary" size="small">{{
-            $t('upload.button')
-          }}</el-button>
-        </el-upload>
+          <!-- <Tinymce v-model="createOrUpdateForm.richContent" :height="300" placeholder="在这里输入文字" /> -->
+
+          <!-- :customerId="customerId" -->
+          <div id="J_quillEditor"></div>
+          <!-- 自定义上传图片功能 (使用element upload组件) -->
+          <el-upload :headers="$getElUploadHeaders()" :action="uploadUrl" :show-file-list="false"
+            :before-upload="uploadBeforeUploadHandle" :on-success="uploadSuccessHandle" style="display: none">
+            <el-button ref="uploadBtn" type="primary" size="small">{{
+              $t('upload.button')
+              }}</el-button>
+          </el-upload>
           <!-- </el-input> -->
         </el-form-item>
         <el-button @click="onSubmitBtnClick" type="primary">提交</el-button>
@@ -91,13 +74,13 @@ export default {
 
   components: {},
 
-  activated() {
+  activated () {
     this.loadVersionUpgradeHistories();
   },
-  mounted(){
-    
+  mounted () {
+
   },
-  data() {
+  data () {
     return {
       quillEditor: null,
       quillEditorToolbarOptions: [
@@ -135,7 +118,7 @@ export default {
 
   methods: {
     // 图片上传前
-    uploadBeforeUploadHandle(file) {
+    uploadBeforeUploadHandle (file) {
       if (
         file.type !== 'image/jpg' &&
         file.type !== 'image/jpeg' &&
@@ -147,7 +130,7 @@ export default {
       }
     },
     // 上传图片成功
-    uploadSuccessHandle(res, file, fileList) {
+    uploadSuccessHandle (res, file, fileList) {
       if (res.code !== 0) {
         return this.$message.error(res.msg)
       }
@@ -158,7 +141,7 @@ export default {
       )
     },
     // 加载富文本编辑器
-    initQuill() {
+    initQuill () {
       console.log(document.getElementById('J_quillEditor'));
       this.quillEditor = new Quill('#J_quillEditor', {
         modules: {
@@ -167,9 +150,8 @@ export default {
         theme: 'snow'
       })
       // 自定义上传图片功能 (使用element upload组件)
-      this.uploadUrl = `${
-        window.SITE_CONFIG['apiURL']
-      }/oss/file/upload?token=${Cookies.get('token')}`
+      this.uploadUrl = `${window.SITE_CONFIG['apiURL']
+        }/oss/file/upload?token=${Cookies.get('oper_token')}`
       this.quillEditor.getModule('toolbar').addHandler('image', () => {
         this.$refs.uploadBtn.$el.click()
       })
@@ -181,31 +163,31 @@ export default {
     /**
      * 加载版本更新历史
      */
-    loadVersionUpgradeHistories() {
+    loadVersionUpgradeHistories () {
       this.$http.get(`/sys/sysVersionUpgrade/page?pageNo=${this.pageArgs.pageNo}&pageSize=${this.pageArgs.pageSize}`)
-          .then(({data: result, status: httpStatus}) => {
-            if (result.code === 0) {
-              this.histories = result.data.list
-              this.pageArgs.total = result.data.total
-            } else {
-              this.$message({
-                type: 'error',
-                message: result.msg
-              })
-            }
-          })
+        .then(({ data: result, status: httpStatus }) => {
+          if (result.code === 0) {
+            this.histories = result.data.list
+            this.pageArgs.total = result.data.total
+          } else {
+            this.$message({
+              type: 'error',
+              message: result.msg
+            })
+          }
+        })
     },
     // 新增按钮点击
-    onAddBtnClick() {
+    onAddBtnClick () {
       this.publishVersionUpgradeShow = true;
       this.operation = 'create';
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         this.initQuill()
       })
     },
 
     // 编辑按钮点击
-    async onEditBtnClick(id) {
+    async onEditBtnClick (id) {
       this.publishVersionUpgradeShow = true;
       this.operation = 'edit';
       await this.getDetail(id);
@@ -213,7 +195,7 @@ export default {
 
     },
 
-    onCancelBtnClick() {
+    onCancelBtnClick () {
       this.$refs['createOrUpdateForm'].resetFields();
       this.publishVersionUpgradeShow = false;
       this.operation = null;
@@ -223,7 +205,7 @@ export default {
     /**
      * 翻页
      */
-    onCurrentPageChanged(pageNo) {
+    onCurrentPageChanged (pageNo) {
       this.pageArgs.pageNo = pageNo
       this.loadVersionUpgradeHistories()
     },
@@ -231,63 +213,63 @@ export default {
     /**
      * 提交
      */
-    onSubmitBtnClick() {
+    onSubmitBtnClick () {
       let url = this.operation === 'create' ? `/sys/sysVersionUpgrade/publish` : '/sys/sysVersionUpgrade/update';
       this.$http.post(url, this.$data.createOrUpdateForm)
-          .then(({data: rst, status: httpStatus}) => {
-            if (httpStatus !== 200) {
-              this.$message({
-                type: 'error',
-                message: '请求失败'
-              })
-            } else if (rst.code !== 0) {
-              this.$message({
-                type: 'error',
-                message: rst.msg
-              });
-            } else {
-              this.$message({
-                type: 'success',
-                message: '提交成功'
-              });
+        .then(({ data: rst, status: httpStatus }) => {
+          if (httpStatus !== 200) {
+            this.$message({
+              type: 'error',
+              message: '请求失败'
+            })
+          } else if (rst.code !== 0) {
+            this.$message({
+              type: 'error',
+              message: rst.msg
+            });
+          } else {
+            this.$message({
+              type: 'success',
+              message: '提交成功'
+            });
 
-              this.$refs['createOrUpdateForm'].resetFields();
-              this.publishVersionUpgradeShow = false;
-              this.loadVersionUpgradeHistories();
-            }
-          })
+            this.$refs['createOrUpdateForm'].resetFields();
+            this.publishVersionUpgradeShow = false;
+            this.loadVersionUpgradeHistories();
+          }
+        })
     },
 
     /**
      * 加载详情
      * @param id
      */
-    getDetail(id) {
+    getDetail (id) {
       this.$http.get(`/sys/sysVersionUpgrade/detail/${id}`)
-          .then(({status: httpStatus, data: epmetRst}) => {
-            if (httpStatus !== 200) {
-              this.$message({
-                type: 'error',
-                message: '请求失败'
-              })
-            } else if (epmetRst.code != 0) {
-              this.$message({
-                type: 'error',
-                message: epmetRst.msg
-              })
-            } else {
-              this.createOrUpdateForm = epmetRst.data;
+        .then(({ status: httpStatus, data: epmetRst }) => {
+          if (httpStatus !== 200) {
+            this.$message({
+              type: 'error',
+              message: '请求失败'
+            })
+          } else if (epmetRst.code != 0) {
+            this.$message({
+              type: 'error',
+              message: epmetRst.msg
+            })
+          } else {
+            this.createOrUpdateForm = epmetRst.data;
             this.quillEditor.root.innerHTML = this.createOrUpdateForm.richContent
 
-            }
-          })
+          }
+        })
     }
   }
 }
 </script>
 
 <style scoped lang="css">
-::v-deep .ql-toolbar{
+::v-deep .ql-toolbar {
   margin-top: 36px;
 }
 </style>
diff --git a/epmet-oper-web/src/views/pages/login.vue b/epmet-oper-web/src/views/pages/login.vue
index aad890b..cd376f6 100644
--- a/epmet-oper-web/src/views/pages/login.vue
+++ b/epmet-oper-web/src/views/pages/login.vue
@@ -7,13 +7,8 @@
         </div>
         <div class="login-body">
           <h3 class="login-title">{{ $t('login.title') }}</h3>
-          <el-form
-            :model="dataForm"
-            :rules="dataRule"
-            ref="dataForm"
-            @keyup.enter.native="dataFormSubmitHandle()"
-            status-icon
-          >
+          <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()"
+            status-icon>
             <!-- <el-form-item>
               <el-select v-model="$i18n.locale"
                          class="w-percent-100">
@@ -33,11 +28,7 @@
               </el-input>
             </el-form-item>
             <el-form-item prop="password">
-              <el-input
-                v-model="dataForm.password"
-                type="password"
-                :placeholder="$t('login.password')"
-              >
+              <el-input v-model="dataForm.password" type="password" :placeholder="$t('login.password')">
                 <span slot="prefix" class="el-input__icon">
                   <svg class="icon-svg" aria-hidden="true">
                     <use xlink:href="#icon-lock"></use>
@@ -48,10 +39,7 @@
             <el-form-item prop="captcha">
               <el-row :gutter="20">
                 <el-col :span="14">
-                  <el-input
-                    v-model="dataForm.captcha"
-                    :placeholder="$t('login.captcha')"
-                  >
+                  <el-input v-model="dataForm.captcha" :placeholder="$t('login.captcha')">
                     <span slot="prefix" class="el-input__icon">
                       <svg class="icon-svg" aria-hidden="true">
                         <use xlink:href="#icon-safetycertificate"></use>
@@ -65,22 +53,14 @@
               </el-row>
             </el-form-item>
             <el-form-item>
-              <el-button
-                type="primary"
-                @click="dataFormSubmitHandle()"
-                class="w-percent-100"
-                >{{ $t('login.title') }}</el-button
-              >
+              <el-button type="primary" @click="dataFormSubmitHandle()" class="w-percent-100">{{ $t('login.title')
+                }}</el-button>
             </el-form-item>
           </el-form>
         </div>
         <div class="login-footer">
           <p>
-            <a
-              href="https://demo.cloud.renren.io/renren-cloud"
-              target="_blank"
-              >{{ $t('login.demo') }}</a
-            >
+            <a href="https://demo.cloud.renren.io/renren-cloud" target="_blank">{{ $t('login.demo') }}</a>
           </p>
           <!-- 2020 © renren.io -->
           <p>
@@ -100,7 +80,7 @@ import debounce from 'lodash/debounce'
 import { messages } from '@/i18n'
 import { getUUID, encryptedData } from '@/utils'
 export default {
-  data() {
+  data () {
     return {
       i18nMessages: messages,
       captchaPath: '',
@@ -117,7 +97,7 @@ export default {
     }
   },
   computed: {
-    dataRule() {
+    dataRule () {
       return {
         phone: [{ required: true, message: '手机号不能为空', trigger: 'blur' }],
         password: [
@@ -129,7 +109,7 @@ export default {
       }
     }
   },
-  created() {
+  created () {
     this.getCaptcha()
 
     //获取公钥
@@ -137,13 +117,13 @@ export default {
   },
   methods: {
     // 获取验证码
-    getCaptcha() {
+    getCaptcha () {
       this.dataForm.uuid = getUUID()
       this.captchaPath = `${window.SITE_CONFIG['apiURL']}/auth/login/captcha?uuid=${this.dataForm.uuid}`
     },
 
     // 获取公钥
-    getPubKey() {
+    getPubKey () {
       this.$http
         .post('/auth/govweb/getKey')
         .then(({ data: res }) => {
@@ -153,7 +133,7 @@ export default {
 
           this.pubKey = res.data // 获取到公钥;
         })
-        .catch(() => {})
+        .catch(() => { })
     },
 
     // 表单提交
@@ -177,11 +157,11 @@ export default {
                 return this.$message.error(res.msg)
               }
               localStorage.setItem('userType', 'oper')
-              localStorage.setItem('token', res.data.token)
-              Cookies.set('token', res.data.token)
-              this.$router.replace({ name: 'home' }).catch(() => {})
+              localStorage.setItem('oper_token', res.data.token)
+              Cookies.set('oper_token', res.data.token)
+              this.$router.replace({ name: 'home' }).catch(() => { })
             })
-            .catch(() => {})
+            .catch(() => { })
         })
       },
       1000,