vue2-client 1.8.0-4 → 1.8.0-6

package/.env

@@ -14,3 +14,4 @@ VUE_APP_SINGLEVALUE_KEY=admin.singlevalue
 VUE_APP_DIVISIONSOHCHINA=admin.divisionsohchina
 VUE_APP_WEB_CONFIG_KEY=admin.webconfig
 VUE_APP_API_BASE_URL=http://123.60.214.109:8405
+VUE_APP_SYSTEM_NAME=af-system

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.0-4",
+  "version": "1.8.0-6",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",

package/src/config/default/setting.config.js

@@ -40,8 +40,6 @@ module.exports = {
     // 通知
     notice: true
   },
-  // 配置的默认命名空间
-  defaultServiceName: 'af-system',
   // 旧系统路径
   iframeSrc: '../singlepage/page.html',
   // 兼容旧版本 V3(最新V3产品)  OA(公司OA)

package/src/pages/CreateQueryPage.vue

@@ -24,7 +24,7 @@
     >
       <a-form-model :model="form" :rules="rules" ref="liuliModel">
         <a-form-model-item label="命名空间" prop="namespaceName">
-          <a-input v-model="form.namespaceName" :placeholder="'默认值：' + this.defaultServiceName"/>
+          <a-input v-model="form.namespaceName" :placeholder="'默认值：' + systemName"/>
         </a-form-model-item>
         <a-form-model-item label="配置名称" prop="configName">
           <a-input v-model="form.configName"/>
@@ -58,7 +58,6 @@
 <script>
 import CreateQuery from '@vue2-client/base-client/components/common/CreateQuery'
 import CreateSimpleFormQuery from '@vue2-client/base-client/components/common/CreateSimpleFormQuery'
