From 57073acb12d143731b7445d709715e8d355b3026 Mon Sep 17 00:00:00 2001 From: yqz Date: Fri, 28 Oct 2022 00:25:01 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=92=E9=98=9F?= =?UTF-8?q?=E5=8F=96=E5=8F=B7=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/queue/machine.js | 39 +++++++++++++++++++ src/api/queue/queue.js | 39 +++++++++++++++++++ src/api/queue/ticketorder.js | 39 +++++++++++++++++++ src/api/queue/window.js | 39 +++++++++++++++++++ src/views/business/es/index.vue | 2 +- src/views/business/queue/index.vue | 61 ++++++++++++++++++++++++++++++ 6 files changed, 218 insertions(+), 1 deletion(-) create mode 100644 src/api/queue/machine.js create mode 100644 src/api/queue/queue.js create mode 100644 src/api/queue/ticketorder.js create mode 100644 src/api/queue/window.js create mode 100644 src/views/business/queue/index.vue diff --git a/src/api/queue/machine.js b/src/api/queue/machine.js new file mode 100644 index 0000000..e070a13 --- /dev/null +++ b/src/api/queue/machine.js @@ -0,0 +1,39 @@ +import request from '@/router/axios' + +export function fetchList(query) { + return request({ + url: '/queue/business-machine/page', + method: 'get', + params: query + }) +} + +export function addObj(obj) { + return request({ + url: '/queue/business-machine/create', + method: 'post', + data: obj + }) +} + +export function getObj(id) { + return request({ + url: '/queue/business-machine/' + id, + method: 'get' + }) +} + +export function delObj(id) { + return request({ + url: '/queue/business-machine/' + id, + method: 'delete' + }) +} + +export function putObj(obj) { + return request({ + url: '/queue/business-machine/update', + method: 'put', + data: obj + }) +} diff --git a/src/api/queue/queue.js b/src/api/queue/queue.js new file mode 100644 index 0000000..70d1706 --- /dev/null +++ b/src/api/queue/queue.js @@ -0,0 +1,39 @@ +import request from '@/router/axios' + +export function fetchList(query) { + return request({ + url: '/queue/business-queue/page', + method: 'get', + params: query + }) +} + +export function addObj(obj) { + return request({ + url: '/queue/business-queue/create', + method: 'post', + data: obj + }) +} + +export function getObj(id) { + return request({ + url: '/queue/business-queue/' + id, + method: 'get' + }) +} + +export function delObj(id) { + return request({ + url: '/queue/business-queue/' + id, + method: 'delete' + }) +} + +export function putObj(obj) { + return request({ + url: '/queue/business-queue/update', + method: 'put', + data: obj + }) +} diff --git a/src/api/queue/ticketorder.js b/src/api/queue/ticketorder.js new file mode 100644 index 0000000..312b68a --- /dev/null +++ b/src/api/queue/ticketorder.js @@ -0,0 +1,39 @@ +import request from '@/router/axios' + +export function fetchList(query) { + return request({ + url: '/queue/business-ticket-order/page', + method: 'get', + params: query + }) +} + +export function addObj(obj) { + return request({ + url: '/queue/business-ticket-order/create', + method: 'post', + data: obj + }) +} + +export function getObj(id) { + return request({ + url: '/queue/business-ticket-order/' + id, + method: 'get' + }) +} + +export function delObj(id) { + return request({ + url: '/queue/business-ticket-order/' + id, + method: 'delete' + }) +} + +export function putObj(obj) { + return request({ + url: '/queue/business-ticket-order/update', + method: 'put', + data: obj + }) +} diff --git a/src/api/queue/window.js b/src/api/queue/window.js new file mode 100644 index 0000000..c967440 --- /dev/null +++ b/src/api/queue/window.js @@ -0,0 +1,39 @@ +import request from '@/router/axios' + +export function fetchList(query) { + return request({ + url: '/queue/business-window/page', + method: 'get', + params: query + }) +} + +export function addObj(obj) { + return request({ + url: '/queue/business-window/create', + method: 'post', + data: obj + }) +} + +export function getObj(id) { + return request({ + url: '/queue/business-window/' + id, + method: 'get' + }) +} + +export function delObj(id) { + return request({ + url: '/queue/business-window/' + id, + method: 'delete' + }) +} + +export function putObj(obj) { + return request({ + url: '/queue/business-window/update', + method: 'put', + data: obj + }) +} diff --git a/src/views/business/es/index.vue b/src/views/business/es/index.vue index 22361ab..a920465 100644 --- a/src/views/business/es/index.vue +++ b/src/views/business/es/index.vue @@ -31,7 +31,7 @@ - diff --git a/src/views/business/queue/index.vue b/src/views/business/queue/index.vue new file mode 100644 index 0000000..edf534c --- /dev/null +++ b/src/views/business/queue/index.vue @@ -0,0 +1,61 @@ + + + + + -- Gitee From 5d45a7d046d0e90a3976d494a42c648b22997d39 Mon Sep 17 00:00:00 2001 From: yqz Date: Sat, 29 Oct 2022 18:21:01 +0800 Subject: [PATCH 02/22] =?UTF-8?q?=E6=95=B4=E7=90=86=E9=98=9F=E5=88=97?= =?UTF-8?q?=E4=B8=8E=E7=AA=97=E5=8F=A3=E7=9A=84=E7=BB=91=E5=AE=9A=E5=85=B3?= =?UTF-8?q?=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/queue/queue.js | 15 + src/api/queue/window.js | 17 +- .../business/businessQueue/queue/index.vue | 335 ++++++++++++++++++ src/views/business/queue/index.vue | 61 ---- 4 files changed, 362 insertions(+), 66 deletions(-) create mode 100644 src/views/business/businessQueue/queue/index.vue delete mode 100644 src/views/business/queue/index.vue diff --git a/src/api/queue/queue.js b/src/api/queue/queue.js index 70d1706..1f89fe3 100644 --- a/src/api/queue/queue.js +++ b/src/api/queue/queue.js @@ -37,3 +37,18 @@ export function putObj(obj) { data: obj }) } + +export function listQueueWindow(queueId) { + return request({ + url: '/queue/business-queue/list-queue-win/' + queueId, + method: 'get' + }) +} + +export function bindQueueWindow(obj) { + return request({ + url: '/queue/business-queue/bind-queue-window', + method: 'post', + data: obj + }) +} diff --git a/src/api/queue/window.js b/src/api/queue/window.js index c967440..970b063 100644 --- a/src/api/queue/window.js +++ b/src/api/queue/window.js @@ -2,7 +2,7 @@ import request from '@/router/axios' export function fetchList(query) { return request({ - url: '/queue/business-window/page', + url: '/business-window/page', method: 'get', params: query }) @@ -10,7 +10,7 @@ export function fetchList(query) { export function addObj(obj) { return request({ - url: '/queue/business-window/create', + url: '/business-window/create', method: 'post', data: obj }) @@ -18,22 +18,29 @@ export function addObj(obj) { export function getObj(id) { return request({ - url: '/queue/business-window/' + id, + url: '/business-window/' + id, method: 'get' }) } export function delObj(id) { return request({ - url: '/queue/business-window/' + id, + url: '/business-window/' + id, method: 'delete' }) } export function putObj(obj) { return request({ - url: '/queue/business-window/update', + url: '/business-window/update', method: 'put', data: obj }) } + +export function listAllWindow() { + return request({ + url: '/business-window/list', + method: 'get' + }) +} diff --git a/src/views/business/businessQueue/queue/index.vue b/src/views/business/businessQueue/queue/index.vue new file mode 100644 index 0000000..0f0a74b --- /dev/null +++ b/src/views/business/businessQueue/queue/index.vue @@ -0,0 +1,335 @@ + + + + + diff --git a/src/views/business/queue/index.vue b/src/views/business/queue/index.vue deleted file mode 100644 index edf534c..0000000 --- a/src/views/business/queue/index.vue +++ /dev/null @@ -1,61 +0,0 @@ - - - - - -- Gitee From 891a3fd95a5c220a550a01935d05ed642c667e81 Mon Sep 17 00:00:00 2001 From: yqz Date: Sat, 29 Oct 2022 20:09:39 +0800 Subject: [PATCH 03/22] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E5=99=A8=E8=B7=AF=E5=BE=84=E5=92=8C=E7=BB=84=E4=BB=B6=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E5=88=86=E7=A6=BB=E7=9A=84=E7=9B=AE=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/const/website.js | 3 +++ src/router/avue-router.js | 7 +++++-- src/views/admin/menu/index.vue | 9 +++++---- src/views/admin/menu/menu-form.vue | 30 +++++++++++++++++++----------- src/views/admin/role/index.vue | 3 +-- 5 files changed, 33 insertions(+), 19 deletions(-) diff --git a/src/const/website.js b/src/const/website.js index 7fd2317..eaef560 100644 --- a/src/const/website.js +++ b/src/const/website.js @@ -27,7 +27,10 @@ export default { menu: { props: { label: "label", + // 访问路径地址 path: "path", + // 组件地址 + component: "component", icon: "icon", children: "children" } diff --git a/src/router/avue-router.js b/src/router/avue-router.js index 120c120..5d37c81 100644 --- a/src/router/avue-router.js +++ b/src/router/avue-router.js @@ -65,6 +65,7 @@ RouterPlugin.install = function(router, store) { const propsDefault = { label: propsConfig.label || 'label', path: propsConfig.path || 'path', + component: propsConfig.component || 'component', icon: propsConfig.icon || 'icon', children: propsConfig.children || 'children', meta: propsConfig.meta || 'meta' @@ -82,8 +83,8 @@ RouterPlugin.install = function(router, store) { } })() - //特殊处理组件 - const component = 'views' + oMenu.path + //特殊处理组件 这里对应菜单配置的组件地址 达到浏览器路径和组件地址分离的目的 + const component = 'views' + oMenu.component const name = oMenu[propsDefault.label] @@ -95,6 +96,8 @@ RouterPlugin.install = function(router, store) { keepAlive: Number(oMenu['keepAlive']) === 1 } const isChild = children.length !== 0 + console.log("路由地址",path) + console.log("组件地址",component) const oRouter = { path: path, component(resolve) { diff --git a/src/views/admin/menu/index.vue b/src/views/admin/menu/index.vue index 58fe069..2d6f365 100644 --- a/src/views/admin/menu/index.vue +++ b/src/views/admin/menu/index.vue @@ -27,18 +27,19 @@ - + + diff --git a/src/views/admin/menu/menu-form.vue b/src/views/admin/menu/menu-form.vue index 88ec2ba..e7855ac 100644 --- a/src/views/admin/menu/menu-form.vue +++ b/src/views/admin/menu/menu-form.vue @@ -31,13 +31,21 @@ > - + - + + + + - + + + + + + diff --git a/src/views/business/businessQueue/queue/index.vue b/src/views/business/businessQueue/queue/index.vue index 0f0a74b..d3ab07a 100644 --- a/src/views/business/businessQueue/queue/index.vue +++ b/src/views/business/businessQueue/queue/index.vue @@ -23,6 +23,7 @@ + @@ -59,8 +60,8 @@ - - + + @@ -73,8 +74,15 @@ + + + - +
@@ -84,7 +92,7 @@ - +
- 分配完成 + 完成分配 取 消
@@ -132,10 +140,6 @@ export default { title: "", // 是否显示弹出层 open: false, - // 是否弹出分配窗口 - transferOpen: false, - // 分配窗口弹窗名称 - transferTitle: "", // 表单参数 form: {}, // 遮罩层 @@ -152,6 +156,10 @@ export default { size: 10, queueName: null, }, + // 是否弹出分配窗口 + transferOpen: false, + // 分配窗口弹窗名称 + transferTitle: "", //源列表的数据 （source) transferSourceData: [], //目标列表的数据，源数据列表每一个都有一个对应的index，这里的数字就是列表里面的index,对应每一个数据 @@ -225,7 +233,7 @@ export default { handleAdd() { this.reset(); this.open = true; - this.title = "添加用户组"; + this.title = "添加队列"; }, /** 修改按钮操作 */ handleUpdate(row) { @@ -248,15 +256,7 @@ export default { }).catch(() => { }); }, - /** 队列绑定窗口 */ - bindWindow(row) { - console.log("队列绑定窗口", row) - this.queueId = row.queueId; - this.transferOpen = true; - this.transferTitle = "分配窗口"; - this.listAllWindows() - this.listQueueWindow(row.queueId) - }, + /** 表单重置 */ reset() { this.form = { @@ -290,6 +290,15 @@ export default { console.log("选择", value) console.log("选择结果集", this.transferTargetValue) }, + /** 队列绑定窗口 */ + bindWindow(row) { + console.log("队列绑定窗口", row) + this.queueId = row.queueId; + this.transferOpen = true; + this.transferTitle = "分配窗口"; + this.listAllWindows() + this.listQueueWindow(row.queueId) + }, /** 完成绑定窗口 */ bindWindowComplete() { let params = { @@ -301,6 +310,7 @@ export default { bindQueueWindow(params).then(res => { if (res.data.code === 200 && res.data.data) { this.$message.success("修改成功"); + this.transferOpen = false; } }) }, diff --git a/src/views/business/businessQueue/window/index.vue b/src/views/business/businessQueue/window/index.vue new file mode 100644 index 0000000..1650b9e --- /dev/null +++ b/src/views/business/businessQueue/window/index.vue @@ -0,0 +1,231 @@ + + + + + -- Gitee From 766a1401f30c08b31ce62c1d4f12273a8655ac49 Mon Sep 17 00:00:00 2001 From: yqz Date: Sun, 30 Oct 2022 12:04:44 +0800 Subject: [PATCH 05/22] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=96=E5=8F=B7?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/queue/ticketorder.js | 10 +- src/util/bpm/dict-util.js | 3 +- .../businessQueue/ticketOrder/index.vue | 204 ++++++++++++++++++ 3 files changed, 211 insertions(+), 6 deletions(-) create mode 100644 src/views/business/businessQueue/ticketOrder/index.vue diff --git a/src/api/queue/ticketorder.js b/src/api/queue/ticketorder.js index 312b68a..fe6ecfb 100644 --- a/src/api/queue/ticketorder.js +++ b/src/api/queue/ticketorder.js @@ -2,7 +2,7 @@ import request from '@/router/axios' export function fetchList(query) { return request({ - url: '/queue/business-ticket-order/page', + url: '/business-ticket-order/page', method: 'get', params: query }) @@ -10,7 +10,7 @@ export function fetchList(query) { export function addObj(obj) { return request({ - url: '/queue/business-ticket-order/create', + url: '/business-ticket-order/create', method: 'post', data: obj }) @@ -18,21 +18,21 @@ export function addObj(obj) { export function getObj(id) { return request({ - url: '/queue/business-ticket-order/' + id, + url: '/business-ticket-order/' + id, method: 'get' }) } export function delObj(id) { return request({ - url: '/queue/business-ticket-order/' + id, + url: '/business-ticket-order/' + id, method: 'delete' }) } export function putObj(obj) { return request({ - url: '/queue/business-ticket-order/update', + url: '/business-ticket-order/update', method: 'put', data: obj }) diff --git a/src/util/bpm/dict-util.js b/src/util/bpm/dict-util.js index 9296a50..402385b 100644 --- a/src/util/bpm/dict-util.js +++ b/src/util/bpm/dict-util.js @@ -17,7 +17,8 @@ export const DICT_TYPE = { BPM_PROCESS_INSTANCE_RESULT: 'bpm_process_instance_result', BPM_TASK_ASSIGN_SCRIPT: 'bpm_task_assign_script', BPM_OA_LEAVE_TYPE: 'bpm_oa_leave_type', - WINDOW_STATUS: 'window_status' + WINDOW_STATUS: 'window_status', + TICKET_STATUS: 'ticket_status' } /** diff --git a/src/views/business/businessQueue/ticketOrder/index.vue b/src/views/business/businessQueue/ticketOrder/index.vue new file mode 100644 index 0000000..4560b8b --- /dev/null +++ b/src/views/business/businessQueue/ticketOrder/index.vue @@ -0,0 +1,204 @@ + + + + + -- Gitee From ec929c01d11f2cba52bc097bd1ba7b3299334b44 Mon Sep 17 00:00:00 2001 From: yqz Date: Sun, 30 Oct 2022 18:07:28 +0800 Subject: [PATCH 06/22] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=91=E5=AE=9Akey?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/businessQueue/machine/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/business/businessQueue/machine/index.vue b/src/views/business/businessQueue/machine/index.vue index 4cf93da..5ec3737 100644 --- a/src/views/business/businessQueue/machine/index.vue +++ b/src/views/business/businessQueue/machine/index.vue @@ -24,7 +24,7 @@ - + @@ -56,8 +56,8 @@ - - + + @@ -145,7 +145,7 @@ export default { queryParams: { current: 1, size: 10, - machineName: null, + ticketMachineName: null, }, // 是否弹出分配窗口 transferOpen: false, @@ -157,7 +157,7 @@ export default { transferTargetValue: [], // 表单校验 rules: { - machineName: [{required: true, message: "取号机名称不能为空", trigger: "blur"}], + ticketMachineName: [{required: true, message: "取号机名称不能为空", trigger: "blur"}], ticketMachineKey: [{required: true, message: "取号机标识不能为空", trigger: "blur"}], } } -- Gitee From f1e8436432cf38738ea8f1a71e87c93544ef18d9 Mon Sep 17 00:00:00 2001 From: yqz Date: Wed, 9 Nov 2022 00:04:10 +0800 Subject: [PATCH 07/22] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E9=AA=8C=E8=AF=81=E7=A0=81=E7=99=BB=E5=BD=95=202?= =?UTF-8?q?=E3=80=81=E8=B4=A6=E6=88=B7=E5=AF=86=E7=A0=81=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E5=BD=A2=E9=AA=8C=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/admin/user.js | 9 +++++ src/api/login.js | 21 ++---------- src/config/env.js | 4 +-- src/page/login/codelogin.vue | 34 +++++++++++-------- src/page/login/userlogin.vue | 66 ++++++++++++++---------------------- src/store/modules/user.js | 11 +++--- src/util/util.js | 9 +++++ 7 files changed, 76 insertions(+), 78 deletions(-) diff --git a/src/api/admin/user.js b/src/api/admin/user.js index 036b8e7..f5d1643 100644 --- a/src/api/admin/user.js +++ b/src/api/admin/user.js @@ -52,3 +52,12 @@ export function listUser() { method: 'get' }) } + + +export function sendLoginSms(params) { + return request({ + url: '/admin/auth/sendLoginSmsCode', + method: 'post', + data: params + }) +} diff --git a/src/api/login.js b/src/api/login.js index 1fbb113..7c3ee0e 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -1,4 +1,3 @@ - import request from '@/router/axios' import {getStore, setStore} from "@/util/store.js"; import website from "@/const/website.js"; @@ -14,26 +13,12 @@ export const loginByUsername = (login) => { }) } -export const loginByMobile = (mobile, code) => { - const grant_type = 'app' - - let basicAuth = 'Basic ' + window.btoa(website.smsLoginClient) - - // 保存当前选中的 basic 认证信息 - setStore({ - name: 'basicAuth', - content: basicAuth, - type: 'session' - }) +export const loginByMobile = (phone, code) => { return request({ - url: '/auth/oauth2/token', - headers: { - isToken: false, - 'Authorization': basicAuth - }, + url: '/admin/auth/smsLogin', method: 'post', - params: {mobile: mobile, code: code, grant_type, scope} + data: {phone: phone, code: code} }) } diff --git a/src/config/env.js b/src/config/env.js index a56e0d4..844e5fd 100644 --- a/src/config/env.js +++ b/src/config/env.js @@ -5,12 +5,12 @@ const baseUrl = '' // 图表库为avue和tiny套地址 const iconfontVersion = ['567566_qo5lxgtishg', '667895_v7uduh4zui'] const iconfontUrl = `//at.alicdn.com/t/font_$key.css` -const codeUrl = `${window.location.origin}/code` +const captchaUrl = `${window.location.origin}/admin/auth/createCaptcha` export { baseUrl, iconfontUrl, iconfontVersion, - codeUrl, + captchaUrl, env } diff --git a/src/page/login/codelogin.vue b/src/page/login/codelogin.vue index f8b8741..9cc2f0f 100644 --- a/src/page/login/codelogin.vue +++ b/src/page/login/codelogin.vue @@ -9,13 +9,13 @@ > - + @@ -26,7 +26,7 @@ placeholder="请输入验证码" @keyup.enter.native="handleLogin" > - + @@ -38,18 +38,22 @@ type="primary" class="login-submit" @click.native.prevent="handleLogin" - >登录 + >登录 + diff --git a/src/store/modules/user.js b/src/store/modules/user.js index b24fccc..66a6a1b 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -48,7 +48,9 @@ const user = { LoginByUsername({commit}, userInfo) { let login = { username: userInfo.username, - password: userInfo.password + password: userInfo.password, + uuid: userInfo.uuid, + captcha: userInfo.captcha } return new Promise((resolve, reject) => { loginByUsername(login).then(response => { @@ -64,9 +66,10 @@ const user = { // 根据手机号登录 LoginByPhone({commit}, userInfo) { return new Promise((resolve, reject) => { - loginByMobile(userInfo.mobile, userInfo.code).then(response => { - const data = response.data - commit('SET_ACCESS_TOKEN', data.access_token) + loginByMobile(userInfo.phone, userInfo.code).then(response => { + const data = response.data.data + debugger + commit('SET_ACCESS_TOKEN', data.token) commit('CLEAR_LOCK') resolve() }).catch(error => { diff --git a/src/util/util.js b/src/util/util.js index a5858fe..61c0369 100644 --- a/src/util/util.js +++ b/src/util/util.js @@ -402,3 +402,12 @@ export function parseTime(time, pattern) { }) return time_str } + +/** + * 获取uuid + */ +export function getUUID () { + return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => { + return (c === 'x' ? (Math.random() * 16 | 0) : ('r&0x3' | '0x8')).toString(16) + }) +} -- Gitee From 11e217020d4ba6a38cdbae1940f8f915871c0f24 Mon Sep 17 00:00:00 2001 From: yqz Date: Wed, 9 Nov 2022 00:08:32 +0800 Subject: [PATCH 08/22] =?UTF-8?q?=E5=85=B3=E9=97=ADdebuger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 66a6a1b..0adfb84 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -68,7 +68,7 @@ const user = { return new Promise((resolve, reject) => { loginByMobile(userInfo.phone, userInfo.code).then(response => { const data = response.data.data - debugger + // debugger commit('SET_ACCESS_TOKEN', data.token) commit('CLEAR_LOCK') resolve() -- Gitee From dbcb9b6c300d9ac2e53d0f96ad759623276da598 Mon Sep 17 00:00:00 2001 From: yqz Date: Wed, 9 Nov 2022 00:15:05 +0800 Subject: [PATCH 09/22] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=B9=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81=E7=9A=84=E9=9D=9E=E7=A9=BA=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/login/userlogin.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue index e1c4275..b1e8419 100644 --- a/src/page/login/userlogin.vue +++ b/src/page/login/userlogin.vue @@ -35,7 +35,7 @@ - + { - debugger this.$router.push({path: this.tagWel.value}); }) .catch(() => { -- Gitee From b7620f16dc72dd4bc6213580d8999759941ab20a Mon Sep 17 00:00:00 2001 From: yqz Date: Thu, 10 Nov 2022 18:49:47 +0800 Subject: [PATCH 10/22] =?UTF-8?q?=E6=B7=BB=E5=8A=A0oAuth=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AB=AF=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/oauth2/oauth2client.js | 40 +++ src/components/bpm/generator/config.js | 3 +- src/components/bpm/parser/Parser.vue | 4 +- src/components/upload/fileUpload.vue | 205 ++++++++++++++++ src/components/upload/imgUpload.vue | 204 ++++++++++++++++ src/main.js | 3 + src/plugins/cache.js | 77 ++++++ src/plugins/download.js | 41 ++++ src/plugins/index.js | 17 ++ src/plugins/modal.js | 83 +++++++ src/plugins/tab.js | 67 +++++ src/util/bpm/constants.js | 2 - src/util/bpm/dict-util.js | 5 +- src/views/bpm/model/index.vue | 2 +- src/views/oauth2/client/index.vue | 323 +++++++++++++++++++++++++ 15 files changed, 1068 insertions(+), 8 deletions(-) create mode 100644 src/api/oauth2/oauth2client.js create mode 100644 src/components/upload/fileUpload.vue create mode 100644 src/components/upload/imgUpload.vue create mode 100644 src/plugins/cache.js create mode 100644 src/plugins/download.js create mode 100644 src/plugins/index.js create mode 100644 src/plugins/modal.js create mode 100644 src/plugins/tab.js create mode 100644 src/views/oauth2/client/index.vue diff --git a/src/api/oauth2/oauth2client.js b/src/api/oauth2/oauth2client.js new file mode 100644 index 0000000..2e38cdd --- /dev/null +++ b/src/api/oauth2/oauth2client.js @@ -0,0 +1,40 @@ + +import request from '@/router/axios' + +export function fetchList(query) { + return request({ + url: '/admin/oauth/client/page', + method: 'get', + params: query + }) +} + +export function addObj(obj) { + return request({ + url: '/admin/oauth/client/create', + method: 'post', + data: obj + }) +} + +export function getObj(id) { + return request({ + url: '/admin/oauth/client/' + id, + method: 'get' + }) +} + +export function delObj(id) { + return request({ + url: '/admin/oauth/client/' + id, + method: 'delete' + }) +} + +export function putObj(obj) { + return request({ + url: '/admin/oauth/client/update', + method: 'put', + data: obj + }) +} diff --git a/src/components/bpm/generator/config.js b/src/components/bpm/generator/config.js index 780a1bb..83d3865 100644 --- a/src/components/bpm/generator/config.js +++ b/src/components/bpm/generator/config.js @@ -499,8 +499,7 @@ export const selectComponents = [ __slot__: { 'list-type': true }, - // action: process.env.VUE_APP_BASE_API + "/admin-api/infra/file/upload", // 请求地址 - action: '/infra/file/upload', // 请求地址 + action: '/admin/file/upload', // 请求地址 disabled: false, accept: '', name: 'file', diff --git a/src/components/bpm/parser/Parser.vue b/src/components/bpm/parser/Parser.vue index a79d312..8a10906 100644 --- a/src/components/bpm/parser/Parser.vue +++ b/src/components/bpm/parser/Parser.vue @@ -94,8 +94,8 @@ function renderFormItem(h, elementList) { // 回显图片 scheme['file-list'] = (val || []).map(url => ({ name: url, url })) // 上传地址 + 请求头 - scheme.action = process.env.VUE_APP_BASE_API + "/admin-api/infra/file/upload" - let token = store.getters.access_token; + scheme.action = "/admin/file/upload" + let token = this.$store.getters.access_token; scheme.headers = { Authorization: "Bearer " + token } // 注意 on-success 不能绑定箭头函数！！！ diff --git a/src/components/upload/fileUpload.vue b/src/components/upload/fileUpload.vue new file mode 100644 index 0000000..400e334 --- /dev/null +++ b/src/components/upload/fileUpload.vue @@ -0,0 +1,205 @@ + + + + + diff --git a/src/components/upload/imgUpload.vue b/src/components/upload/imgUpload.vue new file mode 100644 index 0000000..8527edf --- /dev/null +++ b/src/components/upload/imgUpload.vue @@ -0,0 +1,204 @@ + + + + + diff --git a/src/main.js b/src/main.js index aee3fd2..cfc4ee4 100644 --- a/src/main.js +++ b/src/main.js @@ -21,6 +21,9 @@ import "./styles/common.scss"; import basicContainer from "./components/basic-container/main"; import RightToolbar from "./components/RightToolbar" import Pagination from "@/components/Pagination"; + +import plugins from './plugins' // plugins +Vue.use(plugins) // 字典标签组件 import DictTag from '@/components/DictTag' diff --git a/src/plugins/cache.js b/src/plugins/cache.js new file mode 100644 index 0000000..6b5c00b --- /dev/null +++ b/src/plugins/cache.js @@ -0,0 +1,77 @@ +const sessionCache = { + set (key, value) { + if (!sessionStorage) { + return + } + if (key != null && value != null) { + sessionStorage.setItem(key, value) + } + }, + get (key) { + if (!sessionStorage) { + return null + } + if (key == null) { + return null + } + return sessionStorage.getItem(key) + }, + setJSON (key, jsonValue) { + if (jsonValue != null) { + this.set(key, JSON.stringify(jsonValue)) + } + }, + getJSON (key) { + const value = this.get(key) + if (value != null) { + return JSON.parse(value) + } + }, + remove (key) { + sessionStorage.removeItem(key); + } +} +const localCache = { + set (key, value) { + if (!localStorage) { + return + } + if (key != null && value != null) { + localStorage.setItem(key, value) + } + }, + get (key) { + if (!localStorage) { + return null + } + if (key == null) { + return null + } + return localStorage.getItem(key) + }, + setJSON (key, jsonValue) { + if (jsonValue != null) { + this.set(key, JSON.stringify(jsonValue)) + } + }, + getJSON (key) { + const value = this.get(key) + if (value != null) { + return JSON.parse(value) + } + }, + remove (key) { + localStorage.removeItem(key); + } +} + +export default { + /** + * 会话级缓存 + */ + session: sessionCache, + /** + * 本地缓存 + */ + local: localCache +} diff --git a/src/plugins/download.js b/src/plugins/download.js new file mode 100644 index 0000000..c09346f --- /dev/null +++ b/src/plugins/download.js @@ -0,0 +1,41 @@ +export default { + // 下载 Excel 方法 + excel(data, fileName) { + this.download0(data, fileName, 'application/vnd.ms-excel'); + }, + + // 下载 Word 方法 + word(data, fileName) { + this.download0(data, fileName, 'application/msword'); + }, + + // 下载 Zip 方法 + zip(data, fileName) { + this.download0(data, fileName, 'application/zip'); + }, + + // 下载 Html 方法 + html(data, fileName) { + this.download0(data, fileName, 'text/html'); + }, + + // 下载 Markdown 方法 + markdown(data, fileName) { + this.download0(data, fileName, 'text/markdown'); + }, + + download0(data, fileName, mineType) { + // 创建 blob + let blob = new Blob([data], {type: mineType}); + // 创建 href 超链接，点击进行下载 + window.URL = window.URL || window.webkitURL; + let href = URL.createObjectURL(blob); + let downA = document.createElement("a"); + downA.href = href; + downA.download = fileName; + downA.click(); + // 销毁超连接 + window.URL.revokeObjectURL(href); + }, + +} diff --git a/src/plugins/index.js b/src/plugins/index.js new file mode 100644 index 0000000..0200834 --- /dev/null +++ b/src/plugins/index.js @@ -0,0 +1,17 @@ +import tab from './tab' +import cache from './cache' +import modal from './modal' +import download from './download' + +export default { + install(Vue) { + // 页签操作 + Vue.prototype.$tab = tab + // 缓存对象 + Vue.prototype.$cache = cache + // 模态框对象 + Vue.prototype.$modal = modal + // 下载文件 + Vue.prototype.$download = download + } +} diff --git a/src/plugins/modal.js b/src/plugins/modal.js new file mode 100644 index 0000000..b37ca14 --- /dev/null +++ b/src/plugins/modal.js @@ -0,0 +1,83 @@ +import { Message, MessageBox, Notification, Loading } from 'element-ui' + +let loadingInstance; + +export default { + // 消息提示 + msg(content) { + Message.info(content) + }, + // 错误消息 + msgError(content) { + Message.error(content) + }, + // 成功消息 + msgSuccess(content) { + Message.success(content) + }, + // 警告消息 + msgWarning(content) { + Message.warning(content) + }, + // 弹出提示 + alert(content) { + MessageBox.alert(content, "系统提示") + }, + // 错误提示 + alertError(content) { + MessageBox.alert(content, "系统提示", { type: 'error' }) + }, + // 成功提示 + alertSuccess(content) { + MessageBox.alert(content, "系统提示", { type: 'success' }) + }, + // 警告提示 + alertWarning(content) { + MessageBox.alert(content, "系统提示", { type: 'warning' }) + }, + // 通知提示 + notify(content) { + Notification.info(content) + }, + // 错误通知 + notifyError(content) { + Notification.error(content); + }, + // 成功通知 + notifySuccess(content) { + Notification.success(content) + }, + // 警告通知 + notifyWarning(content) { + Notification.warning(content) + }, + // 确认窗体 + confirm(content) { + return MessageBox.confirm(content, "系统提示", { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: "warning", + }) + }, + // 提交内容 + prompt(content) { + return MessageBox.prompt(content, "系统提示", { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: "warning", + }) + }, + // 打开遮罩层 + loading(content) { + loadingInstance = Loading.service({ + lock: true, + text: content, + spinner: "el-icon-loading", + background: "rgba(0, 0, 0, 0.7)", + }) + }, + // 关闭遮罩层 + closeLoading() { + loadingInstance.close(); + } +} diff --git a/src/plugins/tab.js b/src/plugins/tab.js new file mode 100644 index 0000000..8e92ab1 --- /dev/null +++ b/src/plugins/tab.js @@ -0,0 +1,67 @@ +import store from '@/store' +import router from '@/router/router'; + +export default { + // 刷新当前tab页签 + refreshPage(obj) { + const { path, query, matched } = router.currentRoute; + if (obj === undefined) { + matched.forEach((m) => { + if (m.components && m.components.default && m.components.default.name) { + if (!['Layout', 'ParentView'].includes(m.components.default.name)) { + obj = { name: m.components.default.name, path: path, query: query }; + } + } + }); + } + return store.dispatch('tagsView/delCachedView', obj).then(() => { + const { path, query } = obj + router.replace({ + path: '/redirect' + path, + query: query + }) + }) + }, + // 关闭当前tab页签，打开新页签 + closeOpenPage(obj) { + store.dispatch("tagsView/delView", router.currentRoute); + if (obj !== undefined) { + return router.push(obj); + } + }, + // 关闭指定tab页签 + closePage(obj) { + if (obj === undefined) { + return store.dispatch('tagsView/delView', router.currentRoute).then(({ lastPath }) => { + return router.push(lastPath || '/'); + }); + } + return store.dispatch('tagsView/delView', obj); + }, + // 关闭所有tab页签 + closeAllPage() { + return store.dispatch('tagsView/delAllViews'); + }, + // 关闭左侧tab页签 + closeLeftPage(obj) { + return store.dispatch('tagsView/delLeftTags', obj || router.currentRoute); + }, + // 关闭右侧tab页签 + closeRightPage(obj) { + return store.dispatch('tagsView/delRightTags', obj || router.currentRoute); + }, + // 关闭其他tab页签 + closeOtherPage(obj) { + return store.dispatch('tagsView/delOthersViews', obj || router.currentRoute); + }, + // 添加tab页签 + openPage(title, url, params) { + const obj = { path: url, meta: { title: title } } + store.dispatch('tagsView/addView', obj); + return router.push({ path: url, query: params }); + }, + // 修改tab页签 + updatePage(obj) { + return store.dispatch('tagsView/updateVisitedView', obj); + } +} diff --git a/src/util/bpm/constants.js b/src/util/bpm/constants.js index 67ecfdd..09568a0 100644 --- a/src/util/bpm/constants.js +++ b/src/util/bpm/constants.js @@ -1,6 +1,4 @@ /** - * Created by 芋道源码 - * * 枚举类 */ diff --git a/src/util/bpm/dict-util.js b/src/util/bpm/dict-util.js index 402385b..aeb8674 100644 --- a/src/util/bpm/dict-util.js +++ b/src/util/bpm/dict-util.js @@ -18,7 +18,10 @@ export const DICT_TYPE = { BPM_TASK_ASSIGN_SCRIPT: 'bpm_task_assign_script', BPM_OA_LEAVE_TYPE: 'bpm_oa_leave_type', WINDOW_STATUS: 'window_status', - TICKET_STATUS: 'ticket_status' + TICKET_STATUS: 'ticket_status', + + // oAuth + SYSTEM_OAUTH2_GRANT_TYPE: 'system_oauth2_grant_type' } /** diff --git a/src/views/bpm/model/index.vue b/src/views/bpm/model/index.vue index be370cb..9c7cbde 100644 --- a/src/views/bpm/model/index.vue +++ b/src/views/bpm/model/index.vue @@ -313,7 +313,7 @@ export default { // 是否禁用上传 isUploading: false, // 上传的地址 - url: process.env.VUE_APP_BASE_API + '/admin-api' + "/bpm/model/import", + url: "/bpm/model/import", // 表单 form: {}, // 校验规则 diff --git a/src/views/oauth2/client/index.vue b/src/views/oauth2/client/index.vue new file mode 100644 index 0000000..7f8bfe5 --- /dev/null +++ b/src/views/oauth2/client/index.vue @@ -0,0 +1,323 @@ + + + -- Gitee From 51ca1c8733e943ed61a8b730e8877ea12b0c0cb9 Mon Sep 17 00:00:00 2001 From: yqz Date: Fri, 11 Nov 2022 18:27:46 +0800 Subject: [PATCH 11/22] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/oauth2/oauth2client.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/api/oauth2/oauth2client.js b/src/api/oauth2/oauth2client.js index 2e38cdd..0812e60 100644 --- a/src/api/oauth2/oauth2client.js +++ b/src/api/oauth2/oauth2client.js @@ -3,7 +3,7 @@ import request from '@/router/axios' export function fetchList(query) { return request({ - url: '/admin/oauth/client/page', + url: '/open/oauth2/client/page', method: 'get', params: query }) @@ -11,7 +11,7 @@ export function fetchList(query) { export function addObj(obj) { return request({ - url: '/admin/oauth/client/create', + url: '/open/oauth2/client/create', method: 'post', data: obj }) @@ -19,21 +19,21 @@ export function addObj(obj) { export function getObj(id) { return request({ - url: '/admin/oauth/client/' + id, + url: '/open/oauth2/client/' + id, method: 'get' }) } export function delObj(id) { return request({ - url: '/admin/oauth/client/' + id, + url: '/open/oauth2/client/' + id, method: 'delete' }) } export function putObj(obj) { return request({ - url: '/admin/oauth/client/update', + url: '/open/oauth2/client/update', method: 'put', data: obj }) -- Gitee From 8ca6ddefa89cb59dcebea0f30cf29e201e54a659 Mon Sep 17 00:00:00 2001 From: yqz Date: Sat, 12 Nov 2022 22:12:57 +0800 Subject: [PATCH 12/22] =?UTF-8?q?=E6=B7=BB=E5=8A=A0token=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/oauth2/oauth2client.js | 1 - src/api/oauth2/tokenData.js | 18 +++++ src/store/modules/user.js | 4 +- src/views/oauth2/client/index.vue | 8 ++- src/views/oauth2/token/index.vue | 115 ++++++++++++++++++++++++++++++ 5 files changed, 141 insertions(+), 5 deletions(-) create mode 100644 src/api/oauth2/tokenData.js create mode 100644 src/views/oauth2/token/index.vue diff --git a/src/api/oauth2/oauth2client.js b/src/api/oauth2/oauth2client.js index 0812e60..cf1aa15 100644 --- a/src/api/oauth2/oauth2client.js +++ b/src/api/oauth2/oauth2client.js @@ -1,4 +1,3 @@ - import request from '@/router/axios' export function fetchList(query) { diff --git a/src/api/oauth2/tokenData.js b/src/api/oauth2/tokenData.js new file mode 100644 index 0000000..e9c4431 --- /dev/null +++ b/src/api/oauth2/tokenData.js @@ -0,0 +1,18 @@ +import request from '@/router/axios' + +// 获得访问令牌分页 +export function getAccessTokenPage(query) { + return request({ + url: '/open/oauth2-token/page', + method: 'get', + params: query + }) +} + +// 删除访问令牌 +export function deleteAccessToken(accessToken) { + return request({ + url: '/open/oauth2-token/delete?accessToken=' + accessToken, + method: 'delete' + }) +} diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 0adfb84..f7a6385 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -144,7 +144,7 @@ const user = { setStore({ name: 'access_token', content: state.access_token, - type: 'session' + // type: 'session' }) }, SET_USER_INFO: (state, userInfo) => { @@ -156,7 +156,7 @@ const user = { setStore({ name: 'menu', content: menu, - type: 'session' + // type: 'session' }) }, SET_MENU_ALL: (state, menuAll) => { diff --git a/src/views/oauth2/client/index.vue b/src/views/oauth2/client/index.vue index 7f8bfe5..9ae61ac 100644 --- a/src/views/oauth2/client/index.vue +++ b/src/views/oauth2/client/index.vue @@ -67,10 +67,10 @@ @@ -166,6 +166,7 @@ import ImageUpload from '@/components/upload/imgUpload'; import Editor from '@/components/editor'; import {CommonStatusEnum} from "@/util/bpm/constants"; import FileUpload from "@/components/upload/fileUpload"; +import {mapGetters} from "vuex"; export default { name: "OAuth2Client", @@ -218,6 +219,9 @@ export default { created() { this.getList(); }, + computed: { + ...mapGetters(["permissions"]) + }, methods: { /** 查询列表 */ getList() { diff --git a/src/views/oauth2/token/index.vue b/src/views/oauth2/token/index.vue new file mode 100644 index 0000000..e9f362a --- /dev/null +++ b/src/views/oauth2/token/index.vue @@ -0,0 +1,115 @@ + + + + -- Gitee From 07f2aef56b0dd37aea0d0826439e3f1d5f329c58 Mon Sep 17 00:00:00 2001 From: yqz Date: Sun, 13 Nov 2022 19:57:35 +0800 Subject: [PATCH 13/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95token?= =?UTF-8?q?=E4=B8=BAredis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/login.js | 22 +++++++++++++++++++--- src/api/oauth2/oauth2client.js | 10 +++++----- src/const/website.js | 1 + src/store/modules/user.js | 5 +++-- 4 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/api/login.js b/src/api/login.js index 7c3ee0e..37cf491 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -3,20 +3,36 @@ import {getStore, setStore} from "@/util/store.js"; import website from "@/const/website.js"; -const scope = 'server' - export const loginByUsername = (login) => { + + let basicAuth = 'Basic ' + window.btoa(website.formLoginClient) + // 保存当前选中的 basic 认证信息 + setStore({ + name: 'basicAuth', + content: basicAuth + }) return request({ url: '/admin/auth/login', + headers: { + Authorization: basicAuth + }, method: 'post', data: login }) } export const loginByMobile = (phone, code) => { - + let basicAuth = 'Basic ' + window.btoa(website.formLoginClient) + // 保存当前选中的 basic 认证信息 + setStore({ + name: 'basicAuth', + content: basicAuth + }) return request({ url: '/admin/auth/smsLogin', + headers: { + Authorization: basicAuth + }, method: 'post', data: {phone: phone, code: code} }) diff --git a/src/api/oauth2/oauth2client.js b/src/api/oauth2/oauth2client.js index cf1aa15..eab286e 100644 --- a/src/api/oauth2/oauth2client.js +++ b/src/api/oauth2/oauth2client.js @@ -2,7 +2,7 @@ import request from '@/router/axios' export function fetchList(query) { return request({ - url: '/open/oauth2/client/page', + url: '/open/oauth2-client/page', method: 'get', params: query }) @@ -10,7 +10,7 @@ export function fetchList(query) { export function addObj(obj) { return request({ - url: '/open/oauth2/client/create', + url: '/open/oauth2-client/create', method: 'post', data: obj }) @@ -18,21 +18,21 @@ export function addObj(obj) { export function getObj(id) { return request({ - url: '/open/oauth2/client/' + id, + url: '/open/oauth2-client/' + id, method: 'get' }) } export function delObj(id) { return request({ - url: '/open/oauth2/client/' + id, + url: '/open/oauth2-client/' + id, method: 'delete' }) } export function putObj(obj) { return request({ - url: '/open/oauth2/client/update', + url: '/open/oauth2-client/update', method: 'put', data: obj }) diff --git a/src/const/website.js b/src/const/website.js index eaef560..51740e0 100644 --- a/src/const/website.js +++ b/src/const/website.js @@ -6,6 +6,7 @@ export default { title: "快速开发框架", validateCode: true,//是否开启验证码校验 register: true, //是否开启注册 + formLoginClient: 'admin:admin',// 用户名密码登录的 client 信息 smsLoginClient: 'app:app',// 验证码登录的 client 信息 remainingTime: 1800000, // token 剩余多少毫秒执行刷新 whiteList: ["/login", "/404", "/401", "/lock"], // 配置无权限可以访问的页面 diff --git a/src/store/modules/user.js b/src/store/modules/user.js index f7a6385..9d3f5d8 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -55,7 +55,8 @@ const user = { return new Promise((resolve, reject) => { loginByUsername(login).then(response => { const data = response.data.data - commit('SET_ACCESS_TOKEN', data.token) + debugger + commit('SET_ACCESS_TOKEN', data.accessToken) commit('CLEAR_LOCK') resolve() }).catch(error => { @@ -69,7 +70,7 @@ const user = { loginByMobile(userInfo.phone, userInfo.code).then(response => { const data = response.data.data // debugger - commit('SET_ACCESS_TOKEN', data.token) + commit('SET_ACCESS_TOKEN', data.accessToken) commit('CLEAR_LOCK') resolve() }).catch(error => { -- Gitee From 1b57917361619ce44924e01a1ad5f52849f9f6a0 Mon Sep 17 00:00:00 2001 From: yqz Date: Mon, 14 Nov 2022 15:31:13 +0800 Subject: [PATCH 14/22] =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=8D=95=E7=82=B9?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=88=E6=9D=83=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/sso.js | 38 +++++++ src/page/login/codelogin.vue | 7 +- src/page/login/userlogin.vue | 6 +- src/permission.js | 6 +- src/router/page/index.js | 11 ++ src/store/modules/user.js | 2 +- src/views/sso/index.vue | 198 +++++++++++++++++++++++++++++++++++ 7 files changed, 262 insertions(+), 6 deletions(-) create mode 100644 src/api/sso.js create mode 100644 src/views/sso/index.vue diff --git a/src/api/sso.js b/src/api/sso.js new file mode 100644 index 0000000..6a9cb58 --- /dev/null +++ b/src/api/sso.js @@ -0,0 +1,38 @@ +import request from '@/router/axios' + +// ========== OAUTH 2.0 相关 ========== + +export function getAuthorize(clientId) { + return request({ + url: '/open/oauth2/authorize?clientId=' + clientId, + method: 'get' + }) +} + +export function authorize(responseType, clientId, redirectUri, state, + autoApprove, checkedScopes, uncheckedScopes) { + // 构建 scopes + const scopes = {} + for (const scope of checkedScopes) { + scopes[scope] = true + } + for (const scope of uncheckedScopes) { + scopes[scope] = false + } + // 发起请求 + return request({ + url: '/open/oauth2/authorize', + headers: { + 'Content-type': 'application/x-www-form-urlencoded' + }, + params: { + response_type: responseType, + client_id: clientId, + redirect_uri: redirectUri, + state: state, + auto_approve: autoApprove, + scope: JSON.stringify(scopes) + }, + method: 'post' + }) +} diff --git a/src/page/login/codelogin.vue b/src/page/login/codelogin.vue index 9cc2f0f..77595b0 100644 --- a/src/page/login/codelogin.vue +++ b/src/page/login/codelogin.vue @@ -83,8 +83,12 @@ export default { phone: [{required: true, trigger: "blur", validator: validatePhone}], code: [{required: true, trigger: "blur", validator: validateCode}], }, + redirect:"" }; }, + created() { + this.redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) : undefined; + }, computed: { ...mapGetters(["tagWel"]), }, @@ -113,8 +117,7 @@ export default { this.$refs.loginForm.validate((valid) => { if (valid) { this.$store.dispatch("LoginByPhone", this.loginForm).then(() => { - debugger - this.$router.push({path: this.tagWel.value}); + this.$router.push({path: this.redirect || this.tagWel.value}); }); } }); diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue index b1e8419..0b3b002 100644 --- a/src/page/login/userlogin.vue +++ b/src/page/login/userlogin.vue @@ -94,13 +94,15 @@ export default { ] }, passwordType: "password", - captchaPath: "" + captchaPath: "", + redirect:'' }; }, created() { if (this.website.validateCode) { this.getCaptcha(); } + this.redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) : undefined; }, computed: { ...mapGetters(["tagWel", "website"]) @@ -117,7 +119,7 @@ export default { if (valid) { this.$store.dispatch("LoginByUsername", this.loginForm) .then(() => { - this.$router.push({path: this.tagWel.value}); + this.$router.push({path: this.redirect || this.tagWel.value}); }) .catch(() => { this.getCaptcha(); diff --git a/src/permission.js b/src/permission.js index d2eefbf..836e4ab 100644 --- a/src/permission.js +++ b/src/permission.js @@ -79,9 +79,13 @@ router.beforeEach((to, from, next) => { } } else { if (meta.isAuth === false) { + const redirect = encodeURIComponent(to.fullPath) // 编码 URI，保证参数跳转回去后，可以继续带上 + console.log("没有token isAuth == false重定向地址",redirect) next(); } else { - next("/login"); + const redirect = encodeURIComponent(to.fullPath) // 编码 URI，保证参数跳转回去后，可以继续带上 + console.log("没有token 重定向地址",redirect) + next(`/login?redirect=${redirect}`); } } }); diff --git a/src/router/page/index.js b/src/router/page/index.js index b02feac..af7481d 100644 --- a/src/router/page/index.js +++ b/src/router/page/index.js @@ -10,6 +10,17 @@ export default [{ isAuth: false } }, + { + path: '/sso', + component: () => + import ( /* webpackChunkName: "page" */ '@/views/sso/index'), + name: 'sso', + meta: { + keepAlive: true, + isTab: false, + isAuth: true + } + }, { path: '/404', component: () => diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 9d3f5d8..8271840 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -55,7 +55,7 @@ const user = { return new Promise((resolve, reject) => { loginByUsername(login).then(response => { const data = response.data.data - debugger + //debugger commit('SET_ACCESS_TOKEN', data.accessToken) commit('CLEAR_LOCK') resolve() diff --git a/src/views/sso/index.vue b/src/views/sso/index.vue new file mode 100644 index 0000000..d442527 --- /dev/null +++ b/src/views/sso/index.vue @@ -0,0 +1,198 @@ + + + + -- Gitee From 333ab0996d0e4694a91340d76118e5ec2a38ea13 Mon Sep 17 00:00:00 2001 From: yqz Date: Mon, 14 Nov 2022 15:51:41 +0800 Subject: [PATCH 15/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sso/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/sso/index.vue b/src/views/sso/index.vue index d442527..2022cd8 100644 --- a/src/views/sso/index.vue +++ b/src/views/sso/index.vue @@ -74,8 +74,8 @@ export default { }, created() { // 解析参数 - // 例如说【自动授权不通过】：client_id=default&redirect_uri=https%3A%2F%2Fwww.iocoder.cn&response_type=code&scope=user.read%20user.write - // 例如说【自动授权通过】：client_id=default&redirect_uri=https%3A%2F%2Fwww.iocoder.cn&response_type=code&scope=user.read + // 例如说【自动授权不通过】：即scope无参数或者scope参数与后台对该客户端授权的不一致，例如：client_id=sso&response_type=code + // 例如说【自动授权通过】：即scope参数与后台配置的一致，例如：：client_id=sso&response_type=code&scope=user.read this.params.responseType = this.$route.query.response_type this.params.clientId = this.$route.query.client_id this.params.redirectUri = this.$route.query.redirect_uri -- Gitee From a390503937ee265b28ab8baea5e013475299219d Mon Sep 17 00:00:00 2001 From: yqz Date: Tue, 15 Nov 2022 23:39:13 +0800 Subject: [PATCH 16/22] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/oss-local-config.vue | 109 ++++++++++++++++ .../components/oss-minio-config.vue | 123 ++++++++++++++++++ src/views/sys/preferences/config/config.vue | 114 ++++++++++++++++ src/views/sys/preferences/config/oss.vue | 107 +++++++++++++++ 4 files changed, 453 insertions(+) create mode 100644 src/views/sys/preferences/components/oss-local-config.vue create mode 100644 src/views/sys/preferences/components/oss-minio-config.vue create mode 100644 src/views/sys/preferences/config/config.vue create mode 100644 src/views/sys/preferences/config/oss.vue diff --git a/src/views/sys/preferences/components/oss-local-config.vue b/src/views/sys/preferences/components/oss-local-config.vue new file mode 100644 index 0000000..b9a97a5 --- /dev/null +++ b/src/views/sys/preferences/components/oss-local-config.vue @@ -0,0 +1,109 @@ + + + diff --git a/src/views/sys/preferences/components/oss-minio-config.vue b/src/views/sys/preferences/components/oss-minio-config.vue new file mode 100644 index 0000000..dd9a5d8 --- /dev/null +++ b/src/views/sys/preferences/components/oss-minio-config.vue @@ -0,0 +1,123 @@ + + + diff --git a/src/views/sys/preferences/config/config.vue b/src/views/sys/preferences/config/config.vue new file mode 100644 index 0000000..1179e6b --- /dev/null +++ b/src/views/sys/preferences/config/config.vue @@ -0,0 +1,114 @@ + + + + diff --git a/src/views/sys/preferences/config/oss.vue b/src/views/sys/preferences/config/oss.vue new file mode 100644 index 0000000..826b5bf --- /dev/null +++ b/src/views/sys/preferences/config/oss.vue @@ -0,0 +1,107 @@ + + + + + -- Gitee From 260f8b7975fb1412f2b4b85c333dc5f53ba3104d Mon Sep 17 00:00:00 2001 From: yqz Date: Thu, 17 Nov 2022 22:25:55 +0800 Subject: [PATCH 17/22] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/admin/sysconfig.js | 16 ++++ .../components/oss-local-config.vue | 77 ++++++++---------- .../components/oss-minio-config.vue | 63 ++++++++------- src/views/sys/preferences/config/oss.vue | 79 ++++++++++++++++++- 4 files changed, 156 insertions(+), 79 deletions(-) diff --git a/src/api/admin/sysconfig.js b/src/api/admin/sysconfig.js index 581c029..c6db611 100644 --- a/src/api/admin/sysconfig.js +++ b/src/api/admin/sysconfig.js @@ -45,3 +45,19 @@ export function putObj(obj) { data: obj }) } + +//保存文件存储配置 +export function saveStorageConfig(config) { + return request({ + url: '/storage/config/save', + method: 'post', + data: config + }) +} +// 获取文件存储配置文件 +export function getStorageConfig() { + return request({ + url: '/storage/config/get', + method: 'get' + }) +} diff --git a/src/views/sys/preferences/components/oss-local-config.vue b/src/views/sys/preferences/components/oss-local-config.vue index b9a97a5..44437e6 100644 --- a/src/views/sys/preferences/components/oss-local-config.vue +++ b/src/views/sys/preferences/components/oss-local-config.vue @@ -1,6 +1,6 @@