1
0
Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/release_1.3.5'

luoshi 3 gadi atpakaļ
vecāks
revīzija
981dc11805

+ 1 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/ExamInfoController.java

@@ -47,7 +47,7 @@ public class ExamInfoController extends BaseApiController {
         return "ft";
     }
 
-    @RoleRequire({ Role.SCHOOL_ADMIN, Role.SCANNER })
+    @RoleRequire({ Role.SCHOOL_ADMIN, Role.SCANNER, Role.SCHOOL_DEV })
     @RequestMapping("/exams")
     @ResponseBody
     public JSONArray getExamInfos(HttpServletRequest request, ExamSearchQuery query) {

+ 2 - 2
stmms-web/src/main/java/cn/com/qmth/stmms/common/authorization/AuthorizationService.java

@@ -16,9 +16,9 @@ public class AuthorizationService {
 
     private static final String HEADER_AUTHINFO_KEY = "auth-info";
 
-    private static final long TIME_AHEAD_SECOND = 5;
+    private static final long TIME_AHEAD_SECOND = 5 * 60;
 
-    private static final long TIME_EXPIRE_SECOND = 15;
+    private static final long TIME_EXPIRE_SECOND = 15 * 60;
 
     public SignatureInfo buildSignature(long timestamp, String authorization, String method, String uri) {
         if (!expired(timestamp)) {

+ 2 - 2
stmms-web/src/main/webapp/WEB-INF/views/modules/sys/login.jsp

@@ -33,7 +33,7 @@
             <div class="logo"><img
                     src="${ctxStatic}/images/<c:if test="${indexLogo ==null||indexLogo =='' }">logo@2x.png</c:if><c:if test="${indexLogo !=null }">${indexLogo }</c:if>"/>
             </div>
-            <a href="http://www.qmth.com.cn" target="_blank"><p>Copyright &#169 2021 启明泰和 v1.3.4</p></a>
+            <a href="http://www.qmth.com.cn" target="_blank"><p>Copyright &#169 2021 启明泰和 v1.3.5</p></a>
         </div>
         <div class="right">
             <div class="title">
@@ -73,4 +73,4 @@
     </div>
 </div>
 </body>
-</html>
+</html>