-import { mapState } from 'vuex'
 import { getNativeConfig } from '@vue2-client/services/api/common'
 
 export default {
@@ -88,7 +87,9 @@ export default {
     }
   },
   computed: {
-    ...mapState('setting', ['defaultServiceName'])
+    systemName () {
+      return process.env.VUE_APP_SYSTEM_NAME
+    }
   },
   methods: {
     showDrawer () {

package/src/services/api/common.js

@@ -5,7 +5,6 @@ import { blobValidate } from '@vue2-client/utils/common'
 import errorCode from '@vue2-client/utils/errorCode'
 import { saveAs } from 'file-saver'
 import { post } from '@vue2-client/services/api/restTools'
-import setting from '@vue2-client/store/modules/setting'
 
 const commonApi = {
   // 获取配置
@@ -36,15 +35,15 @@ const commonApi = {
   getEmpTree: '/api/af-system/logic/getEmpTree',
 }
 
-export function getConfigUrl (serviceName = setting.state.defaultServiceName) {
+export function getConfigUrl (serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   return '/api/' + serviceName + '/' + commonApi.getConfig
 }
 
-export function getNativeConfigUrl (serviceName = setting.state.defaultServiceName) {
+export function getNativeConfigUrl (serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   return '/api/' + serviceName + '/' + commonApi.getNativeConfig
 }
 
-export function parseConfigUrl (serviceName = setting.state.defaultServiceName) {
+export function parseConfigUrl (serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   return '/api/' + serviceName + '/' + commonApi.parseConfig
 }
 
@@ -61,11 +60,11 @@ export function getDictionaryParam () {
  * @param serviceName 命名空间名称
  * @param callback 回调函数
  */
-export function getConfig (configName, serviceName = setting.state.defaultServiceName, callback) {
+export function getConfig (configName, serviceName = process.env.VUE_APP_SYSTEM_NAME, callback) {
   indexedDB.getByWeb(configName, getConfigUrl(serviceName), { configName: configName }, callback)
 }
 
-export function getNativeConfig (configName, serviceName = setting.state.defaultServiceName) {
+export function getNativeConfig (configName, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   return post(getNativeConfigUrl(serviceName), { configName: configName })
 }
 
@@ -76,7 +75,7 @@ export function getNativeConfig (configName, serviceName = setting.state.default
  * @param serviceName 命名空间名称
  * @param callback 回调函数
  */
-export function getConfigByLogic (logicName, parameter, serviceName = setting.state.defaultServiceName, callback) {
+export function getConfigByLogic (logicName, parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, callback) {
   indexedDB.getByWeb(`${logicName}_${JSON.stringify(parameter)}`, '/api/' + serviceName + '/logic/' + logicName,
     parameter, callback)
 }
@@ -87,7 +86,7 @@ export function getConfigByLogic (logicName, parameter, serviceName = setting.st
  * @param configType 配置类型
  * @param serviceName 命名空间名称
  */
-export function parseConfig (configContent, configType, serviceName = setting.state.defaultServiceName) {
+export function parseConfig (configContent, configType, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   const url = parseConfigUrl(serviceName)
   return post(url, {
     configType: configType,
@@ -98,61 +97,61 @@ export function parseConfig (configContent, configType, serviceName = setting.st
 /**
  * 通用执行业务逻辑
  */
-export function runLogic (logicName, parameter, serviceName = setting.state.defaultServiceName) {
+export function runLogic (logicName, parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   return post('/api/' + serviceName + '/logic/' + logicName, parameter)
 }
 
 /**
  * 通用查询
  */
-export function query (parameter, serviceName = setting.state.defaultServiceName) {
+export function query (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   return post('/api/' + serviceName + '/' + commonApi.query, parameter, null)
 }
 
 /**
  * 通用表单查询
  */
-export function queryWithResource (parameter, serviceName = setting.state.defaultServiceName) {
+export function queryWithResource (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   return post('/api/' + serviceName + '/' + commonApi.queryWithResource, parameter, null)
 }
 
 /**
  * 通用新增/修改
  */
-export function addOrModify (parameter, serviceName = setting.state.defaultServiceName) {
+export function addOrModify (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   return post('/api/' + serviceName + '/' + commonApi.addOrModify, parameter, null)
 }
 
 /**
  * 通用删除
  */
-export function remove (parameter, serviceName = setting.state.defaultServiceName) {
+export function remove (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   return post('/api/' + serviceName + '/' + commonApi.delete, parameter, null)
 }
 
 /**
  * 通用导入
  */
-export function importData (parameter, serviceName = setting.state.defaultServiceName) {
+export function importData (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   return post('/api/' + serviceName + '/' + commonApi.importData, parameter, null)
 }
 
 /**
  * 通用导出
  */
-export function exportData (parameter, serviceName = setting.state.defaultServiceName) {
+export function exportData (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   return post('/api/' + serviceName + '/' + commonApi.exportData, parameter, null)
 }
 
 /**
  * 通用上传
  */
-export function upload (parameter, serviceName = setting.state.defaultServiceName, config) {
+export function upload (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, config) {
   return post('/api/' + serviceName + '/' + commonApi.upload, parameter, config)
 }
 
 // 通用下载
-export function download (parameter, filename, serviceName = setting.state.defaultServiceName) {
+export function download (parameter, filename, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   const notificationKey = 'download'
   notification.open({
     key: notificationKey,
@@ -192,7 +191,7 @@ export function download (parameter, filename, serviceName = setting.state.defau
 }
 
 // 文件删除
-export function fileDelete (parameter, serviceName = setting.state.defaultServiceName) {
+export function fileDelete (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   return post('/api/' + serviceName + '/' + commonApi.fileEntity, parameter)
 }
 

package/src/services/apiService.js

@@ -5,8 +5,8 @@
 module.exports = {
   LOGIN: `/rs/logic/getLogin`,
   MODIFY_PASSWORD: '/rs/user/modifypwd',
-  V4_LOGIN: '/auth/login',
-  V4_LOGOUT: '/auth/logout',
+  V4_LOGIN: '/api/af-auth/login',
+  V4_LOGOUT: '/api/af-auth/logout',
   ROUTES: `/rs/user/userLogin`,
   SEARCH: `/rs/search`,
   GOODS: `/goods`,

package/src/utils/request.js

@@ -5,6 +5,7 @@ import notification from 'ant-design-vue/es/notification'
 import errorCode from '@vue2-client/utils/errorCode'
 import qs from 'qs'
 import { logout } from '@vue2-client/services/user'
+import { V4_LOGIN } from '@vue2-client/services/apiService'
 
 // 是否显示重新登录
 let isReloginShow
@@ -134,7 +135,7 @@ function loadInterceptors () {
     // 如果 token 存在
     // 让每个请求携带自定义 token 请根据实际情况自行修改
     if (token) {
-      if (config.url !== '/auth/login') {
+      if (config.url !== V4_LOGIN) {
         // 判断是否为V4环境
         const compatible = getSystemVersion()
         if (compatible === 'V4') {

package/vue.config.js

@@ -24,11 +24,6 @@ module.exports = {
         ws: false,
         changeOrigin: true
       },
-      '/auth': {
-        pathRewrite: { '^/auth/': '/rs/auth/' },
-        target: local,
-        changeOrigin: true
-      },
       '/api': {
         pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },
         // pathRewrite: { '^/api': '/' },