diff --git a/neutrino-core/src/test/resources/application.yml b/neutrino-core/src/test/resources/application.yml index 8b4c35e4..7123ece4 100644 --- a/neutrino-core/src/test/resources/application.yml +++ b/neutrino-core/src/test/resources/application.yml @@ -2,7 +2,7 @@ neutrino: application: name: neutrino-proxy-server http: - enable: true + enable: false port: 8080 context-path: /test max-content-length-desc: 128K diff --git a/neutrino-proxy-admin/src/api/user.js b/neutrino-proxy-admin/src/api/user.js new file mode 100644 index 00000000..ef80eee9 --- /dev/null +++ b/neutrino-proxy-admin/src/api/user.js @@ -0,0 +1,32 @@ +import request from '@/utils/request' + +export function fetchList(query) { + return request({ + url: '/user/list', + method: 'get', + params: query + }) +} + +export function fetchUser() { + return request({ + url: '/user/detail', + method: 'get' + }) +} + +export function createUser(data) { + return request({ + url: '/user/create', + method: 'post', + data + }) +} + +export function updateUser(data) { + return request({ + url: '/user/update', + method: 'post', + data + }) +} diff --git a/neutrino-proxy-admin/src/lang/zh.js b/neutrino-proxy-admin/src/lang/zh.js index 4dd83533..9d228997 100644 --- a/neutrino-proxy-admin/src/lang/zh.js +++ b/neutrino-proxy-admin/src/lang/zh.js @@ -43,7 +43,8 @@ export default { exportZip: 'zip', theme: '换肤', clipboardDemo: 'clipboard', - i18n: '国际化' + i18n: '国际化', + user: '用户管理' }, navbar: { logOut: '退出登录', @@ -102,7 +103,14 @@ export default { draft: '草稿', delete: '删除', cancel: '取 消', - confirm: '确 定' + confirm: '确 定', + userId: '用户ID', + userName: '用户名', + license: 'License', + createTime: '创建时间', + updateTime: '更新时间', + disable: '禁用', + enable: '启用' }, errorLog: { tips: '请点击右上角bug小图标', diff --git a/neutrino-proxy-admin/src/mock/index.js b/neutrino-proxy-admin/src/mock/index.js index e6644ae1..85240d05 100644 --- a/neutrino-proxy-admin/src/mock/index.js +++ b/neutrino-proxy-admin/src/mock/index.js @@ -3,6 +3,7 @@ import loginAPI from './login' import articleAPI from './article' import remoteSearchAPI from './remoteSearch' import transactionAPI from './transaction' +import userAPI from './user' // Mock.setup({ // timeout: '350-600' @@ -26,4 +27,10 @@ Mock.mock(/\/search\/user/, 'get', remoteSearchAPI.searchUser) // 账单相关 Mock.mock(/\/transaction\/list/, 'get', transactionAPI.getList) +// 用户管理 +Mock.mock(/\/user\/list/, 'get', userAPI.getList) +Mock.mock(/\/user\/detail/, 'get', userAPI.getUser) +Mock.mock(/\/user\/create/, 'post', userAPI.createUser) +Mock.mock(/\/user\/update/, 'post', userAPI.updateUser) + export default Mock diff --git a/neutrino-proxy-admin/src/mock/user.js b/neutrino-proxy-admin/src/mock/user.js new file mode 100644 index 00000000..b5ce7812 --- /dev/null +++ b/neutrino-proxy-admin/src/mock/user.js @@ -0,0 +1,51 @@ + +const List = [ + { + id: 1, + userName: '张三', + license: '79419a1a8691413aa5e845b9e3e90051', + createTime: 1658666005316, + updateTime: 1658666005316, + status: 1 + }, + { + id: 2, + userName: '李四', + license: '9352b1c25f564c81a5677131d7769876', + createTime: 1658666329809, + updateTime: 1658666329809, + status: 2 + } +] + +export default { + getList: config => { + console.log('111---', config) + return { + total: List.length, + items: List + } + }, + getUser: () => ({ + id: 120000000001, + author: { key: 'mockPan' }, + source_name: '原创作者', + category_item: [{ key: 'global', name: '全球' }], + comment_disabled: true, + content: '

我是测试数据我是测试数据

"', + content_short: '我是测试数据', + display_time: +new Date(), + image_uri: 'https://wpimg.wallstcn.com/e4558086-631c-425c-9430-56ffb46e70b3', + platforms: ['a-platform'], + source_uri: 'https://github.com/PanJiaChen/vue-element-admin', + status: 'published', + tags: [], + title: 'vue-element-admin' + }), + createUser: () => ({ + data: 'success' + }), + updateUser: () => ({ + data: 'success' + }) +} diff --git a/neutrino-proxy-admin/src/router/index.js b/neutrino-proxy-admin/src/router/index.js index bdb31816..7c38dab6 100644 --- a/neutrino-proxy-admin/src/router/index.js +++ b/neutrino-proxy-admin/src/router/index.js @@ -39,8 +39,7 @@ export const constantRouterMap = [ name: 'dashboard', meta: { title: 'dashboard', icon: 'dashboard', noCache: true } }] - }, - { + }, { path: '/documentation', component: Layout, redirect: '/documentation/index', @@ -238,5 +237,16 @@ export const asyncRouterMap = [ children: [{ path: 'index', component: _import('i18n-demo/index'), name: 'i18n', meta: { title: 'i18n', icon: 'international' }}] }, - { path: '*', redirect: '/404', hidden: true } + { path: '*', redirect: '/404', hidden: true }, + + { + path: '/user', + component: Layout, + children: [{ + path: 'index', + component: _import('user/index'), + name: 'user', + meta: { title: 'user', icon: 'user', noCache: true } + }] + } ] diff --git a/neutrino-proxy-admin/src/views/user/index.vue b/neutrino-proxy-admin/src/views/user/index.vue new file mode 100644 index 00000000..908c0b4b --- /dev/null +++ b/neutrino-proxy-admin/src/views/user/index.vue @@ -0,0 +1,307 @@ + + +