提交一下啊

1

.env.development

@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = 'http://mandev.dayaedu.com/api-oa'
+#VUE_APP_BASE_API = 'http://mandev.dayaedu.com'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

.env.production

@@ -2,5 +2,5 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = '/api-oa'
+#VUE_APP_BASE_API = '/api-oa'
 

.env.staging

@@ -4,5 +4,5 @@ NODE_ENV = production
 ENV = 'staging'
 
 # base api
-VUE_APP_BASE_API = ''
+#VUE_APP_BASE_API = ''
 

package.json

@@ -61,6 +61,7 @@
     "numericjs": "^1.2.6",
     "path-to-regexp": "2.4.0",
     "qiniu-js": "^3.0.3",
+    "qs": "^6.10.1",
     "screenfull": "4.2.0",
     "showdown": "^1.9.1",
     "solarlunar": "^2.0.7",

src/api/dashboard.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function initData(params) {
   return request({
-    url: '/api/v1/dashboard',
+    url: '/api-oa/api/v1/dashboard',
     method: 'get',
     params
   })

src/api/login.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取验证码
 export function getCodeImg() {
   return request({
-    url: '/api/v1/getCaptcha',
+    url: '/api-oa/api/v1/getCaptcha',
     method: 'get'
   })
 }

src/api/monitor/server.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询服务器详细
 export function getServer() {
   return request({
-    url: '/api/v1/monitor/server',
+    url: '/api-oa/api/v1/monitor/server',
     method: 'get'
   })
 }

src/api/process/admin/classify.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 创建流程分类
 export function createClassify(data) {
   return request({
-    url: '/api/v1/classify',
+    url: '/api-oa/api/v1/classify',
     method: 'post',
     data
   })
@@ -12,7 +12,7 @@ export function createClassify(data) {
 // 流程分类列表
 export function classifyList(params) {
   return request({
-    url: '/api/v1/classify',
+    url: '/api-oa/api/v1/classify',
     method: 'get',
     params
   })
@@ -21,7 +21,7 @@ export function classifyList(params) {
 // 更新流程分类
 export function updateClassify(data) {
   return request({
-    url: '/api/v1/classify',
+    url: '/api-oa/api/v1/classify',
     method: 'put',
     data
   })
@@ -30,7 +30,7 @@ export function updateClassify(data) {
 // 删除流程分类
 export function deleteClassify(params) {
   return request({
-    url: '/api/v1/classify',
+    url: '/api-oa/api/v1/classify',
     method: 'delete',
     params
   })

src/api/process/admin/process.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 创建流程
 export function createProcess(data) {
   return request({
-    url: '/api/v1/process',
+    url: '/api-oa/api/v1/process',
     method: 'post',
     data
   })
@@ -12,7 +12,7 @@ export function createProcess(data) {
 // 流程列表
 export function processList(params) {
   return request({
-    url: '/api/v1/process',
+    url: '/api-oa/api/v1/process',
     method: 'get',
     params
   })
@@ -21,7 +21,7 @@ export function processList(params) {
 // 更新流程
 export function updateProcess(data) {
   return request({
-    url: '/api/v1/process',
+    url: '/api-oa/api/v1/process',
     method: 'put',
     data
   })
@@ -30,7 +30,7 @@ export function updateProcess(data) {
 // 删除流程
 export function deleteProcess(params) {
   return request({
-    url: '/api/v1/process',
+    url: '/api-oa/api/v1/process',
     method: 'delete',
     params
   })
@@ -39,7 +39,7 @@ export function deleteProcess(params) {
 // 流程详情
 export function processDetails(params) {
   return request({
-    url: '/api/v1/process/details',
+    url: '/api-oa/api/v1/process/details',
     method: 'get',
     params
   })
@@ -48,7 +48,7 @@ export function processDetails(params) {
 // 分类流程列表
 export function classifyProcessList(params) {
   return request({
-    url: '/api/v1/process/classify',
+    url: '/api-oa/api/v1/process/classify',
     method: 'get',
     params
   })
@@ -57,7 +57,7 @@ export function classifyProcessList(params) {
 // 克隆流程
 export function cloneProcess(id) {
   return request({
-    url: `/api/v1/process/clone/${id}`,
+    url: `/api-oa/api/v1/process/clone/${id}`,
     method: 'post'
   })
 }

src/api/process/admin/task.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 新建任务
 export function createTask(data) {
   return request({
-    url: '/api/v1/task',
+    url: '/api-oa/api/v1/task',
     method: 'post',
     data
   })
@@ -12,7 +12,7 @@ export function createTask(data) {
 // 任务列表
 export function taskList(params) {
   return request({
-    url: '/api/v1/task',
+    url: '/api-oa/api/v1/task',
     method: 'get',
     params
   })
@@ -21,7 +21,7 @@ export function taskList(params) {
 // 更新任务
 export function updateTask(data) {
   return request({
-    url: '/api/v1/task',
+    url: '/api-oa/api/v1/task',
     method: 'put',
     data
   })
@@ -30,7 +30,7 @@ export function updateTask(data) {
 // 删除任务
 export function deleteTask(params) {
   return request({
-    url: '/api/v1/task',
+    url: '/api-oa/api/v1/task',
     method: 'delete',
     params
   })
@@ -39,7 +39,7 @@ export function deleteTask(params) {
 // 任务详情
 export function taskDetails(params) {
   return request({
-    url: '/api/v1/task/details',
+    url: '/api-oa/api/v1/task/details',
     method: 'get',
     params
   })

src/api/process/admin/template.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 创建模版
 export function createTemplate(data) {
   return request({
-    url: '/api/v1/tpl',
+    url: '/api-oa/api/v1/tpl',
     method: 'post',
     data
   })
@@ -12,7 +12,7 @@ export function createTemplate(data) {
 // 模版列表
 export function templateList(params) {
   return request({
-    url: '/api/v1/tpl',
+    url: '/api-oa/api/v1/tpl',
     method: 'get',
     params
   })
@@ -21,7 +21,7 @@ export function templateList(params) {
 // 模版详情
 export function templateDetails(params) {
   return request({
-    url: '/api/v1/tpl/details',
+    url: '/api-oa/api/v1/tpl/details',
     method: 'get',
     params
   })
@@ -30,7 +30,7 @@ export function templateDetails(params) {
 // 更新模版
 export function editTemplate(data) {
   return request({
-    url: '/api/v1/tpl',
+    url: '/api-oa/api/v1/tpl',
     method: 'put',
     data
   })
@@ -39,7 +39,7 @@ export function editTemplate(data) {
 // 删除模版
 export function deleteTemplate(params) {
   return request({
-    url: '/api/v1/tpl',
+    url: '/api-oa/api/v1/tpl',
     method: 'delete',
     params
   })
@@ -48,7 +48,7 @@ export function deleteTemplate(params) {
 // 克隆模版
 export function cloneTemplate(id) {
   return request({
-    url: `/api/v1/tpl/clone/${id}`,
+    url: `/api-oa/api/v1/tpl/clone/${id}`,
     method: 'post'
   })
 }

src/api/process/work-order.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 流程结构
 export function processStructure(params) {
   return request({
-    url: '/api/v1/work-order/process-structure',
+    url: '/api-oa/api/v1/work-order/process-structure',
     method: 'get',
     params
   })
@@ -12,7 +12,7 @@ export function processStructure(params) {
 // 新建工单
 export function createWorkOrder(data) {
   return request({
-    url: '/api/v1/work-order/create',
+    url: '/api-oa/api/v1/work-order/create',
     method: 'post',
     data
   })
@@ -21,7 +21,7 @@ export function createWorkOrder(data) {
 // 工单列表
 export function workOrderList(params) {
   return request({
-    url: '/api/v1/work-order/list',
+    url: '/api-oa/api/v1/work-order/list',
     method: 'get',
     params
   })
@@ -30,7 +30,7 @@ export function workOrderList(params) {
 // 处理工单
 export function handleWorkOrder(data) {
   return request({
-    url: '/api/v1/work-order/handle',
+    url: '/api-oa/api/v1/work-order/handle',
     method: 'post',
     data
   })
@@ -39,7 +39,7 @@ export function handleWorkOrder(data) {
 // 结束工单
 export function unityWorkOrder(params) {
   return request({
-    url: '/api/v1/work-order/unity',
+    url: '/api-oa/api/v1/work-order/unity',
     method: 'get',
     params
   })
@@ -48,7 +48,7 @@ export function unityWorkOrder(params) {
 // 转交工单
 export function inversionWorkOrder(data) {
   return request({
-    url: '/api/v1/work-order/inversion',
+    url: '/api-oa/api/v1/work-order/inversion',
     method: 'post',
     data
   })
@@ -57,7 +57,7 @@ export function inversionWorkOrder(data) {
 // 催办工单
 export function urgeWorkOrder(params) {
   return request({
-    url: '/api/v1/work-order/urge',
+    url: '/api-oa/api/v1/work-order/urge',
     method: 'get',
     params
   })
@@ -66,7 +66,7 @@ export function urgeWorkOrder(params) {
 // 主动接单
 export function activeOrder(data, workOrderId) {
   return request({
-    url: `/api/v1/work-order/active-order/${workOrderId}`,
+    url: `/api-oa/api/v1/work-order/active-order/${workOrderId}`,
     method: 'put',
     data
   })
@@ -75,7 +75,7 @@ export function activeOrder(data, workOrderId) {
 // 删除工单
 export function deleteWorkOrder(workOrderId) {
   return request({
-    url: `/api/v1/work-order/delete/${workOrderId}`,
+    url: `/api-oa/api/v1/work-order/delete/${workOrderId}`,
     method: 'delete'
   })
 }
@@ -83,7 +83,7 @@ export function deleteWorkOrder(workOrderId) {
 // 删除工单
 export function reopenWorkOrder(id) {
   return request({
-    url: `/api/v1/work-order/reopen/${id}`,
+    url: `/api-oa/api/v1/work-order/reopen/${id}`,
     method: 'post'
   })
 }

src/api/remote-search.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function searchUser(name) {
   return request({
-    url: '/search/user',
+    url: '/api-oa/search/user',
     method: 'get',
     params: { name }
   })
@@ -10,7 +10,7 @@ export function searchUser(name) {
 
 export function transactionList(query) {
   return request({
-    url: '/transaction/list',
+    url: '/api-oa/transaction/list',
     method: 'get',
     params: query
   })

src/api/system/dept.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function getDeptList(query) {
   return request({
-    url: '/api/v1/deptList',
+    url: '/api-oa/api/v1/deptList',
     method: 'get',
     params: query
   })
@@ -10,7 +10,7 @@ export function getDeptList(query) {
 
 export function getOrdinaryDeptList(params) {
   return request({
-    url: '/api/v1/ordinaryDeptList',
+    url: '/api-oa/api/v1/ordinaryDeptList',
     method: 'get',
     params
   })
@@ -19,7 +19,7 @@ export function getOrdinaryDeptList(params) {
 // 查询部门详细
 export function getDept(deptId) {
   return request({
-    url: '/api/v1/dept/' + deptId,
+    url: '/api-oa/api/v1/dept/' + deptId,
     method: 'get'
   })
 }
@@ -27,7 +27,7 @@ export function getDept(deptId) {
 // 查询部门下拉树结构
 export function treeselect() {
   return request({
-    url: '/api/v1/deptTree',
+    url: '/api-oa/api/v1/deptTree',
     method: 'get'
   })
 }
@@ -35,7 +35,7 @@ export function treeselect() {
 // 根据角色ID查询部门树结构
 export function roleDeptTreeselect(roleId) {
   return request({
-    url: '/api/v1/roleDeptTreeselect/' + roleId,
+    url: '/api-oa/api/v1/roleDeptTreeselect/' + roleId,
     method: 'get'
   })
 }
@@ -43,7 +43,7 @@ export function roleDeptTreeselect(roleId) {
 // 新增部门
 export function addDept(data) {
   return request({
-    url: '/api/v1/dept',
+    url: '/api-oa/api/v1/dept',
     method: 'post',
     data: data
   })
@@ -52,7 +52,7 @@ export function addDept(data) {
 // 修改部门
 export function updateDept(data) {
   return request({
-    url: '/api/v1/dept',
+    url: '/api-oa/api/v1/dept',
     method: 'put',
     data: data
   })
@@ -61,7 +61,7 @@ export function updateDept(data) {
 // 删除部门
 export function delDept(deptId) {
   return request({
-    url: '/api/v1/dept/' + deptId,
+    url: '/api-oa/api/v1/dept/' + deptId,
     method: 'delete'
   })
 }

src/api/system/loginlog.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询登录日志列表
 export function list(query) {
   return request({
-    url: '/api/v1/loginloglist',
+    url: '/api-oa/api/v1/loginloglist',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function list(query) {
 // 删除登录日志
 export function delLogininfor(infoId) {
   return request({
-    url: '/api/v1/loginlog/' + infoId,
+    url: '/api-oa/api/v1/loginlog/' + infoId,
     method: 'delete'
   })
 }
@@ -20,7 +20,7 @@ export function delLogininfor(infoId) {
 // 清空登录日志
 export function cleanLogininfor() {
   return request({
-    url: '/api/v1/loginlog',
+    url: '/api-oa/api/v1/loginlog',
     method: 'delete'
   })
 }
@@ -28,7 +28,7 @@ export function cleanLogininfor() {
 // 导出登录日志
 export function exportLogininfor(query) {
   return request({
-    url: '/api/v1/loginlog/export',
+    url: '/api-oa/api/v1/loginlog/export',
     method: 'get',
     params: query
   })

src/api/system/menu.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询菜单列表
 export function listMenu(query) {
   return request({
-    url: '/api/v1/menulist',
+    url: '/api-oa/api/v1/menulist',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listMenu(query) {
 // 查询菜单详细
 export function getMenu(menuId) {
   return request({
-    url: '/api/v1/menu/' + menuId,
+    url: '/api-oa/api/v1/menu/' + menuId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getMenu(menuId) {
 // 查询菜单下拉树结构
 export function treeselect() {
   return request({
-    url: '/api/v1/menuTreeselect',
+    url: '/api-oa/api/v1/menuTreeselect',
     method: 'get'
   })
 }
@@ -28,7 +28,7 @@ export function treeselect() {
 // 根据角色ID查询菜单下拉树结构
 export function roleMenuTreeselect(roleId) {
   return request({
-    url: '/api/v1/roleMenuTreeselect/' + roleId,
+    url: '/api-oa/api/v1/roleMenuTreeselect/' + roleId,
     method: 'get'
   })
 }
@@ -36,7 +36,7 @@ export function roleMenuTreeselect(roleId) {
 // 新增菜单
 export function addMenu(data) {
   return request({
-    url: '/api/v1/menu',
+    url: '/api-oa/api/v1/menu',
     method: 'post',
     data: data
   })

src/api/system/post.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询岗位列表
 export function listPost(query) {
   return request({
-    url: '/api/v1/postlist',
+    url: '/api-oa/api/v1/postlist',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listPost(query) {
 // 查询岗位详细
 export function getPost(postId) {
   return request({
-    url: '/api/v1/post/' + postId,
+    url: '/api-oa/api/v1/post/' + postId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getPost(postId) {
 // 新增岗位
 export function addPost(data) {
   return request({
-    url: '/api/v1/post',
+    url: '/api-oa/api/v1/post',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addPost(data) {
 // 修改岗位
 export function updatePost(data) {
   return request({
-    url: '/api/v1/post',
+    url: '/api-oa/api/v1/post',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updatePost(data) {
 // 删除岗位
 export function delPost(postId) {
   return request({
-    url: '/api/v1/post/' + postId,
+    url: '/api-oa/api/v1/post/' + postId,
     method: 'delete'
   })
 }

src/api/system/role.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询角色列表
 export function listRole(query) {
   return request({
-    url: '/api/v1/rolelist',
+    url: '/api-oa/api/v1/rolelist',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listRole(query) {
 // 查询角色详细
 export function getRole(roleId) {
   return request({
-    url: '/api/v1/role/' + roleId,
+    url: '/api-oa/api/v1/role/' + roleId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getRole(roleId) {
 // 新增角色
 export function addRole(data) {
   return request({
-    url: '/api/v1/role',
+    url: '/api-oa/api/v1/role',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addRole(data) {
 // 修改角色
 export function updateRole(data) {
   return request({
-    url: '/api/v1/role',
+    url: '/api-oa/api/v1/role',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateRole(data) {
 // 角色数据权限
 export function dataScope(data) {
   return request({
-    url: '/api/v1/roledatascope',
+    url: '/api-oa/api/v1/roledatascope',
     method: 'put',
     data: data
   })
@@ -51,7 +51,7 @@ export function changeRoleStatus(roleId, status) {
     status
   }
   return request({
-    url: '/api/v1/role',
+    url: '/api-oa/api/v1/role',
     method: 'put',
     data: data
   })
@@ -60,28 +60,28 @@ export function changeRoleStatus(roleId, status) {
 // 删除角色
 export function delRole(roleId) {
   return request({
-    url: '/api/v1/role/' + roleId,
+    url: '/api-oa/api/v1/role/' + roleId,
     method: 'delete'
   })
 }
 
 export function getListrole(id) {
   return request({
-    url: '/api/v1/menu/role/' + id,
+    url: '/api-oa/api/v1/menu/role/' + id,
     method: 'get'
   })
 }
 
 export function getRoutes() {
   return request({
-    url: '/api/v1/menurole',
+    url: '/api-oa/api/v1/menurole',
     method: 'get'
   })
 }
 
 export function getMenuNames() {
   return request({
-    url: '/api/v1/menuids',
+    url: '/api-oa/api/v1/menuids',
     method: 'get'
   })
 }

src/api/system/settings.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 设置系统配置信息
 export function setSettings(data) {
   return request({
-    url: '/api/v1/settings',
+    url: '/api-oa/api/v1/settings',
     method: 'post',
     data
   })
@@ -12,7 +12,7 @@ export function setSettings(data) {
 // 获取系统配置信息
 export function getSettings(params) {
   return request({
-    url: '/api/v1/settings',
+    url: '/api-oa/api/v1/settings',
     method: 'get',
     params
   })

src/api/system/sysuser.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询用户列表
 export function listUser(query) {
   return request({
-    url: '/api/v1/sysUserList',
+    url: '/api-oa/api/v1/sysUserList',
     method: 'get',
     params: query
   })
@@ -12,14 +12,14 @@ export function listUser(query) {
 // 查询用户详细
 export function getUser(userId) {
   return request({
-    url: '/api/v1/sysUser/' + userId,
+    url: '/api-oa/api/v1/sysUser/' + userId,
     method: 'get'
   })
 }
 
 export function getUserInit() {
   return request({
-    url: '/api/v1/sysUser/',
+    url: '/api-oa/api/v1/sysUser/',
     method: 'get'
   })
 }
@@ -27,7 +27,7 @@ export function getUserInit() {
 // 新增用户
 export function addUser(data) {
   return request({
-    url: '/api/v1/sysUser',
+    url: '/api-oa/api/v1/sysUser',
     method: 'post',
     data: data
   })
@@ -36,7 +36,7 @@ export function addUser(data) {
 // 修改用户
 export function updateUser(data) {
   return request({
-    url: '/api/v1/sysUser',
+    url: '/api-oa/api/v1/sysUser',
     method: 'put',
     data: data
   })
@@ -45,7 +45,7 @@ export function updateUser(data) {
 // 删除用户
 export function delUser(userId) {
   return request({
-    url: '/api/v1/sysUser/' + userId,
+    url: '/api-oa/api/v1/sysUser/' + userId,
     method: 'delete'
   })
 }
@@ -53,7 +53,7 @@ export function delUser(userId) {
 // 导出用户
 export function exportUser(query) {
   return request({
-    url: '/api/v1/sysUser/export',
+    url: '/api-oa/api/v1/sysUser/export',
     method: 'get',
     params: query
   })
@@ -66,7 +66,7 @@ export function resetUserPwd(userId, password) {
     password
   }
   return request({
-    url: '/api/v1/sysUser',
+    url: '/api-oa/api/v1/sysUser',
     method: 'put',
     data: data
   })
@@ -79,7 +79,7 @@ export function changeUserStatus(userId, status) {
     status
   }
   return request({
-    url: '/api/v1/sysUser',
+    url: '/api-oa/api/v1/sysUser',
     method: 'put',
     data: data
   })
@@ -88,7 +88,7 @@ export function changeUserStatus(userId, status) {
 // 查询用户个人信息
 export function getUserProfile() {
   return request({
-    url: '/api/v1/user/profile',
+    url: '/api-oa/api/v1/user/profile',
     method: 'get'
   })
 }
@@ -96,7 +96,7 @@ export function getUserProfile() {
 // 修改用户个人信息
 export function updateUserProfile(data) {
   return request({
-    url: '/api/v1/sysUser/profile',
+    url: '/api-oa/api/v1/sysUser/profile',
     method: 'put',
     data: data
   })
@@ -110,7 +110,7 @@ export function updateUserPwd(oldPassword, newPassword, passwordType) {
     passwordType
   }
   return request({
-    url: '/api/v1/user/pwd',
+    url: '/api-oa/api/v1/user/pwd',
     method: 'put',
     data: data
   })
@@ -119,7 +119,7 @@ export function updateUserPwd(oldPassword, newPassword, passwordType) {
 // 用户头像上传
 export function uploadAvatar(data) {
   return request({
-    url: '/api/v1/user/avatar',
+    url: '/api-oa/api/v1/user/avatar',
     method: 'post',
     data: data
   })
@@ -128,7 +128,7 @@ export function uploadAvatar(data) {
 // 下载用户导入模板
 export function importTemplate() {
   return request({
-    url: '/api/v1/sysUser/importTemplate',
+    url: '/api-oa/api/v1/sysUser/importTemplate',
     method: 'get'
   })
 }

src/api/user.js

@@ -1,32 +1,35 @@
 import request from '@/utils/request'
+import qs from 'qs'
 
 export function login(data) {
   return request({
-    url: `/login`,
+    url: '/api-auth/usernameLogin',
+    // url: '/user/login',
     method: 'post',
-    data
+    data: qs.stringify(data)
   })
 }
 
-export function refreshtoken(data) {
-  return request({
-    url: '/refreshtoken',
-    method: 'post',
-    data
-  })
-}
+// export function refreshtoken(data) {
+//   return request({
+//     url: '/refreshtoken',
+//     method: 'post',
+//     data
+//   })
+// }
 
 export function getInfo() {
   return request({
-    url: '/api/v1/getinfo',
+    url: '/api-web/employee/queryUserInfo',
     method: 'get'
   })
 }
 
-export function logout() {
+export function logout(data) {
   return request({
-    url: '/api/v1/logout',
-    method: 'post'
+    url: '/api-auth/exit',
+    method: 'post',
+    data: qs.stringify(data)
   })
 }
 

src/store/modules/user.js

@@ -1,7 +1,7 @@
-import { login, logout, getInfo, refreshtoken } from '@/api/user'
+import { login, logout, getInfo } from '@/api/user'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import router, { resetRouter } from '@/router'
-
+// refreshtoken
 const state = {
   token: getToken(),
   name: '',
@@ -37,18 +37,31 @@ const mutations = {
   },
   SET_PERMISSIONS: (state, permisaction) => {
     state.permisaction = permisaction
+  },
+  SET_REFRESH_TOKEN: (state, refreshToken) => {
+    state.refreshToken = refreshToken
+  },
+  SET_EXPIRES_IN: (state, expiresIn) => {
+    state.expiresIn = expiresIn
   }
 }
 
 const actions = {
   // user login
   login({ commit }, userInfo) {
+    const { username, password } = userInfo
     return new Promise((resolve, reject) => {
-      login(userInfo).then(response => {
-        const { token } = response
-        commit('SET_TOKEN', token)
-        setToken(token)
-        resolve()
+      login({ username: username.trim(), password: password, clientId: 'system', clientSecret: 'system' }).then(response => {
+        const { data } = response
+        if (response.code == 200) {
+          const token = data.authentication.token_type + ' ' + data.authentication.access_token
+          commit('SET_REFRESH_TOKEN', data.authentication.refresh_token)
+          commit('SET_EXPIRES_IN', data.authentication.expires_in)
+          commit('SET_TOKEN', token)
+          setToken(token)
+          resolve()
+        }
+        // const { token } = response
       }).catch(error => {
         reject(error)
       })
@@ -100,18 +113,18 @@ const actions = {
     })
   },
   // 刷新token
-  refreshToken({ commit, state }) {
-    return new Promise((resolve, reject) => {
-      refreshtoken({ token: state.token }).then(response => {
-        const { token } = response
-        commit('SET_TOKEN', token)
-        setToken(token)
-        resolve()
-      }).catch(error => {
-        reject(error)
-      })
-    })
-  },
+  // refreshToken({ commit, state }) {
+  //   return new Promise((resolve, reject) => {
+  //     refreshtoken({ token: state.token }).then(response => {
+  //       const { token } = response
+  //       commit('SET_TOKEN', token)
+  //       setToken(token)
+  //       resolve()
+  //     }).catch(error => {
+  //       reject(error)
+  //     })
+  //   })
+  // },
 
   // remove token
   resetToken({ commit }) {

src/utils/request.js

@@ -4,8 +4,10 @@ import store from '@/store'
 import { getToken } from '@/utils/auth'
 
 // create an axios instance
+//
+console.log(process.env.VUE_APP_BASE_API)
 const service = axios.create({
-  baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
+  baseURL: '', // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
   timeout: 10000 // request timeout
 })

src/views/login/index.vue

@@ -68,7 +68,7 @@
                 </span>
               </el-form-item>
             </el-tooltip>
-            <el-form-item prop="code" style="width: 66%;float: left;">
+            <!-- <el-form-item prop="code" style="width: 66%;float: left;">
               <span class="svg-container">
                 <svg-icon icon-class="validCode" />
               </span>
@@ -84,10 +84,10 @@
                 style=" width: 75%;"
                 @keyup.enter.native="handleLogin"
               />
-            </el-form-item>
-            <div class="login-code" style="cursor:pointer; width: 30%;height: 48px;float: right;background-color: #f0f1f5;">
+            </el-form-item> -->
+            <!-- <div class="login-code" style="cursor:pointer; width: 30%;height: 48px;float: right;background-color: #f0f1f5;">
               <img style="height: 48px;width: 100%;border: 1px solid rgba(0,0,0, 0.1);border-radius:5px;" :src="codeUrl" @click="getCode">
-            </div>
+            </div> -->
             <!-- <div prop="code" style="width: 100%;float: left;margin-bottom: 13px">
               <el-checkbox v-model="isLdap">LDAP登陆</el-checkbox>
             </div> -->
@@ -112,6 +112,21 @@ import { mapGetters } from 'vuex'
 export default {
   name: 'Login',
   data() {
+    const validateUsername = (rule, value, callback) => {
+      // validUsername
+      if (!value) {
+        callback(new Error('请输入用户名'))
+      } else {
+        callback()
+      }
+    }
+    const validatePassword = (rule, value, callback) => {
+      if (value.length < 6) {
+        callback(new Error('密码必须大于六位'))
+      } else {
+        callback()
+      }
+    }
     return {
       codeUrl: '',
       cookiePassword: '',
@@ -125,12 +140,11 @@ export default {
       },
       loginRules: {
         username: [
-          { required: true, trigger: 'blur', message: '用户名不能为空' }
+          { required: true, trigger: 'blur', validator: validateUsername }
         ],
         password: [
-          { required: true, trigger: 'blur', message: '密码不能为空' }
-        ],
-        code: [{ required: true, trigger: 'change', message: '验证码不能为空' }]
+          { required: true, trigger: 'blur', validator: validatePassword }
+        ]
       },
       passwordType: 'password',
       capsTooltip: false,

vue.config.js

@@ -16,7 +16,7 @@ const name = defaultSettings.title || 'ferry' // page title
 const port = process.env.port || process.env.npm_config_port || 9527 // dev port
 
 const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin')
-
+let target = 'http://mandev.dayaedu.com'
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**
@@ -37,7 +37,64 @@ module.exports = {
     overlay: {
       warnings: false,
       errors: true
-    }
+    },
+    proxy: {
+      // change xxx-api/login => mock/login
+      // detail: https://cli.vuejs.org/config/#devserver-proxy
+      // http://47.99.212.176:8000
+      // http://192.168.3.28:8000
+      // http://192.168.3.134
+      // http://47.114.176.40:8000
+      // let target = 'http://dev.dayaedu.com'
+      // 'http://dev.dayaedu.com'
+      '/api-auth': {
+        target: target,
+        // target : target,
+        changeOrigin: true,
+        pathRewrite: {
+          '^api-auth': ''
+        }
+      },
+      '/api-task': {
+        target: target,
+        changeOrigin: true,
+        pathRewrite: {
+          '^api-task': ''
+        }
+      },
+      '/api-oa': {
+        target: target,
+        changeOrigin: true,
+        pathRewrite: {
+          '^api-task': ''
+        }
+      },
+      '/api-web': {
+        target: target,
+        changeOrigin: true,
+        pathRewrite: {
+          '^api-web': ''
+        }
+      },
+      '/api-cms': {
+        target: target,
+        changeOrigin: true,
+        pathRewrite: {
+          '^api-cms': ''
+        }
+      },
+      '/api-teacher': {
+        target: target,
+        changeOrigin: true,
+        pathRewrite: {
+          '^api-teacher': ''
+        }
+      },
+      '/jiari': {
+        target: 'http://tool.bitefu.net',
+        changeOrigin: true,
+      },
+    },
   },
   configureWebpack: {
     plugins: [