Merge branch 'dev'

# Conflicts:
#	Jenkinsfile
#	src/main/resources/application-prod.yml

src/main/resources/application-dev.yml

@@ -2,7 +2,7 @@ spring:
     # 配置数据库
     datasource:
         driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://mysql8:3306/learning_progress_tracker?allowPublicKeyRetrieval=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
+        url: jdbc:mysql://mysql:3306/learning_progress_tracker?allowPublicKeyRetrieval=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
         username: root
         password: GUOxy5157
 server:

src/main/resources/application-local.yml

@@ -2,17 +2,18 @@ spring:
     # 配置数据库
     datasource:
         driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://localhost:3306/learning_progress_tracker?characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
+        url: jdbc:mysql://39.105.149.197:8109/learning_progress_tracker?allowPublicKeyRetrieval=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
         username: root
-        password:
+        password: GUOxy5157
 server:
     port: 5157
 
 cors:
+    allowCredentials: true
     allowed-origins:
-    - http://localhost:5158
-    - http://192.168.123.199:5158
+        - '*'
 
 sa-token:
     cookie:
-        secure: false
+        secure: false
+        sameSite: Lax

src/main/resources/mapper/StudyReportsMapper.xml

@@ -26,6 +26,8 @@
         from study_sessions ss
                  left join tasks t on ss.task_num = t.task_num and ss.session_state != 'ENDED' and ss.deleted = 0
         where t.deleted = 0
-          and t.task_num = ${task_num}
+          and t.task_num = #{task_num}
+        order by ss.last_modified_time desc, ss.created_time desc
+        limit 1
     </select>
 </mapper>