Merge branch 'dev_v2.1.0' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev_v2.1.0

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

@@ -91,6 +91,7 @@ public class TBSession implements Serializable {
         this.accessToken = accessToken;
         this.expireTime = expireTime;
         this.lastAccessTime = System.currentTimeMillis();
+        this.lastAccessIp = address;
     }
 
     public void setLastInfo() {

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/filter/MyWebApplicationInitializer.java

@@ -35,13 +35,13 @@ public class MyWebApplicationInitializer implements ServletContextInitializer {
         FilterRegistration.Dynamic CASFilter = sc.addFilter("CASFilter", AuthenticationFilter.class);
         CASFilter.setInitParameter("casServerLoginUrl", "http://cas.whu.edu.cn/authserver/login");
         CASFilter.setInitParameter("serverName", "https://wdfx.qmth.com.cn");
-        CASFilter.addMappingForUrlPatterns(null, false, "/api/report/wuda/open/authentication/*");
+        CASFilter.addMappingForUrlPatterns(null, false, "/api/report/wuda/open/authentication/*", "/api/report/wuda/open/user/authentication/*");
 
         FilterRegistration.Dynamic CASValidationFilter = sc.addFilter("CAS Validation Filter", Cas20ProxyReceivingTicketValidationFilter.class);
         CASValidationFilter.setInitParameter("casServerUrlPrefix", "http://cas.whu.edu.cn/authserver");
         CASValidationFilter.setInitParameter("serverName", "https://wdfx.qmth.com.cn");
         CASValidationFilter.setInitParameter("encoding", "UTF-8");
-        CASValidationFilter.addMappingForUrlPatterns(null, false, "/api/report/wuda/open/authentication/*");
+        CASValidationFilter.addMappingForUrlPatterns(null, false, "/api/report/wuda/open/authentication/*", "/api/report/wuda/open/user/authentication/*");
 
         FilterRegistration.Dynamic CASHttpServletRequestWrapperFilter = sc.addFilter("CAS HttpServletRequest Wrapper Filter", HttpServletRequestWrapperFilter.class);
         CASHttpServletRequestWrapperFilter.addMappingForUrlPatterns(null, false, "/*");

teachcloud-report-business/src/main/resources/mapper/TAExamCourseMapper.xml

@@ -170,7 +170,14 @@
             </if>
         </where> ) t
         <if test="column != null and column != '' and order != null and order != ''">
-            order by t.${column} ${order}
+            <choose>
+                <when test="inspectCollegeName != null and inspectCollegeName != ''">
+                    order by t.${column} ${order},t.teacherRank ${order}
+                </when>
+                <otherwise>
+                    order by t.${column} ${order}
+                </otherwise>
+            </choose>
         </if>
     </select>
 </mapper>