修改程序问题

exam-online-api/bin/run

@@ -1,14 +1 @@
-@echo off
+java -Dfile.encoding=utf-8 -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -jar ruoyi-admin/target/examapi.jar
-echo.
-echo [信息] 运行Web工程。
-echo.
-
-cd %~dp0
-cd ../ruoyi-admin/target
-
-set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -jar %JAVA_OPTS% ruoyi-admin.jar
-
-cd bin
-pause

exam-online-api/hig-application/src/main/java/com/hig/fms/controller/FmsPhotoController.java

@@ -125,7 +125,7 @@ public class FmsPhotoController extends BaseController
         // System.out.println("fmsPhoto:" + fmsPhoto.toString());
         try
         {
-        	count = fmsPhotoService.insertFmsPhoto(fmsPhoto);
+            return toAjax(fmsPhotoService.insertFmsPhoto(fmsPhoto));
         }
         catch(Exception e)
         {
@@ -152,7 +152,7 @@ public class FmsPhotoController extends BaseController
        
         // return AjaxResult.success(sysSwipper);
 
-        return toAjax(fmsPhotoService.insertFmsPhoto(fmsPhoto));
+
     }
 
     /**

exam-online-api/hig-application/src/main/resources/mapper/exam/ExamTaskGroupMapper.xml

@@ -30,12 +30,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="examCode != null and examCode != ''">exam_code,</if>
             <if test="groupCode != null and groupCode != ''">group_code,</if>
-            order_id,
+            
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="examCode != null and examCode != ''">#{examCode},</if>
             <if test="groupCode != null and groupCode != ''">#{groupCode},</if>
-            (select ifnull(max(order_id),0) + 1 from exam_task_group where exam_code = #{examCode}),
          </trim>
     </insert>
 

exam-online-api/hig-application/src/main/resources/mapper/exam/ExamTaskManagerMapper.xml

@@ -48,10 +48,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where exam_code = #{examCode}
     </select>
         
-    <insert id="insertExamTaskManager" parameterType="ExamTaskManager" >
+    <insert id="insertExamTaskManager" parameterType="ExamTaskManager" useGeneratedKeys="true" keyProperty="examId">
         insert into exam_task_manager
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            exam_id,
             <if test="examCode != null and examCode != ''">exam_code,</if>
             <if test="examName != null and examName != ''">exam_name,</if>
             <if test="examDescribe != null">exam_describe,</if>
@@ -69,7 +68,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             create_time,
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            (select ifnull(max(exam_id),0) + 1  from exam_task_manager),
             <if test="examCode != null and examCode != ''">#{examCode},</if>
             <if test="examName != null and examName != ''">#{examName},</if>
             <if test="examDescribe != null">#{examDescribe},</if>

exam-online-api/hig-application/src/main/resources/mapper/exam/ExamTaskPersonMapper.xml

@@ -51,15 +51,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     
     <insert id="batchInsertPerson" parameterType="String" >
-		insert into exam_task_person (exam_code,task_code,user_code,status)
+            INSERT INTO exam_task_person (exam_code, task_code, user_code, STATUS)
-		select #{examCode} as exam_code,sys_guid() as task_code,user_code,1 as status from
+        SELECT
-		(
+            #{examCode}  AS exam_code,
-		  select distinct person_code as user_code from sys_group_person 
+            UUID()  AS task_code,
-		  where group_code in
+            user_code,
-		  (
+            1 AS STATUS
-		  select group_code from exam_task_group where exam_code = #{examCode} 
+        FROM (
-		)
+                 SELECT DISTINCT person_code AS user_code
-		)		
+                 FROM sys_group_person
+                 WHERE group_code IN (
+                     SELECT group_code
+                     FROM exam_task_group
+                     WHERE exam_code = #{examCode}
+                 )
+             ) AS subquery
+
     </insert>
 
     <select id="selectExamTaskPerson" parameterType="ExamTaskPerson" resultMap="ExamTaskPersonResult">

exam-online-api/hig-application/src/main/resources/mapper/exam/ExamTaskPictureMapper.xml

@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertExamTaskPicture" parameterType="ExamTaskPicture" >
         insert into exam_task_picture
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            photo_id,
+           
             <if test="photoPath != null and photoPath != ''">photo_path,</if>
             <if test="photoCode != null and photoCode != ''">photo_code,</if>
             <if test="photoUrl != null and photoUrl != ''">photo_url,</if>
@@ -45,7 +45,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             status,
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            (select ifnull(max(photo_id),0) + 1 from exam_task_picture),
             <if test="photoPath != null and photoPath != ''">#{photoPath},</if>
             <if test="photoCode != null and photoCode != ''">#{photoCode},</if>
             <if test="photoUrl != null and photoUrl != ''">#{photoUrl},</if>

exam-online-api/hig-application/src/main/resources/mapper/fms/FmsFilesMapper.xml

@@ -38,7 +38,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertFmsFiles" parameterType="FmsFiles" >
         insert into fms_files
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            file_id,
             <if test="fileTitle != null and fileTitle != ''">file_title,</if>
             <if test="fileDescribe != null and fileDescribe != ''">file_describe,</if>
             <if test="fileName != null and fileName != ''">file_name,</if>
@@ -52,7 +51,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             status,
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            (select ifnull(max(file_id),0) + 1 from fms_files),
             <if test="fileTitle != null and fileTitle != ''">#{fileTitle},</if>
             <if test="fileDescribe != null and fileDescribe != ''">#{fileDescribe},</if>
             <if test="fileName != null and fileName != ''">#{fileName},</if>

exam-online-api/hig-application/src/main/resources/mapper/fms/FmsPhotoMapper.xml

@@ -36,7 +36,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertFmsPhoto" parameterType="FmsPhoto" useGeneratedKeys="true" keyProperty="photoId">
         insert into fms_photo
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            photo_id，
             <if test="fileName != null and fileName != ''">file_name,</if>
             <if test="photoPath != null and photoPath != ''">photo_path,</if>
             <if test="photoUrl != null and photoUrl != ''">photo_url,</if>
@@ -47,7 +46,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             status,
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            (select ifnull(max(photo_id),0) + 1 from fms_photo),
             <if test="fileName != null and fileName != ''">#{fileName},</if>
             <if test="photoPath != null and photoPath != ''">#{photoPath},</if>
             <if test="photoUrl != null and photoUrl != ''">#{photoUrl},</if>

exam-online-api/hig-application/src/main/resources/mapper/onlineexam/ExamQuestionsListDataMapper.xml

@@ -17,11 +17,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
      </resultMap>
 
     <select id="selectQuestionsList" parameterType="ExamQuestionsListData" resultMap="ExamQuestionsListDataResult">
-		select a.exam_code, a.questions_code, a.questions_number,b.questions_type,b.questions_score,c.questions_answer,ifnull(c.is_mark,1） as is_mark,ifnull(c.is_current,1) as is_current from exam_task_questions a 
+SELECT
-		left join exam_questions_property b on b.questions_code = a.questions_code
+                    a.exam_code,
-		left join exam_task_answer c on c.exam_code = a.exam_code and c.questions_code = a.questions_code  and c.user_code = #{userCode}
+                    a.questions_code,
-		where a.exam_code = #{examCode}
+                    a.questions_number,
-		order by questions_number
+                    b.questions_type,
+                    b.questions_score,
+                    c.questions_answer,
+                    IFNULL(c.is_mark, 1) AS is_mark,
+                    IFNULL(c.is_current, 1) AS is_current
+FROM
+    exam_task_questions a
+LEFT JOIN
+    exam_questions_property b ON b.questions_code = a.questions_code
+LEFT JOIN
+    exam_task_answer c ON c.exam_code = a.exam_code
+    AND c.questions_code = a.questions_code
+    AND c.user_code = #{examCode}
+WHERE
+    a.exam_code =  #{examCode}
+ORDER BY
+    questions_number
+
     </select>
 
 </mapper>

exam-online-api/hig-application/src/main/resources/mapper/onlineexam/ExamTitleDataMapper.xml

@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="selectCurrentExam" parameterType="String" resultMap="ExamTitleDataResult">
-	    select a.exam_id, a.exam_code, a.exam_name, a.exam_describe, a.build_type, a.force_done, a.exam_bank, a.exam_bank_text, a.picture_url, a.start_time, a.end_time,now() as current_date, a.exam_duration, b.judge_number,c.radio_number, d.choice_number, e.questions_score, a.status, a.create_by, a.create_dept, a.create_time
+	    select a.exam_id, a.exam_code, a.exam_name, a.exam_describe, a.build_type, a.force_done, a.exam_bank, a.exam_bank_text, a.picture_url, a.start_time, a.end_time,now() as `current_date`, a.exam_duration, b.judge_number,c.radio_number, d.choice_number, e.questions_score, a.status, a.create_by, a.create_dept, a.create_time
 		from exam_task_manager a 
 		left join
 		(

exam-online-api/hig-application/src/main/resources/mapper/questions/ExamBankPictureMapper.xml

@@ -35,7 +35,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertExamBankPicture" parameterType="ExamBankPicture" >
         insert into exam_bank_picture
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            photo_id,
             <if test="photoCode != null">photo_code,</if>
             <if test="photoPath != null">photo_path,</if>
             <if test="photoUrl != null">photo_url,</if>
@@ -46,7 +45,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             status,
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            (select ifnull(max(photo_id),0) + 1  from exam_bank_picture),
             <if test="photoCode != null">#{photoCode},</if>
             <if test="photoPath != null">#{photoPath},</if>
             <if test="photoUrl != null">#{photoUrl},</if>

exam-online-api/hig-application/src/main/resources/mapper/questions/ExamQuestionsAnswerMapper.xml

@@ -43,7 +43,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="optionDescribe != null and optionDescribe != ''">option_describe,</if>
             <if test="isRight != null">is_right,</if>
             <if test="orderId != null">order_id,</if>
-            <if test="orderId == null or orderId == ''">order_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="questionsCode != null and questionsCode != ''">#{questionsCode},</if>
@@ -51,9 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="optionDescribe != null and optionDescribe != ''">#{optionDescribe},</if>
             <if test="isRight != null">#{isRight},</if>
             <if test="orderId != null">#{orderId},</if>
-            <if test="orderId == null or orderId == ''">
+           
-                (select ifnull(max(order_id),0) + 1  from exam_questions_answer where questions_code = #{questionsCode}),              
-            </if>
             
          </trim>
     </insert>

exam-online-api/hig-application/src/main/resources/mapper/questions/ExamQuestionsBankMapper.xml

@@ -68,7 +68,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertExamQuestionsBank" parameterType="ExamQuestionsBank" >
         insert into exam_questions_bank
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            bank_id,
             <if test="bankCode != null">bank_code,</if>
             <if test="bankName != null and bankName != ''">bank_name,</if>
             <if test="bankDescribe != null">bank_describe,</if>
@@ -85,7 +84,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             create_time,
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            (select ifnull(max(bank_id),0) + 1  from exam_questions_bank),
             <if test="bankCode != null">#{bankCode},</if>
             <if test="bankName != null and bankName != ''">#{bankName},</if>
             <if test="bankDescribe != null">#{bankDescribe},</if>

exam-online-api/hig-application/src/main/resources/mapper/questions/ExamQuestionsMapper.xml

@@ -38,11 +38,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where questions_code = #{questionsCode}
     </select>
         
-    <insert id="insertExamQuestions" parameterType="ExamQuestions" >
+    <insert id="insertExamQuestions" parameterType="ExamQuestions" useGeneratedKeys="true" keyProperty="questionsId">
         insert into exam_questions
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="bankCode != null">bank_code,</if>
-            questions_id,
             <if test="questionsCode != null">questions_code,</if>
             <if test="questionsTitle != null">questions_title,</if>
             <if test="questionsContent != null">questions_content,</if>
@@ -58,7 +57,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="bankCode != null">#{bankCode},</if>
-            (select ifnull(max(questions_id),0) + 1 from exam_questions),
             <if test="questionsCode != null">#{questionsCode},</if>            
             <if test="questionsTitle != null">#{questionsTitle},</if>
             <if test="questionsContent != null">#{questionsContent},</if>

exam-online-api/hig-application/src/main/resources/mapper/questions/ExamQuestionsPropertyMapper.xml

@@ -45,7 +45,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into exam_questions_property
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="bankCode != null">bank_code,</if>
-            questions_id,
             <if test="questionsCode != null">questions_code,</if>
             <if test="questionsTitle != null">questions_title,</if>
             <if test="questionsType != null">questions_type,</if>
@@ -60,7 +59,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="bankCode != null">#{bankCode},</if>
-            (select ifnull(max(questions_id),0) + 1  from exam_questions_property),
             <if test="questionsCode != null">#{questionsCode},</if>
             <if test="questionsTitle != null">#{questionsTitle},</if>
             <if test="questionsType != null">#{questionsType},</if>

exam-online-api/hig-application/src/main/resources/mapper/questions/ExamTypeMapper.xml

@@ -34,7 +34,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertExamType" parameterType="ExamType" >
         insert into exam_type
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            type_id,
             <if test="parentId != null">parent_id,</if>
             <if test="typeCode != null">type_code,</if>
             <if test="typeName != null and typeName != ''">type_name,</if>
@@ -44,7 +43,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             create_time,
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            (select ifnull(max(type_id),0) + 1 from exam_type),
             <if test="parentId != null">#{parentId},</if>
             <if test="typeCode != null">#{typeCode},</if>
             <if test="typeName != null and typeName != ''">#{typeName},</if>

exam-online-api/hig-application/src/main/resources/mapper/system/SysGroupMapper.xml

@@ -50,7 +50,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertSysGroup" parameterType="SysGroup" >
         insert into sys_group
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            group_id,
             <if test="groupCode != null and groupCode != ''">group_code,</if>
             <if test="groupName != null and groupName != ''">group_name,</if>
             <if test="groupDescribe != null">group_describe,</if>
@@ -59,7 +58,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             create_time,
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            (select ifnull(max(group_id),0) + 1  from sys_group),
             <if test="groupCode != null and groupCode != ''">#{groupCode},</if>
             <if test="groupName != null and groupName != ''">#{groupName},</if>
             <if test="groupDescribe != null">#{groupDescribe},</if>

exam-online-api/hig-application/src/main/resources/mapper/system/SysGroupPersonMapper.xml

@@ -30,12 +30,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="groupCode != null and groupCode != ''">group_code,</if>
             <if test="personCode != null and personCode != ''">person_code,</if>
-            order_id,
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="groupCode != null and groupCode != ''">#{groupCode},</if>
             <if test="personCode != null and personCode != ''">#{personCode},</if>
-            (select ifnull(max(order_id),0) + 1 from sys_group_person where group_code = #{groupCode}),
          </trim>
     </insert>
 

exam-online-api/hig-application/src/main/resources/mapper/system/TempUserChoiceMapper.xml

@@ -32,12 +32,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="choiceCode != null and choiceCode != ''">choice_code,</if>
             <if test="userCode != null and userCode != ''">user_code,</if>
-            order_id,
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="choiceCode != null and choiceCode != ''">#{choiceCode},</if>
             <if test="userCode != null and userCode != ''">#{userCode},</if>
-            (select ifnull(max(order_id),0) + 1 from temp_user_choice where choice_code = #{choiceCode}),
          </trim>
     </insert>
 

exam-online-api/ruoyi-admin/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: false
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: /data/uploadPath/exam
+  profile: /Users/mac/data/uploadPath/exam
   # profile: D:/image/upload
   # 获取ip地址开关
   addressEnabled: false
@@ -57,7 +57,7 @@ spring:
      # host: localhost # Redis服务器地址
      host: 127.0.0.1
      port: 6379 # Redis服务器连接端口
-     password: 123456 # Redis服务器连接密码（默认为空）
+     password:  # Redis服务器连接密码（默认为空）
      timeout: 20000 # 连接超时时间（毫秒）
      jedis:
         pool:
@@ -99,8 +99,9 @@ http:
 # 日志配置
 logging:
   level:
-    com.ruoyi: info
+    root: info
-    com.hig: info
+    com.ruoyi: debug
+    com.hig: debug
     org.springframework: warn
 
 

exam-online-api/ruoyi-admin/src/main/resources/logback.xml

@@ -72,7 +72,8 @@
     </appender>
 	
 	<!-- 系统模块日志级别控制  -->
-	<logger name="com.ruoyi" level="info" />
+	<logger name="com.ruoyi" level="debug" />
+    <logger name="com.hig" level="debug" />
 	<!-- Spring日志级别控制  -->
 	<logger name="org.springframework" level="warn" />
 

exam-online-api/ruoyi-common/pom.xml

@@ -120,6 +120,13 @@
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
+        <!-- JAXB API for DatatypeConverter used by jjwt -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+
     </dependencies>
 
 </project>

exam-online-api/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -65,7 +65,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             select ifnull(max(column_id),0) + 1 from gen_table_column
         </selectKey>
         insert into gen_table_column (
-			column_id,
 			<if test="tableId != null and tableId != ''">table_id,</if>
 			<if test="columnName != null and columnName != ''">column_name,</if>
 			<if test="columnComment != null and columnComment != ''">column_comment,</if>
@@ -86,7 +85,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="createBy != null and createBy != ''">create_by,</if>
 			create_time
          )values(
-			(select ifnull(max(column_id),0) + 1 from gen_table_column),
 			<if test="tableId != null and tableId != ''">#{tableId},</if>
 			<if test="columnName != null and columnName != ''">#{columnName},</if>
 			<if test="columnComment != null and columnComment != ''">#{columnComment},</if>

exam-online-api/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -144,7 +144,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			select ifnull(max(table_id),0) + 1 from gen_table
 		</selectKey>	
         insert into gen_table (
-			table_id,
 			<if test="tableName != null">table_name,</if>
 			<if test="tableComment != null and tableComment != ''">table_comment,</if>
 			<if test="className != null and className != ''">class_name,</if>
@@ -160,7 +159,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="createBy != null and createBy != ''">create_by,</if>
 			create_time
          )values(
-			(select ifnull(max(table_id),0) + 1 from gen_table),
 			<if test="tableName != null">#{tableName},</if>
 			<if test="tableComment != null and tableComment != ''">#{tableComment},</if>
 			<if test="className != null and className != ''">#{className},</if>

exam-online-api/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml

@@ -66,7 +66,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <insert id="insertConfig" parameterType="SysConfig">
         insert into sys_config (
-            config_id,
 			<if test="configName != null and configName != '' ">config_name,</if>
 			<if test="configKey != null and configKey != '' ">config_key,</if>
 			<if test="configValue != null and configValue != '' ">config_value,</if>
@@ -75,7 +74,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="remark != null and remark != ''">remark,</if>
  			create_time
         )values(
-            (select ifnull(max(config_id),0) + 1 from sys_config),
 			<if test="configName != null and configName != ''">#{configName},</if>
 			<if test="configKey != null and configKey != ''">#{configKey},</if>
 			<if test="configValue != null and configValue != ''">#{configValue},</if>

exam-online-api/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -83,9 +83,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where dept_name=#{deptName} and parent_id = #{parentId} 
 	</select>
     
-    <insert id="insertDept" parameterType="SysDept">
+    <insert id="insertDept" parameterType="SysDept" useGeneratedKeys="true" keyProperty="deptId">
  		insert into sys_dept(
- 			dept_id,
  			<if test="parentId != null and parentId != 0">parent_id,</if>
  			<if test="deptCode != null and deptCode != ''">dept_code,</if>
  			<if test="deptName != null and deptName != ''">dept_name,</if>
@@ -99,7 +98,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			create_time
  		)values(
- 			(select ifnull(max(dept_id),0) + 1 from sys_dept),
  			<if test="parentId != null and parentId != 0">#{parentId},</if>
  			<if test="deptCode != null and deptCode != ''">#{deptCode},</if>
  			<if test="deptName != null and deptName != ''">#{deptName},</if>

exam-online-api/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml

@@ -94,8 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</update>
  	
  	<insert id="insertDictData" parameterType="SysDictData">
- 		insert into sys_dict_data(
+ 		insert into sys_dict_data(、
- 		    config_id,
  			<if test="dictSort != null">dict_sort,</if>
  			<if test="dictLabel != null and dictLabel != ''">dict_label,</if>
  			<if test="dictValue != null and dictValue != ''">dict_value,</if>
@@ -108,7 +107,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			create_time
  		)values(
- 		    (select ifnull(max(config_id),0) + 1 from sys_config),
  		    <if test="dictSort != null">#{dictSort},</if>
  		    <if test="dictLabel != null and dictLabel != ''">#{dictLabel},</if>
  			<if test="dictValue != null and dictValue != ''">#{dictValue},</if>

exam-online-api/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -86,7 +86,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  	
  	<insert id="insertDictType" parameterType="SysDictType">
  		insert into sys_dict_type(
- 		    dict_id,
  			<if test="dictName != null and dictName != ''">dict_name,</if>
  			<if test="dictType != null and dictType != ''">dict_type,</if>
  			<if test="status != null">status,</if>
@@ -94,7 +93,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			create_time
  		)values(
- 		    (select ifnull(max(dict_id),0) + 1 from sys_dict_type),
  			<if test="dictName != null and dictName != ''">#{dictName},</if>
  			<if test="dictType != null and dictType != ''">#{dictType},</if>
  			<if test="status != null">#{status},</if>

exam-online-api/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml

@@ -17,8 +17,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 
 	<insert id="insertLogininfor" parameterType="SysLogininfor">
-		insert into sys_logininfor (info_id,user_name, status, ipaddr, login_location, browser, os, msg, login_time)
+		insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time)
-		values ((select ifnull(max(info_id),0) + 1 from sys_logininfor),#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, now())
+		values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, now())
 	</insert>
 	
 	<select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">

exam-online-api/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -146,9 +146,8 @@
 		where menu_id = #{menuId}
 	</update>
 
-	<insert id="insertMenu" parameterType="SysMenu">
+	<insert id="insertMenu" parameterType="SysMenu" useGeneratedKeys="true" keyProperty="menuId">
 		insert into sys_menu(
-		menu_id,
 		<if test="parentId != null and parentId != 0">parent_id,</if>
 		<if test="menuName != null and menuName != ''">menu_name,</if>
 		<if test="orderNum != null and orderNum != ''">order_num,</if>
@@ -165,8 +164,6 @@
 		<if test="createBy != null and createBy != ''">create_by,</if>
 		create_time
 		)values(
-		(select ifnull(max(menu_id),0) + 1 from sys_menu),
-		<if test="menuId != null and menuId != 0">#{menuId},</if>
 		<if test="parentId != null and parentId != 0">#{parentId},</if>
 		<if test="menuName != null and menuName != ''">#{menuName},</if>
 		<if test="orderNum != null and orderNum != ''">#{orderNum},</if>

exam-online-api/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -44,7 +44,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <insert id="insertNotice" parameterType="SysNotice">
         insert into sys_notice (
-            notice_id,
 			<if test="noticeTitle != null and noticeTitle != '' ">notice_title, </if>
 			<if test="noticeType != null and noticeType != '' ">notice_type, </if>
 			<if test="noticeContent != null and noticeContent != '' ">notice_content, </if>
@@ -53,7 +52,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			create_time
  		)values(
- 		    (select ifnull(max(notice_id),0) + 1 from sys_notice),
 			<if test="noticeTitle != null and noticeTitle != ''">#{noticeTitle}, </if>
 			<if test="noticeType != null and noticeType != ''">#{noticeType}, </if>
 			<if test="noticeContent != null and noticeContent != ''">#{noticeContent}, </if>

exam-online-api/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml

@@ -28,9 +28,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from sys_oper_log
     </sql>
     
-	<insert id="insertOperlog" parameterType="SysOperLog">
+	<insert id="insertOperlog" parameterType="SysOperLog" useGeneratedKeys="true" keyProperty="operId">
-		insert into sys_oper_log(oper_id,title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time)
+		insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time)
-        values ((select ifnull(max(oper_id),0) + 1 from sys_oper_log),#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, now())
+        values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, now())
 	</insert>
 	
 	<select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">

exam-online-api/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml

@@ -88,7 +88,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  	
  	<insert id="insertPost" parameterType="SysPost" >
  		insert into sys_post(
- 			post_id,
  			<if test="postCode != null and postCode != ''">post_code,</if>
  			<if test="postName != null and postName != ''">post_name,</if>
  			<if test="postSort != null and postSort != ''">post_sort,</if>
@@ -97,7 +96,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			create_time
  		)values(
- 			(select ifnull(max(post_id),0) + 1 from sys_post),
  			<if test="postCode != null and postCode != ''">#{postCode},</if>
  			<if test="postName != null and postName != ''">#{postName},</if>
  			<if test="postSort != null and postSort != ''">#{postSort},</if>

exam-online-api/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -94,9 +94,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		 where r.role_key=#{roleKey} 
 	</select>
 	
- 	<insert id="insertRole" parameterType="SysRole" >
+ 	<insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
  		insert into sys_role(
- 			role_id,
  			<if test="roleName != null and roleName != ''">role_name,</if>
  			<if test="roleKey != null and roleKey != ''">role_key,</if>
  			<if test="roleSort != null and roleSort != ''">role_sort,</if>
@@ -109,7 +108,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			create_time
  		)values(
- 			(select ifnull(max(role_id),0) + 1 from sys_role),
  			<if test="roleName != null and roleName != ''">#{roleName},</if>
  			<if test="roleKey != null and roleKey != ''">#{roleKey},</if>
  			<if test="roleSort != null and roleSort != ''">#{roleSort},</if>

exam-online-api/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -155,9 +155,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select user_id from sys_user where user_name = #{userName} 
 	</select>
 	
-	<insert id="insertUser" parameterType="SysUser" >
+	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(
- 			user_id,
  			<if test="deptId != null and deptId != 0">dept_id,</if>
  			<if test="userName != null and userName != ''">user_name,</if>
  			<if test="userCode != null and userCode != ''">user_code,</if>
@@ -173,7 +172,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="remark != null and remark != ''">remark,</if>
  			create_time
  		)values(
- 			(select ifnull(max(user_id),0) + 1 from sys_user),
  			<if test="deptId != null and deptId != ''">#{deptId},</if>
  			<if test="userName != null and userName != ''">#{userName},</if>
  			<if test="userCode != null and userCode != ''">#{userCode},</if>

exam_online_ui/package.json

@@ -75,7 +75,7 @@
     "eslint-plugin-vue": "^7.20.0",
     "lint-staged": "^10.5.4",
     "runjs": "^4.4.2",
-    "sass": "^1.90.0",
+    "sass": "1.32.0",
     "sass-loader": "^10.5.2",
     "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^5.2.1",

exam_online_ui/public/UEditor/index.html

@@ -5,7 +5,7 @@
     <title>完整demo</title>
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
     <script type="text/javascript" charset="utf-8" src="ueditor.config.js"></script>
-    <script type="text/javascript" charset="utf-8" src="ueditor.all.js"> </script>
+    <script type="text/javascript" charset="utf-8" src="ueditor.all.min.js"> </script>
     <!--建议手动加在语言，避免在ie下有时因为加载语言失败导致编辑器加载失败-->
     <!--这里加载的语言文件会覆盖你在配置项目里添加的语言类型，比如你在配置项目里配置的是英文，这里加载的中文，那最后就是中文-->
     <script type="text/javascript" charset="utf-8" src="lang/zh-cn/zh-cn.js"></script>

exam_online_ui/public/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="icon" href="<%= BASE_URL %>logo.svg?t=20250821">
     <title><%= webpackConfig.name %></title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <style>

exam_online_ui/public/logo.svg

@@ -0,0 +1 @@
+<svg class="icon" style="width: 1em;height: 1em;vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11208"><path d="M867.412907 184.888889H199.110684V41.287111C199.110684 18.574222 218.424462 0 242.033351 0h582.599111C848.241351 0 867.555129 18.574222 867.555129 41.287111V184.888889h-0.142222z" fill="#8DB0FF" p-id="11209"></path><path d="M939.17824 184.888889c23.267556 0 42.296889 18.844444 42.154667 41.756444V860.017778C852.550684 962.673778 689.06624 1024 510.975573 1024 333.894684 1024 171.007573 963.256889 42.66624 861.624889V226.787556C42.66624 203.747556 61.695573 184.888889 84.963129 184.888889z m-181.617778 221.098667c-18.730667-18.56-49.464889-18.56-68.337778 0L465.009351 628.081778l-116.337778-115.256889a54.613333 54.613333 0 0 0-74.311111-2.076445l-2.218666 2.076445a47.544889 47.544889 0 0 0 0 67.697778l120.433777 119.310222-1.464889 1.464889 72.448 71.765333 298.097778-295.324444a47.815111 47.815111 0 0 0 0-67.697778z" fill="#4F7EDC" p-id="11210"></path></svg>

exam_online_ui/src/config/sysinfo.js

@@ -1,7 +1,7 @@
 
 // 本地运行用这个
-export var baseApiUrl = 'http://localhost:8080/examapi'
+export var baseApiUrl = '/examapi'
-export var uiUrl = 'http://localhost:8081/examui'
+export var uiUrl = '/examui'
 
 // 测试环境使用内网环境
 /* export var baseApiUrl = 'http://127.0.0.1:8080/examapi'

exam_online_ui/src/layout/components/Sidebar/Logo.vue

@@ -2,11 +2,11 @@
   <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg }">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
+        <img v-if="logo" :src="'logo.svg'" class="sidebar-logo" />
         <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ title }} </h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
+        <img v-if="logo" :src="'logo.svg'" class="sidebar-logo" />
         <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ title }} </h1>
       </router-link>
     </transition>
@@ -36,7 +36,7 @@ export default {
   data() {
     return {
       title: '在线考试系统',
-      logo: logoImg
+      logo: 'logo.svg'
     }
   }
 }

exam_online_ui/src/utils/request.js

@@ -20,6 +20,10 @@ service.interceptors.request.use(config => {
   if (getToken() && !isToken) {
     config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
   }
+  // 如果是 FormData，不设置默认的 Content-Type
+  if (config.data instanceof FormData) {
+    delete config.headers['Content-Type']
+  }
   // get请求映射params参数
   if (config.method === 'get' && config.params) {
     let url = config.url + '?';

exam_online_ui/src/views/fms/files/index.vue

@@ -198,7 +198,7 @@ export default {
       // 文件上传参数
       uploader_key: new Date().getTime(),
       options: {
-        target: 'null',
+        target: null,
         testChunks: false
       },
       attrs: {

exam_online_ui/src/views/onlineexam/examstart/startAnswer.vue

@@ -32,7 +32,8 @@
               <span class = "question-number">{{ questionsContentData.questionsNumberText }}</span>
               <span class = "question-score"> ({{ questionsContentData.questionsScore }} 分)：</span>
             </div>
-            <div class = "time-area"><el-statistic
+            
+            <div class = "time-area"><el-statistic v-if="currentTime"
                   ref="statistic"
                   @finish="doEnd"
                   format="HH:mm:ss"
@@ -117,7 +118,7 @@ export default {
       questionsTitle: '',
       contentStyle: null,
       optionStyle: null,
-      PanelStyle: null,
+      PanelStyle: {},
       isRadio: true,
       checkItem: [],
       judgeQuestionsList: [],