Merge branch 'release_v2.1.0' into dev_v2.1.0

merge

teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/SysDomain.java

@@ -1,6 +1,7 @@
 package com.qmth.teachcloud.common.domain;
 
 import java.io.Serializable;
+import java.time.Duration;
 import java.util.List;
 
 /**
@@ -42,6 +43,16 @@ public class SysDomain implements Serializable {
 
     String reportUrl;
 
+    Duration sessionActive;
+
+    public Duration getSessionActive() {
+        return sessionActive;
+    }
+
+    public void setSessionActive(Duration sessionActive) {
+        this.sessionActive = sessionActive;
+    }
+
     public String getReportUrl() {
         return reportUrl;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/TBSession.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.common.util.ServletUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -92,6 +93,11 @@ public class TBSession implements Serializable {
         this.lastAccessTime = System.currentTimeMillis();
     }
 
+    public void setLastInfo() {
+        this.lastAccessTime = System.currentTimeMillis();
+        this.lastAccessIp = ServletUtil.getRequest().getLocalAddr();
+    }
+
     public String getId() {
         return id;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/util/RedisUtil.java

@@ -53,6 +53,16 @@ public class RedisUtil {
         redisTemplate.opsForValue().set(SystemConstant.SESSION + sessionId, o, time, TimeUnit.SECONDS);
     }
 
+    /**
+     * 获取过期时间
+     *
+     * @param sessionId
+     * @return
+     */
+    public Long getUserSessionExpire(String sessionId) {
+        return redisTemplate.opsForValue().getOperations().getExpire(SystemConstant.SESSION + sessionId);
+    }
+
     /**
      * 批量获取key的value
      *

teachcloud-report/src/main/java/com/qmth/teachcloud/report/auth/TeachcloudReportAuthenticationService.java

@@ -5,6 +5,7 @@ import com.qmth.boot.core.security.model.AccessEntity;
 import com.qmth.boot.core.security.service.AuthorizationService;
 import com.qmth.boot.tools.signature.SignatureType;
 import com.qmth.teachcloud.common.bean.auth.AuthBean;
+import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.entity.TBSession;
@@ -35,6 +36,9 @@ public class TeachcloudReportAuthenticationService implements AuthorizationServi
     @Resource
     RedisUtil redisUtil;
 
+    @Resource
+    DictionaryConfig dictionaryConfig;
+
     @Override
     public AccessEntity findByIdentity(String identity, SignatureType signatureType, String path) {
         return new TeachcloudReportSession(identity, SignatureType.TOKEN);
@@ -62,6 +66,17 @@ public class TeachcloudReportAuthenticationService implements AuthorizationServi
                 log.warn("Authorization faile: deviceId invalid, session deviceId is " + tbSession.getDeviceId());
                 throw ExceptionResultEnum.AUTHORIZATION_ERROR.exception();
             }
+
+//            Long expireTime = redisUtil.getUserSessionExpire(accessEntity.getIdentity());
+//            if (Objects.nonNull(expireTime) && expireTime.longValue() > -1L) {
+//                if (Objects.nonNull(tbSession.getLastAccessTime()) && (System.currentTimeMillis() - tbSession.getLastAccessTime()) / 1000 > dictionaryConfig.sysDomain().getSessionActive().getSeconds()) {
+//                    log.warn("Authorization faile: session active, session active is " + dictionaryConfig.sysDomain().getSessionActive().getSeconds());
+//                    throw ExceptionResultEnum.NOT_LOGIN.exception();
+//                }
+//                tbSession.setLastInfo();
+//                redisUtil.setUserSession(accessEntity.getIdentity(), tbSession, expireTime);
+//            }
+
             List<String> privilegeUrl = cacheService.privilegeUrlCache(PrivilegePropertyEnum.NO_AUTH);
             //无需鉴权的url
             int noAuthCount = Objects.nonNull(privilegeUrl) ? (int) privilegeUrl.stream().filter(s -> s.equalsIgnoreCase(path)).count() : 0;

teachcloud-report/src/main/resources/application-release.properties

@@ -56,6 +56,7 @@ sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/w
 #sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=false
+sys.config.sessionActive=2h
 sys.config.reportUrl=https://whu.qmth.com.cn/#/student-report/
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 

teachcloud-report/src/main/resources/application-test.properties

@@ -50,6 +50,7 @@ sys.config.serverHost=192.168.10.136:8005
 #sys.config.accessSecret=LdUwb5X4etmjW7fDn0KAdoXG0Yt7AkDu
 sys.config.accessKey=274f823e5f59410f8b3bb6edcd8e2b6e
 sys.config.accessSecret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
+sys.config.sessionActive=2h
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
 #sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 #sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf