wangliang 4 년 전
부모
커밋
0d36bb20d2

+ 0 - 13
distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/ServletUtil.java

@@ -159,19 +159,6 @@ public class ServletUtil {
         return object;
     }
 
-    /**
-     * 获取请求的合作方
-     *
-     * @return
-     */
-    public static Object getRequestPartner() {
-        Object object = getRequest().getAttribute(SystemConstant.PARTNER);
-        if (Objects.isNull(object)) {
-            throw ExceptionResultEnum.NOT_LOGIN.exception();
-        }
-        return object;
-    }
-
     /**
      * 获取请求的md5
      *

+ 0 - 4
distributed-print/src/main/java/com/qmth/distributed/print/api/SysController.java

@@ -145,10 +145,6 @@ public class SysController {
         tbSessionService.saveOrUpdate(tbSession);
         redisUtil.setUserSession(sessionId, tbSession, expireTime.getExpireSeconds());
 
-//        JSONObject jsonObject = new JSONObject();
-//        jsonObject.put("user", sysUserService.getUserRoles(sysUser));
-//        jsonObject.put("token", UUID.fastUUID().toString());
-
         LoginResult loginResult = new LoginResult(sysUser, sessionId, test, roleType);
         loginResult.setSchoolInfo(Objects.nonNull(authBean.getSchool()) ? loginResult.new SchoolNativeBean(authBean.getSchool()) : null);
         loginResult.setOrgInfo(Objects.nonNull(authBean.getOrg()) ? loginResult.new OrgNativeBean(authBean.getOrg()) : null);

+ 6 - 2
distributed-print/src/main/java/com/qmth/distributed/print/auth/DistributedPrintSession.java

@@ -1,8 +1,10 @@
 package com.qmth.distributed.print.auth;
 
 import com.qmth.boot.core.security.model.AccessEntity;
-import com.qmth.boot.tools.signature.SignatureEntity;
 import com.qmth.boot.tools.signature.SignatureType;
+import com.qmth.distributed.print.business.entity.TBSession;
+import com.qmth.distributed.print.business.util.RedisUtil;
+import com.qmth.distributed.print.common.contant.SpringContextHolder;
 
 import java.util.Collection;
 
@@ -28,7 +30,9 @@ public class DistributedPrintSession implements AccessEntity {
 
     @Override
     public String getSecret() {
-        return signatureType.getName();
+        RedisUtil redisUtil = SpringContextHolder.getBean(RedisUtil.class);
+        TBSession tbSession = (TBSession) redisUtil.getUserSession(identity);
+        return tbSession.getAccessToken();
     }
 
     @Override