1.0.0

.env.development

 ENV = 'development'
 
 # 接口地址
-VUE_APP_BASE_API  = 'http://localhost:8000'
-VUE_APP_WS_API = 'ws://localhost:8000'
+VUE_APP_BASE_API  = 'http://localhost:9888'
+VUE_APP_WS_API = 'ws://localhost:9888'
 
 # 是否启用 babel-plugin-dynamic-import-node插件
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.production

@@ -2,6 +2,6 @@ ENV = 'production'
 
 # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
-VUE_APP_BASE_API  = 'https://el-admin.vip'
+VUE_APP_BASE_API  = ''
 # 如果接口是 http 形式， wss 需要改为 ws
-VUE_APP_WS_API = 'wss://el-admin.vip'
+VUE_APP_WS_API = ''

src/api/generator/genConfig.js

@@ -2,14 +2,14 @@ import request from '@/utils/request'
 
 export function get(tableName) {
   return request({
-    url: 'api/genConfig/' + tableName,
+    url: 'admin/genConfig/' + tableName,
     method: 'get'
   })
 }
 
 export function update(data) {
   return request({
-    url: 'api/genConfig',
+    url: 'admin/genConfig',
     data,
     method: 'put'
   })

src/api/generator/generator.js

@@ -2,14 +2,14 @@ import request from '@/utils/request'
 
 export function getAllTable() {
   return request({
-    url: 'api/generator/tables/all',
+    url: 'admin/generator/tables/all',
     method: 'get'
   })
 }
 
 export function generator(tableName, type) {
   return request({
-    url: 'api/generator/' + tableName + '/' + type,
+    url: 'admin/generator/' + tableName + '/' + type,
     method: 'post',
     responseType: type === 2 ? 'blob' : ''
   })
@@ -17,7 +17,7 @@ export function generator(tableName, type) {
 
 export function save(data) {
   return request({
-    url: 'api/generator',
+    url: 'admin/generator',
     data,
     method: 'put'
   })
@@ -25,7 +25,7 @@ export function save(data) {
 
 export function sync(tables) {
   return request({
-    url: 'api/generator/sync',
+    url: 'admin/generator/sync',
     method: 'post',
     data: tables
   })

src/api/login.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function login(username, password, code, uuid) {
   return request({
-    url: 'auth/login',
+    url: 'admin/auth/login',
     method: 'post',
     data: {
       username,
@@ -15,21 +15,21 @@ export function login(username, password, code, uuid) {
 
 export function getInfo() {
   return request({
-    url: 'auth/info',
+    url: 'admin/auth/info',
     method: 'get'
   })
 }
 
 export function getCodeImg() {
   return request({
-    url: 'auth/code',
+    url: 'admin/auth/code',
     method: 'get'
   })
 }
 
 export function logout() {
   return request({
-    url: 'auth/logout',
+    url: 'admin/auth/logout',
     method: 'delete'
   })
 }

src/api/mnt/app.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function add(data) {
   return request({
-    url: 'api/app',
+    url: 'admin/app',
     method: 'post',
     data
   })
@@ -10,7 +10,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/app',
+    url: 'admin/app',
     method: 'delete',
     data: ids
   })
@@ -18,7 +18,7 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/app',
+    url: 'admin/app',
     method: 'put',
     data
   })

src/api/mnt/connect.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function testDbConnect(data) {
   return request({
-    url: 'api/database/testConnect',
+    url: 'admin/database/testConnect',
     method: 'post',
     data
   })
@@ -10,7 +10,7 @@ export function testDbConnect(data) {
 
 export function testServerConnect(data) {
   return request({
-    url: 'api/serverDeploy/testConnect',
+    url: 'admin/serverDeploy/testConnect',
     method: 'post',
     data
   })

src/api/mnt/database.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function add(data) {
   return request({
-    url: 'api/database',
+    url: 'admin/database',
     method: 'post',
     data
   })
@@ -10,7 +10,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/database',
+    url: 'admin/database',
     method: 'delete',
     data: ids
   })
@@ -18,7 +18,7 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/database',
+    url: 'admin/database',
     method: 'put',
     data
   })
@@ -26,7 +26,7 @@ export function edit(data) {
 
 export function testDbConnection(data) {
   return request({
-    url: 'api/database/testConnect',
+    url: 'admin/database/testConnect',
     method: 'post',
     data
   })

src/api/mnt/deploy.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function add(data) {
   return request({
-    url: 'api/deploy',
+    url: 'admin/deploy',
     method: 'post',
     data
   })
@@ -10,7 +10,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/deploy',
+    url: 'admin/deploy',
     method: 'delete',
     data: ids
   })
@@ -18,7 +18,7 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/deploy',
+    url: 'admin/deploy',
     method: 'put',
     data
   })
@@ -26,14 +26,14 @@ export function edit(data) {
 
 export function getApps() {
   return request({
-    url: 'api/app',
+    url: 'admin/app',
     method: 'get'
   })
 }
 
 export function getServers() {
   return request({
-    url: 'api/serverDeploy',
+    url: 'admin/serverDeploy',
     method: 'get'
   })
 }
@@ -44,7 +44,7 @@ export function getServers() {
  */
 export function startServer(data) {
   return request({
-    url: 'api/deploy/startServer',
+    url: 'admin/deploy/startServer',
     method: 'post',
     data
   })
@@ -56,7 +56,7 @@ export function startServer(data) {
  */
 export function stopServer(data) {
   return request({
-    url: 'api/deploy/stopServer',
+    url: 'admin/deploy/stopServer',
     method: 'post',
     data
   })
@@ -68,7 +68,7 @@ export function stopServer(data) {
  */
 export function serverStatus(data) {
   return request({
-    url: 'api/deploy/serverStatus',
+    url: 'admin/deploy/serverStatus',
     method: 'post',
     data
   })

src/api/mnt/deployHistory.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function del(ids) {
   return request({
-    url: 'api/deployHistory',
+    url: 'admin/deployHistory',
     method: 'delete',
     data: ids
   })
@@ -14,7 +14,7 @@ export function del(ids) {
  */
 export function reducte(data) {
   return request({
-    url: 'api/deploy/serverReduction',
+    url: 'admin/deploy/serverReduction',
     method: 'post',
     data
   })

src/api/mnt/serverDeploy.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function add(data) {
   return request({
-    url: 'api/serverDeploy',
+    url: 'admin/serverDeploy',
     method: 'post',
     data
   })
@@ -10,7 +10,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/serverDeploy',
+    url: 'admin/serverDeploy',
     method: 'delete',
     data: ids
   })
@@ -18,7 +18,7 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/serverDeploy',
+    url: 'admin/serverDeploy',
     method: 'put',
     data
   })

src/api/monitor/log.js

@@ -2,21 +2,21 @@ import request from '@/utils/request'
 
 export function getErrDetail(id) {
   return request({
-    url: 'api/logs/error/' + id,
+    url: 'admin/logs/error/' + id,
     method: 'get'
   })
 }
 
 export function delAllError() {
   return request({
-    url: 'api/logs/del/error',
+    url: 'admin/logs/del/error',
     method: 'delete'
   })
 }
 
 export function delAllInfo() {
   return request({
-    url: 'api/logs/del/info',
+    url: 'admin/logs/del/info',
     method: 'delete'
   })
 }

src/api/monitor/online.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function del(keys) {
   return request({
-    url: 'auth/online',
+    url: 'admin/auth/online',
     method: 'delete',
     data: keys
   })

src/api/system/code.js

@@ -2,14 +2,14 @@ import request from '@/utils/request'
 
 export function resetEmail(data) {
   return request({
-    url: 'api/code/resetEmail?email=' + data,
+    url: 'admin/code/resetEmail?email=' + data,
     method: 'post'
   })
 }
 
 export function updatePass(pass) {
   return request({
-    url: 'api/users/updatePass/' + pass,
+    url: 'admin/users/updatePass/' + pass,
     method: 'get'
   })
 }

src/api/system/dept.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function getDepts(params) {
   return request({
-    url: 'api/dept',
+    url: 'admin/dept',
     method: 'get',
     params
   })
@@ -11,7 +11,7 @@ export function getDepts(params) {
 export function getDeptSuperior(ids) {
   const data = ids.length || ids.length === 0 ? ids : Array.of(ids)
   return request({
-    url: 'api/dept/superior',
+    url: 'admin/dept/superior',
     method: 'post',
     data
   })
@@ -19,7 +19,7 @@ export function getDeptSuperior(ids) {
 
 export function add(data) {
   return request({
-    url: 'api/dept',
+    url: 'admin/dept',
     method: 'post',
     data
   })
@@ -27,7 +27,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/dept',
+    url: 'admin/dept',
     method: 'delete',
     data: ids
   })
@@ -35,7 +35,7 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/dept',
+    url: 'admin/dept',
     method: 'put',
     data
   })

src/api/system/dict.js

@@ -2,14 +2,14 @@ import request from '@/utils/request'
 
 export function getDicts() {
   return request({
-    url: 'api/dict/all',
+    url: 'admin/dict/all',
     method: 'get'
   })
 }
 
 export function add(data) {
   return request({
-    url: 'api/dict',
+    url: 'admin/dict',
     method: 'post',
     data
   })
@@ -17,7 +17,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/dict/',
+    url: 'admin/dict/',
     method: 'delete',
     data: ids
   })
@@ -25,7 +25,7 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/dict',
+    url: 'admin/dict',
     method: 'put',
     data
   })

src/api/system/dictDetail.js

@@ -7,7 +7,7 @@ export function get(dictName) {
     size: 9999
   }
   return request({
-    url: 'api/dictDetail',
+    url: 'admin/dictDetail',
     method: 'get',
     params
   })
@@ -20,7 +20,7 @@ export function getDictMap(dictName) {
     size: 9999
   }
   return request({
-    url: 'api/dictDetail/map',
+    url: 'admin/dictDetail/map',
     method: 'get',
     params
   })
@@ -28,7 +28,7 @@ export function getDictMap(dictName) {
 
 export function add(data) {
   return request({
-    url: 'api/dictDetail',
+    url: 'admin/dictDetail',
     method: 'post',
     data
   })
@@ -36,14 +36,14 @@ export function add(data) {
 
 export function del(id) {
   return request({
-    url: 'api/dictDetail/' + id,
+    url: 'admin/dictDetail/' + id,
     method: 'delete'
   })
 }
 
 export function edit(data) {
   return request({
-    url: 'api/dictDetail',
+    url: 'admin/dictDetail',
     method: 'put',
     data
   })

src/api/system/job.js

@@ -7,7 +7,7 @@ export function getAllJob() {
     enabled: true
   }
   return request({
-    url: 'api/job',
+    url: 'admin/job',
     method: 'get',
     params
   })
@@ -15,7 +15,7 @@ export function getAllJob() {
 
 export function add(data) {
   return request({
-    url: 'api/job',
+    url: 'admin/job',
     method: 'post',
     data
   })
@@ -23,7 +23,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/job',
+    url: 'admin/job',
     method: 'delete',
     data: ids
   })
@@ -31,7 +31,7 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/job',
+    url: 'admin/job',
     method: 'put',
     data
   })

src/api/system/menu.js

@@ -2,14 +2,14 @@ import request from '@/utils/request'
 
 export function getMenusTree(pid) {
   return request({
-    url: 'api/menus/lazy?pid=' + pid,
+    url: 'admin/menus/lazy?pid=' + pid,
     method: 'get'
   })
 }
 
 export function getMenus(params) {
   return request({
-    url: 'api/menus',
+    url: 'admin/menus',
     method: 'get',
     params
   })
@@ -18,7 +18,7 @@ export function getMenus(params) {
 export function getMenuSuperior(ids) {
   const data = Array.isArray(ids) || ids.length === 0 ? ids : Array.of(ids)
   return request({
-    url: 'api/menus/superior',
+    url: 'admin/menus/superior',
     method: 'post',
     data
   })
@@ -26,21 +26,21 @@ export function getMenuSuperior(ids) {
 
 export function getChild(id) {
   return request({
-    url: 'api/menus/child?id=' + id,
+    url: 'admin/menus/child?id=' + id,
     method: 'get'
   })
 }
 
 export function buildMenus() {
   return request({
-    url: 'api/menus/build',
+    url: 'admin/menus/build',
     method: 'get'
   })
 }
 
 export function add(data) {
   return request({
-    url: 'api/menus',
+    url: 'admin/menus',
     method: 'post',
     data
   })
@@ -48,7 +48,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/menus',
+    url: 'admin/menus',
     method: 'delete',
     data: ids
   })
@@ -56,7 +56,7 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/menus',
+    url: 'admin/menus',
     method: 'put',
     data
   })

src/api/system/role.js

@@ -3,14 +3,14 @@ import request from '@/utils/request'
 // 获取所有的Role
 export function getAll() {
   return request({
-    url: 'api/roles/all',
+    url: 'admin/roles/all',
     method: 'get'
   })
 }
 
 export function add(data) {
   return request({
-    url: 'api/roles',
+    url: 'admin/roles',
     method: 'post',
     data
   })
@@ -18,21 +18,21 @@ export function add(data) {
 
 export function get(id) {
   return request({
-    url: 'api/roles/' + id,
+    url: 'admin/roles/' + id,
     method: 'get'
   })
 }
 
 export function getLevel() {
   return request({
-    url: 'api/roles/level',
+    url: 'admin/roles/level',
     method: 'get'
   })
 }
 
 export function del(ids) {
   return request({
-    url: 'api/roles',
+    url: 'admin/roles',
     method: 'delete',
     data: ids
   })
@@ -40,7 +40,7 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/roles',
+    url: 'admin/roles',
     method: 'put',
     data
   })
@@ -48,7 +48,7 @@ export function edit(data) {
 
 export function editMenu(data) {
   return request({
-    url: 'api/roles/menu',
+    url: 'admin/roles/menu',
     method: 'put',
     data
   })

src/api/system/timing.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function add(data) {
   return request({
-    url: 'api/jobs',
+    url: 'admin/jobs',
     method: 'post',
     data
   })
@@ -10,7 +10,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/jobs',
+    url: 'admin/jobs',
     method: 'delete',
     data: ids
   })
@@ -18,7 +18,7 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/jobs',
+    url: 'admin/jobs',
     method: 'put',
     data
   })
@@ -26,14 +26,14 @@ export function edit(data) {
 
 export function updateIsPause(id) {
   return request({
-    url: 'api/jobs/' + id,
+    url: 'admin/jobs/' + id,
     method: 'put'
   })
 }
 
 export function execution(id) {
   return request({
-    url: 'api/jobs/exec/' + id,
+    url: 'admin/jobs/exec/' + id,
     method: 'put'
   })
 }

src/api/system/user.js

@@ -3,7 +3,7 @@ import { encrypt } from '@/utils/rsaEncrypt'
 
 export function add(data) {
   return request({
-    url: 'api/users',
+    url: 'admin/users',
     method: 'post',
     data
   })
@@ -11,7 +11,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/users',
+    url: 'admin/users',
     method: 'delete',
     data: ids
   })
@@ -19,7 +19,7 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/users',
+    url: 'admin/users',
     method: 'put',
     data
   })
@@ -27,7 +27,7 @@ export function edit(data) {
 
 export function editUser(data) {
   return request({
-    url: 'api/users/center',
+    url: 'admin/users/center',
     method: 'put',
     data
   })
@@ -39,7 +39,7 @@ export function updatePass(user) {
     newPass: encrypt(user.newPass)
   }
   return request({
-    url: 'api/users/updatePass/',
+    url: 'admin/users/updatePass/',
     method: 'post',
     data
   })
@@ -51,7 +51,7 @@ export function updateEmail(form) {
     email: form.email
   }
   return request({
-    url: 'api/users/updateEmail/' + form.code,
+    url: 'admin/users/updateEmail/' + form.code,
     method: 'post',
     data
   })

src/api/tools/alipay.js

@@ -2,14 +2,14 @@ import request from '@/utils/request'
 
 export function get() {
   return request({
-    url: 'api/aliPay',
+    url: 'admin/aliPay',
     method: 'get'
   })
 }
 
 export function update(data) {
   return request({
-    url: 'api/aliPay',
+    url: 'admin/aliPay',
     data,
     method: 'put'
   })
@@ -18,7 +18,7 @@ export function update(data) {
 // 支付
 export function toAliPay(url, data) {
   return request({
-    url: 'api/' + url,
+    url: 'admin/' + url,
     data,
     method: 'post'
   })

src/api/tools/email.js

@@ -2,14 +2,14 @@ import request from '@/utils/request'
 
 export function get() {
   return request({
-    url: 'api/email',
+    url: 'admin/email',
     method: 'get'
   })
 }
 
 export function update(data) {
   return request({
-    url: 'api/email',
+    url: 'admin/email',
     data,
     method: 'put'
   })
@@ -17,7 +17,7 @@ export function update(data) {
 
 export function send(data) {
   return request({
-    url: 'api/email',
+    url: 'admin/email',
     data,
     method: 'post'
   })

src/api/tools/localStorage.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function add(data) {
   return request({
-    url: 'api/localStorage',
+    url: 'admin/localStorage',
     method: 'post',
     data
   })
@@ -10,7 +10,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/localStorage/',
+    url: 'admin/localStorage/',
     method: 'delete',
     data: ids
   })
@@ -18,7 +18,7 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/localStorage',
+    url: 'admin/localStorage',
     method: 'put',
     data
   })

src/api/tools/qiniu.js

@@ -2,14 +2,14 @@ import request from '@/utils/request'
 
 export function get() {
   return request({
-    url: 'api/qiNiuContent/config',
+    url: 'admin/qiNiuContent/config',
     method: 'get'
   })
 }
 
 export function update(data) {
   return request({
-    url: 'api/qiNiuContent/config',
+    url: 'admin/qiNiuContent/config',
     data,
     method: 'put'
   })
@@ -17,21 +17,21 @@ export function update(data) {
 
 export function download(id) {
   return request({
-    url: 'api/qiNiuContent/download/' + id,
+    url: 'admin/qiNiuContent/download/' + id,
     method: 'get'
   })
 }
 
 export function sync() {
   return request({
-    url: 'api/qiNiuContent/synchronize',
+    url: 'admin/qiNiuContent/synchronize',
     method: 'post'
   })
 }
 
 export function del(ids) {
   return request({
-    url: 'api/qiNiuContent',
+    url: 'admin/qiNiuContent',
     method: 'delete',
     data: ids
   })

src/layout/components/Navbar.vue

@@ -24,7 +24,7 @@
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
-          <img :src="user.avatarName ? baseApi + '/avatar/' + user.avatarName : Avatar" class="user-avatar">
+          <img :src="user.avatarPath ? baseApi + '/admin/avatar/' + user.username + '?time=' + new Date().getTime() : Avatar" class="user-avatar">
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">

src/store/modules/api.js

@@ -3,21 +3,21 @@ const baseUrl = process.env.VUE_APP_BASE_API === '/' ? '' : process.env.VUE_APP_
 const api = {
   state: {
     // 部署包上传
-    deployUploadApi: baseUrl + '/api/deploy/upload',
+    deployUploadApi: baseUrl + '/admin/deploy/upload',
     // SQL脚本上传
-    databaseUploadApi: baseUrl + '/api/database/upload',
+    databaseUploadApi: baseUrl + '/admin/database/upload',
     // 图片上传
-    imagesUploadApi: baseUrl + '/api/localStorage/pictures',
+    imagesUploadApi: baseUrl + '/admin/localStorage/pictures',
     // 修改头像
-    updateAvatarApi: baseUrl + '/api/users/updateAvatar',
+    updateAvatarApi: baseUrl + '/admin/users/updateAvatar',
     // 上传文件到七牛云
-    qiNiuUploadApi: baseUrl + '/api/qiNiuContent',
+    qiNiuUploadApi: baseUrl + '/admin/qiNiuContent',
     // Sql 监控
-    sqlApi: baseUrl + '/druid/index.html',
+    sqlApi: baseUrl + '/admin/druid/index.html',
     // swagger
-    swaggerApi: baseUrl + '/swagger-ui.html',
+    swaggerApi: baseUrl + '/admin/swagger-ui.html',
     // 文件上传
-    fileUploadApi: baseUrl + '/api/localStorage',
+    fileUploadApi: baseUrl + '/admin/localStorage',
     // baseUrl，
     baseApi: baseUrl
   }

src/views/generator/config.vue

@@ -248,7 +248,7 @@ export default {
   },
   methods: {
     beforeInit() {
-      this.url = 'api/generator/columns'
+      this.url = 'admin/generator/columns'
       const tableName = this.tableName
       this.params = { tableName }
       return true

src/views/generator/index.vue

@@ -63,7 +63,7 @@ export default {
   name: 'GeneratorIndex',
   components: { pagination, crudOperation, rrOperation },
   cruds() {
-    return CRUD({ url: 'api/generator/tables' })
+    return CRUD({ url: 'admin/generator/tables' })
   },
   mixins: [presenter(), header()],
   data() {

src/views/mnt/app/index.vue

@@ -88,7 +88,7 @@ export default {
   name: 'App',
   components: { pagination, crudOperation, rrOperation, udOperation, DateRangePicker },
   cruds() {
-    return CRUD({ title: '应用', url: 'api/app', crudMethod: { ...crudApp }})
+    return CRUD({ title: '应用', url: 'admin/app', crudMethod: { ...crudApp }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {

src/views/mnt/database/index.vue

@@ -82,7 +82,7 @@ export default {
   name: 'DataBase',
   components: { eForm, pagination, crudOperation, rrOperation, udOperation, DateRangePicker },
   cruds() {
-    return CRUD({ title: '数据库', url: 'api/database', crudMethod: { ...crudDatabase }})
+    return CRUD({ title: '数据库', url: 'admin/database', crudMethod: { ...crudDatabase }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {

src/views/mnt/deploy/deploy.vue

@@ -147,7 +147,7 @@ export default {
       })
     },
     initWebSocket() {
-      const wsUri = (process.env.VUE_APP_WS_API === '/' ? '/' : (process.env.VUE_APP_WS_API + '/')) + 'webSocket/deploy'
+      const wsUri = (process.env.VUE_APP_WS_API === '/' ? '/' : (process.env.VUE_APP_WS_API + '/')) + 'admin/webSocket/deploy'
       this.websock = new WebSocket(wsUri)
       this.websock.onerror = this.webSocketOnError
       this.websock.onmessage = this.webSocketOnMessage

src/views/mnt/deploy/index.vue

@@ -121,7 +121,7 @@ export default {
   name: 'Deploy',
   components: { dForm, fForm, pagination, crudOperation, rrOperation, udOperation, DateRangePicker },
   cruds() {
-    return CRUD({ title: '部署', url: 'api/deploy', crudMethod: { ...crudDeploy }})
+    return CRUD({ title: '部署', url: 'admin/deploy', crudMethod: { ...crudDeploy }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {

src/views/mnt/deploy/sysRestore.vue

@@ -65,7 +65,7 @@ export default {
   },
   methods: {
     beforeInit() {
-      this.url = 'api/deployHistory'
+      this.url = 'admin/deployHistory'
       this.deployId = this.$parent.deployId
       if (this.deployId === '') {
         return false

src/views/mnt/deployHistory/index.vue

@@ -52,7 +52,7 @@ export default {
   name: 'DeployHistory',
   components: { pagination, crudOperation, rrOperation, DateRangePicker },
   cruds() {
-    return CRUD({ title: '部署历史', url: 'api/deployHistory', crudMethod: { del }})
+    return CRUD({ title: '部署历史', url: 'admin/deployHistory', crudMethod: { del }})
   },
   mixins: [presenter(), header()],
   data() {

src/views/mnt/server/index.vue

@@ -74,7 +74,7 @@ export default {
   name: 'Server',
   components: { pagination, crudOperation, rrOperation, udOperation, DateRangePicker },
   cruds() {
-    return CRUD({ title: '服务器', url: 'api/serverDeploy', crudMethod: { ...crudServer }})
+    return CRUD({ title: '服务器', url: 'admin/serverDeploy', crudMethod: { ...crudServer }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {

src/views/monitor/log/errorLog.vue

@@ -61,7 +61,7 @@ export default {
   name: 'ErrorLog',
   components: { Search, crudOperation, pagination },
   cruds() {
-    return CRUD({ title: '异常日志', url: 'api/logs/error' })
+    return CRUD({ title: '异常日志', url: 'admin/logs/error' })
   },
   mixins: [presenter()],
   data() {

src/views/monitor/log/index.vue

@@ -60,7 +60,7 @@ export default {
   name: 'Log',
   components: { Search, crudOperation, pagination },
   cruds() {
-    return CRUD({ title: '日志', url: 'api/logs' })
+    return CRUD({ title: '日志', url: 'admin/logs' })
   },
   mixins: [presenter()],
   created() {

src/views/monitor/online/index.vue

@@ -64,7 +64,7 @@ export default {
   name: 'OnlineUser',
   components: { pagination, crudOperation, rrOperation },
   cruds() {
-    return CRUD({ url: 'auth/online', title: '在线用户' })
+    return CRUD({ url: 'admin/auth/online', title: '在线用户' })
   },
   mixins: [presenter(), header(), crud()],
   data() {

src/views/monitor/server/index.vue

@@ -148,7 +148,7 @@ export default {
     return {
       show: false,
       monitor: null,
-      url: 'api/monitor',
+      url: 'admin/monitor',
       data: {},
       cpuInfo: {
         tooltip: {

src/views/system/dept/index.vue

@@ -110,7 +110,7 @@ export default {
   name: 'Dept',
   components: { Treeselect, crudOperation, rrOperation, udOperation, DateRangePicker },
   cruds() {
-    return CRUD({ title: '部门', url: 'api/dept', crudMethod: { ...crudDept }})
+    return CRUD({ title: '部门', url: 'admin/dept', crudMethod: { ...crudDept }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   // 设置数据字典

src/views/system/dict/dictDetail.vue

@@ -66,7 +66,7 @@ export default {
   components: { pagination, rrOperation, udOperation },
   cruds() {
     return [
-      CRUD({ title: '字典详情', url: 'api/dictDetail', query: { dictName: '' }, sort: ['dictSort,asc', 'id,desc'],
+      CRUD({ title: '字典详情', url: 'admin/dictDetail', query: { dictName: '' }, sort: ['dictSort,asc', 'id,desc'],
         crudMethod: { ...crudDictDetail },
         optShow: {
           add: true,

src/views/system/dict/index.vue

@@ -84,7 +84,7 @@ export default {
   components: { crudOperation, pagination, rrOperation, udOperation, dictDetail },
   cruds() {
     return [
-      CRUD({ title: '字典', url: 'api/dict', crudMethod: { ...crudDict }})
+      CRUD({ title: '字典', url: 'admin/dict', crudMethod: { ...crudDict }})
     ]
   },
   mixins: [presenter(), header(), form(defaultForm)],

src/views/system/job/index.vue

@@ -62,7 +62,7 @@ export default {
   cruds() {
     return CRUD({
       title: '岗位',
-      url: 'api/job',
+      url: 'admin/job',
       sort: ['jobSort,asc', 'id,desc'],
       crudMethod: { ...crudJob }
     })

src/views/system/menu/index.vue

@@ -165,7 +165,7 @@ export default {
   name: 'Menu',
   components: { Treeselect, IconSelect, crudOperation, rrOperation, udOperation, DateRangePicker },
   cruds() {
-    return CRUD({ title: '菜单', url: 'api/menus', crudMethod: { ...crudMenu }})
+    return CRUD({ title: '菜单', url: 'admin/menus', crudMethod: { ...crudMenu }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {

src/views/system/role/index.vue

@@ -132,7 +132,7 @@ export default {
   name: 'Role',
   components: { Treeselect, pagination, crudOperation, rrOperation, udOperation, DateRangePicker },
   cruds() {
-    return CRUD({ title: '角色', url: 'api/roles', sort: 'level,asc', crudMethod: { ...crudRoles }})
+    return CRUD({ title: '角色', url: 'admin/roles', sort: 'level,asc', crudMethod: { ...crudRoles }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {

src/views/system/timing/index.vue

@@ -127,7 +127,7 @@ export default {
   name: 'Timing',
   components: { Log, pagination, crudOperation, rrOperation, DateRangePicker },
   cruds() {
-    return CRUD({ title: '定时任务', url: 'api/jobs', crudMethod: { ...crudJob }})
+    return CRUD({ title: '定时任务', url: 'admin/jobs', crudMethod: { ...crudJob }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {

src/views/system/timing/log.vue

@@ -80,7 +80,7 @@ export default {
     },
     // 获取数据前设置好接口地址
     beforeInit() {
-      this.url = 'api/jobs/logs'
+      this.url = 'admin/jobs/logs'
       this.size = 6
       return true
     },

src/views/system/user/center.vue

@@ -9,7 +9,7 @@
           <div>
             <div style="text-align: center">
               <div class="el-upload">
-                <img :src="user.avatarName ? baseApi + '/avatar/' + user.avatarName : Avatar" title="点击上传头像" class="avatar" @click="toggleShow">
+                <img :src="user.avatarPath ? baseApi + '/admin/avatar/' + user.username + '?time=' + new Date().getTime() : Avatar" title="点击上传头像" class="avatar" @click="toggleShow">
                 <myUpload
                   v-model="show"
                   :headers="headers"
@@ -171,7 +171,7 @@ export default {
       }
     },
     beforeInit() {
-      this.url = 'api/logs/user'
+      this.url = 'admin/logs/user'
       return true
     },
     cropUploadSuccess(jsonData, field) {

src/views/system/user/index.vue

@@ -210,7 +210,7 @@ export default {
   name: 'User',
   components: { Treeselect, crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
   cruds() {
-    return CRUD({ title: '用户', url: 'api/users', crudMethod: { ...crudUser }})
+    return CRUD({ title: '用户', url: 'admin/users', crudMethod: { ...crudUser }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   // 数据字典

src/views/tools/storage/local/index.vue

@@ -115,7 +115,7 @@ const defaultForm = { id: null, name: '' }
 export default {
   components: { pagination, crudOperation, rrOperation, DateRangePicker },
   cruds() {
-    return CRUD({ title: '文件', url: 'api/localStorage', crudMethod: { ...crudFile }})
+    return CRUD({ title: '文件', url: 'admin/localStorage', crudMethod: { ...crudFile }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {

src/views/tools/storage/qiniu/index.vue

@@ -79,7 +79,7 @@ import DateRangePicker from '@/components/DateRangePicker'
 export default {
   components: { eForm, pagination, crudOperation, rrOperation, DateRangePicker },
   cruds() {
-    return CRUD({ title: '七牛云文件', url: 'api/qiNiuContent', crudMethod: { ...crudQiNiu }})
+    return CRUD({ title: '七牛云文件', url: 'admin/qiNiuContent', crudMethod: { ...crudQiNiu }})
   },
   mixins: [presenter(), header(), crud()],
   data() {

vue.config.js

@@ -26,18 +26,12 @@ module.exports = {
       errors: true
     },
     proxy: {
-      '/api': {
+      '/admin': {
         target: process.env.VUE_APP_BASE_API,
         changeOrigin: true,
+        ws: false,
         pathRewrite: {
-          '^/api': 'api'
-        }
-      },
-      '/auth': {
-        target: process.env.VUE_APP_BASE_API,
-        changeOrigin: true,
-        pathRewrite: {
-          '^/auth': 'auth'
+          '^/admin': 'admin'
         }
       }
     }