diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoLoginService.java index 8e33a2f..5f45fbe 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoLoginService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoLoginService.java @@ -18,7 +18,7 @@ import org.springframework.stereotype.Service; * @package: com.ruoyi.framework.web.service * @className: ThirdLoginService * @author: sean - * @description: TODO + * @description: 无密码登录服务 * @date: 2023/2/22 7:53 * @version: 1.0 */ diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoUserDetailsService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoUserDetailsService.java index 03b0ade..179dec0 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoUserDetailsService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoUserDetailsService.java @@ -17,7 +17,7 @@ import org.springframework.stereotype.Service; * @package: com.ruoyi.framework.web.service * @className: ThirdUserDetailsService * @author: sean - * @description: TODO + * @description: 无密码登录服务 * @date: 2023/2/22 8:26 * @version: 1.0 */ diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index cdf9d93..95d0ed2 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -60,6 +60,7 @@ "vue-count-to": "1.0.13", "vue-cropper": "0.5.5", "vue-meta": "2.4.0", + "vue-qrcode-reader": "^3.2.0", "vue-router": "3.4.9", "vuedraggable": "2.24.3", "vuex": "3.6.0", diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js index af9827a..1d98d4b 100644 --- a/ruoyi-ui/src/permission.js +++ b/ruoyi-ui/src/permission.js @@ -9,7 +9,7 @@ import defaultSettings from '@/settings' NProgress.configure({ showSpinner: false }) -const whiteList = ['/login', '/register', '/ssoLogin'] +const whiteList = ['/login', '/register', '/ssoLogin','/scan'] router.beforeEach((to, from, next) => { NProgress.start() diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index 9962b8b..a257fd5 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -94,7 +94,13 @@ export const constantRoutes = [ meta: { title: '个人中心', icon: 'user' } } ] - } + }, + //调用手机摄像扫码 + { + path: '/scan', + component: () => import('@/views/scan/scanPage'), + hidden: true + }, ] // 动态路由,基于用户权限动态去加载 diff --git a/ruoyi-ui/src/views/scan/scan.vue b/ruoyi-ui/src/views/scan/scan.vue new file mode 100644 index 0000000..642c45b --- /dev/null +++ b/ruoyi-ui/src/views/scan/scan.vue @@ -0,0 +1,204 @@ + + + + + diff --git a/ruoyi-ui/src/views/scan/scanPage.vue b/ruoyi-ui/src/views/scan/scanPage.vue new file mode 100644 index 0000000..2d4a96e --- /dev/null +++ b/ruoyi-ui/src/views/scan/scanPage.vue @@ -0,0 +1,35 @@ + + +