Merge remote-tracking branch 'origin/master'

qmjszx-admin/src/main/resources/templates/record/add.html

@@ -73,7 +73,7 @@
                 data.rows.forEach(cardType => {
                     const option = document.createElement('option');
                     option.value = cardType.id;
-                    option.text = cardType.realName;
+                    option.text = cardType.username;
                     userSelect.appendChild(option);
                 });
             },

qmjszx-business/src/main/java/beilv/applogin/domain/vo/AppAuthLoginRespVO.java

@@ -1,5 +1,6 @@
 package beilv.applogin.domain.vo;
 
+import beilv.system.domain.SysMember;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -27,4 +28,7 @@ public class AppAuthLoginRespVO {
     private String sessionKey;
 
 
+    private SysMember sysMember;
+
+
 }

qmjszx-business/src/main/java/beilv/applogin/service/impl/AppAuthServiceImpl.java

@@ -66,6 +66,7 @@ public class AppAuthServiceImpl implements IAppAuthService {
         userInfo.setAccessToken(accessToken);
         userInfo.setOpenId(openId);
         userInfo.setSessionKey(sessionKey);
+        userInfo.setSysMember(memberUserDO);
         return userInfo;
     }
 

qmjszx-system/src/main/java/beilv/system/service/ISysMemberService.java

@@ -69,6 +69,6 @@ public interface ISysMemberService {
      * @return
      * @throws Exception
      */
-    SysMember getLoginSysMember(HttpServletRequest request) throws Exception;
+    SysMember getLoginSysMember(HttpServletRequest request);
 
 }

qmjszx-system/src/main/java/beilv/system/service/impl/SysMemberServiceImpl.java

@@ -104,9 +104,14 @@ public class SysMemberServiceImpl implements ISysMemberService {
      * @throws Exception
      */
     @Override
-    public SysMember getLoginSysMember(HttpServletRequest request) throws Exception {
+    public SysMember getLoginSysMember(HttpServletRequest request) {
         String token = request.getHeader("accessToken");
-        String str = RsaUtil.decrypt(token, privateKey);
+        String str = null;
+        try {
+            str = RsaUtil.decrypt(token, privateKey);
+        } catch (Exception e) {
+            throw new RuntimeException("获取用户信息失败");
+        }
         return sysMemberMapper.selectSysMemberById(Long.parseLong(str));
     }