From 6fa3c1aed79d5af72f978f57bfa8a79ec38125aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Fri, 18 Oct 2024 14:19:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/security/service/TokenService.java       |  8 ++++++--
 yanzhu-ui-app/miniprogram/app.js                    |  4 ++--
 yanzhu-ui-app/miniprogram/app.json                  |  3 ++-
 .../miniprogram/project.private.config.json         | 13 +++++++++++++
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/yanzhu-common/yanzhu-common-security/src/main/java/com/yanzhu/common/security/service/TokenService.java b/yanzhu-common/yanzhu-common-security/src/main/java/com/yanzhu/common/security/service/TokenService.java
index c877acf5..914736a3 100644
--- a/yanzhu-common/yanzhu-common-security/src/main/java/com/yanzhu/common/security/service/TokenService.java
+++ b/yanzhu-common/yanzhu-common-security/src/main/java/com/yanzhu/common/security/service/TokenService.java
@@ -6,6 +6,7 @@ import java.util.concurrent.TimeUnit;
 import javax.servlet.http.HttpServletRequest;
 
 import com.yanzhu.common.core.constant.Constants;
+import com.yanzhu.system.api.domain.SysUser;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -75,8 +76,9 @@ public class TokenService
     public Map<String, Object> createMobileToken(LoginUser loginUser)
     {
         String token = IdUtils.fastUUID();
-        Long userId = loginUser.getSysUser().getUserId();
-        String userName = loginUser.getSysUser().getUserName();
+        SysUser user = loginUser.getSysUser();
+        Long userId = user.getUserId();
+        String userName = user.getUserName();
         loginUser.setToken(token);
         loginUser.setUserid(userId);
         loginUser.setUsername(userName);
@@ -91,6 +93,8 @@ public class TokenService
 
         // 接口返回信息
         Map<String, Object> rspMap = new HashMap<String, Object>();
+        rspMap.put("access_type", user.getUserType());
+        rspMap.put("access_role", user.getRoles());
         rspMap.put("access_token", JwtUtils.createToken(claimsMap));
         rspMap.put("expires_in", expireTime);
         return rspMap;
diff --git a/yanzhu-ui-app/miniprogram/app.js b/yanzhu-ui-app/miniprogram/app.js
index c3f6bdbd..d5e89de4 100644
--- a/yanzhu-ui-app/miniprogram/app.js
+++ b/yanzhu-ui-app/miniprogram/app.js
@@ -52,12 +52,12 @@ App({
       })
     }
     this.autoUpdate();
-
     /**
      * 初始化页面未登录时跳转到登录页
      */
-    if(options && options.proId){
+    if(options && options.query && options.query.proId){
       //扫码进入时不效验登录...跳转授权登录页
+      console.log("扫码进入时不效验登录...跳转授权登录页");
     }else{
       if (!getToken()) {
         // setTimeout(() => {
diff --git a/yanzhu-ui-app/miniprogram/app.json b/yanzhu-ui-app/miniprogram/app.json
index 6b398117..88cac693 100644
--- a/yanzhu-ui-app/miniprogram/app.json
+++ b/yanzhu-ui-app/miniprogram/app.json
@@ -16,7 +16,8 @@
         "pages/project_info/edit/index",
         "pages/project_check/list/index",
         "pages/project_check/edit/index",
-        "pages/project_check/info/index"
+        "pages/project_check/info/index",
+        "pages/project_qr/index"
     ],
     "usingComponents": {
         "van-row": "@vant/weapp/row",
diff --git a/yanzhu-ui-app/miniprogram/project.private.config.json b/yanzhu-ui-app/miniprogram/project.private.config.json
index b468c2c5..13b50da0 100644
--- a/yanzhu-ui-app/miniprogram/project.private.config.json
+++ b/yanzhu-ui-app/miniprogram/project.private.config.json
@@ -4,5 +4,18 @@
     "setting": {
         "compileHotReLoad": true,
         "urlCheck": false
+    },
+    "condition": {
+        "miniprogram": {
+            "list": [
+                {
+                    "name": "",
+                    "pathName": "pages/login/login",
+                    "query": "proId=111",
+                    "launchMode": "default",
+                    "scene": null
+                }
+            ]
+        }
     }
 }
\ No newline at end of file