傅行帆 hace 4 años
padre
commit
a4bacd7848

+ 2
- 2
src/api/system/sys-department-api.js Ver fichero

@@ -11,7 +11,7 @@ const sysDepartmentApi = {
11 11
  */
12 12
 sysDepartmentApi.getList = data => {
13 13
   return request({
14
-    url: '/system/sysDepartment/getList',
14
+    url: '/sysDepartment/getList',
15 15
     method: 'post',
16 16
     data
17 17
   })
@@ -24,7 +24,7 @@ sysDepartmentApi.getList = data => {
24 24
  */
25 25
 sysDepartmentApi.getDepartmentTree = data => {
26 26
   return request({
27
-    url: '/system/sysDepartment/getDepartmentTree',
27
+    url: '/sysDepartment/getDepartmentTree',
28 28
     method: 'post',
29 29
     data
30 30
   })

+ 7
- 7
src/api/system/sys-permission-api.js Ver fichero

@@ -11,7 +11,7 @@ const sysPermissionApi = {
11 11
  */
12 12
 sysPermissionApi.getAllMenuTree = () => {
13 13
   return request({
14
-    url: '/system/sysPermission/getAllMenuTree',
14
+    url: '/sysPermission/getAllMenuTree',
15 15
     method: 'post'
16 16
   })
17 17
 }
@@ -23,7 +23,7 @@ sysPermissionApi.getAllMenuTree = () => {
23 23
  */
24 24
 sysPermissionApi.detail = id => {
25 25
   return request({
26
-    url: '/system/sysPermission/info/' + id,
26
+    url: '/sysPermission/info/' + id,
27 27
     method: 'get'
28 28
   })
29 29
 }
@@ -35,7 +35,7 @@ sysPermissionApi.detail = id => {
35 35
  */
36 36
 sysPermissionApi.getMenuIdsByRoleId = roleId => {
37 37
   return request({
38
-    url: '/system/sysPermission/getThreeLevelPermissionIdsByRoleId/' + roleId,
38
+    url: '/sysPermission/getThreeLevelPermissionIdsByRoleId/' + roleId,
39 39
     method: 'get'
40 40
   })
41 41
 }
@@ -47,7 +47,7 @@ sysPermissionApi.getMenuIdsByRoleId = roleId => {
47 47
  */
48 48
 sysPermissionApi.getNavMenuTree = () => {
49 49
   return request({
50
-    url: '/system/sysPermission/getNavMenuTree',
50
+    url: '/sysPermission/getNavMenuTree',
51 51
     method: 'post'
52 52
   })
53 53
 }
@@ -59,7 +59,7 @@ sysPermissionApi.getNavMenuTree = () => {
59 59
  */
60 60
 sysPermissionApi.add = data => {
61 61
   return request({
62
-    url: '/system/sysPermission/add',
62
+    url: '/sysPermission/add',
63 63
     method: 'post',
64 64
     data
65 65
   })
@@ -72,7 +72,7 @@ sysPermissionApi.add = data => {
72 72
  */
73 73
 sysPermissionApi.update = data => {
74 74
   return request({
75
-    url: '/system/sysPermission/update',
75
+    url: '/sysPermission/update',
76 76
     method: 'post',
77 77
     data
78 78
   })
@@ -85,7 +85,7 @@ sysPermissionApi.update = data => {
85 85
  */
86 86
 sysPermissionApi.delete = id => {
87 87
   return request({
88
-    url: '/system/sysPermission/delete/' + id,
88
+    url: '/sysPermission/delete/' + id,
89 89
     method: 'post'
90 90
   })
91 91
 }

+ 7
- 7
src/api/system/sys-role-api.js Ver fichero

@@ -11,7 +11,7 @@ const sysRoleApi = {
11 11
  */
12 12
 sysRoleApi.getList = data => {
13 13
   return request({
14
-    url: '/system/sysRole/getList',
14
+    url: '/sysRole/getList',
15 15
     method: 'post',
16 16
     data
17 17
   })
@@ -24,7 +24,7 @@ sysRoleApi.getList = data => {
24 24
  */
25 25
 sysRoleApi.getPageList = data => {
26 26
   return request({
27
-    url: '/system/sysRole/getPageList',
27
+    url: '/sysRole/getPageList',
28 28
     method: 'post',
29 29
     data
30 30
   })
@@ -37,7 +37,7 @@ sysRoleApi.getPageList = data => {
37 37
  */
38 38
 sysRoleApi.detail = id => {
39 39
   return request({
40
-    url: '/system/sysRole/info/' + id,
40
+    url: '/sysRole/info/' + id,
41 41
     method: 'get'
42 42
   })
43 43
 }
@@ -49,7 +49,7 @@ sysRoleApi.detail = id => {
49 49
  */
50 50
 sysRoleApi.add = data => {
51 51
   return request({
52
-    url: '/system/sysRole/add',
52
+    url: '/sysRole/add',
53 53
     method: 'post',
54 54
     data
55 55
   })
@@ -62,7 +62,7 @@ sysRoleApi.add = data => {
62 62
  */
63 63
 sysRoleApi.update = data => {
64 64
   return request({
65
-    url: '/system/sysRole/update',
65
+    url: '/sysRole/update',
66 66
     method: 'post',
67 67
     data
68 68
   })
@@ -75,7 +75,7 @@ sysRoleApi.update = data => {
75 75
  */
76 76
 sysRoleApi.delete = id => {
77 77
   return request({
78
-    url: '/system/sysRole/delete/' + id,
78
+    url: '/sysRole/delete/' + id,
79 79
     method: 'post'
80 80
   })
81 81
 }
@@ -88,7 +88,7 @@ sysRoleApi.delete = id => {
88 88
  */
89 89
 sysRoleApi.updateSysRolePermission = data => {
90 90
   return request({
91
-    url: '/system/sysRole/updateSysRolePermission',
91
+    url: '/sysRole/updateSysRolePermission',
92 92
     method: 'post',
93 93
     data
94 94
   })

+ 7
- 7
src/api/system/sys-user-api.js Ver fichero

@@ -11,7 +11,7 @@ const sysUserApi = {
11 11
  */
12 12
 sysUserApi.getPageList = data => {
13 13
   return request({
14
-    url: '/system/sysUser/getPageList',
14
+    url: '/sysUser/getPageList',
15 15
     method: 'post',
16 16
     data
17 17
   })
@@ -24,7 +24,7 @@ sysUserApi.getPageList = data => {
24 24
  */
25 25
 sysUserApi.detail = id => {
26 26
   return request({
27
-    url: '/system/sysUser/info/' + id,
27
+    url: '/sysUser/info/' + id,
28 28
     method: 'get'
29 29
   })
30 30
 }
@@ -36,7 +36,7 @@ sysUserApi.detail = id => {
36 36
  */
37 37
 sysUserApi.add = data => {
38 38
   return request({
39
-    url: '/system/sysUser/add',
39
+    url: '/sysUser/add',
40 40
     method: 'post',
41 41
     data
42 42
   })
@@ -49,7 +49,7 @@ sysUserApi.add = data => {
49 49
  */
50 50
 sysUserApi.update = data => {
51 51
   return request({
52
-    url: '/system/sysUser/update',
52
+    url: '/sysUser/update',
53 53
     method: 'post',
54 54
     data
55 55
   })
@@ -62,7 +62,7 @@ sysUserApi.update = data => {
62 62
  */
63 63
 sysUserApi.delete = id => {
64 64
   return request({
65
-    url: '/system/sysUser/delete/' + id,
65
+    url: '/sysUser/delete/' + id,
66 66
     method: 'post'
67 67
   })
68 68
 }
@@ -74,7 +74,7 @@ sysUserApi.delete = id => {
74 74
  */
75 75
 sysUserApi.uploadHead = data => {
76 76
   return request({
77
-    url: '/system/sysUser/uploadHead',
77
+    url: '/sysUser/uploadHead',
78 78
     method: 'post',
79 79
     data
80 80
   })
@@ -87,7 +87,7 @@ sysUserApi.uploadHead = data => {
87 87
  */
88 88
 sysUserApi.resetPassword = data => {
89 89
   return request({
90
-    url: '/system/sysUser/resetPassword',
90
+    url: '/sysUser/resetPassword',
91 91
     method: 'post',
92 92
     data
93 93
   })

+ 1
- 1
src/api/system/upload-api.js Ver fichero

@@ -11,7 +11,7 @@ const uploadApi = {
11 11
  */
12 12
 uploadApi.upload = data => {
13 13
   return request({
14
-    url: '/system/upload',
14
+    url: '/upload',
15 15
     method: 'post',
16 16
     data,
17 17
     headers: { 'Content-Type': 'multipart/form-data' }

+ 3
- 3
src/api/user.js Ver fichero

@@ -2,7 +2,7 @@ import request from '@/utils/request'
2 2
 
3 3
 export function login(data) {
4 4
   return request({
5
-    url: '/system/login',
5
+    url: '/login',
6 6
     method: 'post',
7 7
     data
8 8
   })
@@ -10,14 +10,14 @@ export function login(data) {
10 10
 
11 11
 export function getInfo(token) {
12 12
   return request({
13
-    url: '/system/getSysUserInfo',
13
+    url: '/getSysUserInfo',
14 14
     method: 'get'
15 15
   })
16 16
 }
17 17
 
18 18
 export function logout() {
19 19
   return request({
20
-    url: '/system/logout',
20
+    url: '/logout',
21 21
     method: 'post'
22 22
   })
23 23
 }

+ 0
- 0
src/components/ImageCropper/utils/data2blob.js Ver fichero


+ 0
- 0
src/components/ImageCropper/utils/effectRipple.js Ver fichero


+ 0
- 0
src/components/ImageCropper/utils/language.js Ver fichero


+ 0
- 0
src/components/ImageCropper/utils/mimes.js Ver fichero


+ 42
- 0
src/router/index.js Ver fichero

@@ -79,6 +79,48 @@ export const constantRoutes = [
79 79
       }
80 80
     ]
81 81
   },
82
+  {
83
+    path: '/documentation',
84
+    component: Layout,
85
+    children: [
86
+      {
87
+        path: 'index',
88
+        component: () => import('@/views/documentation/index'),
89
+        name: 'Documentation',
90
+        meta: { title: '文档', icon: 'documentation', affix: true }
91
+      }
92
+    ]
93
+  },
94
+  {
95
+    path: 'swagger',
96
+    component: Layout,
97
+    children: [
98
+      {
99
+        path: 'http://47.105.159.10:8888/api/swagger-ui.html',
100
+        meta: { title: 'SwaggerUI', icon: 'link' }
101
+      }
102
+    ]
103
+  },
104
+  {
105
+    path: 'knife4j',
106
+    component: Layout,
107
+    children: [
108
+      {
109
+        path: 'http://47.105.159.10:8888/api/doc.html',
110
+        meta: { title: 'SwaggerUI', icon: 'link' }
111
+      }
112
+    ]
113
+  },
114
+  {
115
+    path: 'spring-boot-admin',
116
+    component: Layout,
117
+    children: [
118
+      {
119
+        path: 'http://47.105.159.10:8000/instances/58c15acdd00c/details',
120
+        meta: { title: 'SpringBootAdmin', icon: 'link' }
121
+      }
122
+    ]
123
+  },
82 124
   {
83 125
     path: '/profile',
84 126
     component: Layout,

+ 1
- 1
src/utils/request.js Ver fichero

@@ -22,7 +22,7 @@ service.interceptors.request.use(
22 22
       // ['X-Token'] is a custom headers key
23 23
       // please modify it according to the actual situation
24 24
       // config.headers['X-Token'] = getToken()
25
-      config.headers['x-authorization'] = getToken()
25
+      config.headers['token'] = getToken()
26 26
     }
27 27
     return config
28 28
   },

+ 2
- 2
src/views/login/index.vue Ver fichero

@@ -60,11 +60,11 @@
60 60
 
61 61
 <script>
62 62
 import { validUsername } from '@/utils/validate'
63
-// import SocialSign from './components/SocialSignin'
63
+import SocialSign from './components/SocialSignin'
64 64
 
65 65
 export default {
66 66
   name: 'Login',
67
-  // components: { SocialSign },
67
+  components: { SocialSign },
68 68
   data() {
69 69
     const validateUsername = (rule, value, callback) => {
70 70
       if (!validUsername(value)) {

+ 1
- 1
src/views/system/sys-role/sys-role-list.vue Ver fichero

@@ -76,7 +76,7 @@
76 76
         </template>
77 77
       </el-table-column>
78 78
       <el-table-column align="center" width="240" class-name="operation">
79
-        <template slot="header">
79
+        <template slot="header" slot-scope="scope">
80 80
           操作
81 81
           <el-dropdown trigger="click">
82 82
             <el-link type="primary" style="vertical-align: baseline;">

+ 1
- 1
src/views/system/sys-user/sys-user-list.vue Ver fichero

@@ -88,7 +88,7 @@
88 88
         </template>
89 89
       </el-table-column>
90 90
       <el-table-column align="center" width="240" class-name="operation">
91
-        <template slot="header">
91
+        <template slot="header" slot-scope="scope">
92 92
           操作
93 93
           <el-dropdown trigger="click">
94 94
             <el-link type="primary" style="vertical-align: baseline;">