操作日志

README.md

@@ -7,8 +7,9 @@ sexam考试
 slive直播  
 sstudy作业相  
 suser用户  
-sapi分析及其他  
-scommons公共   
+sapi分析及其他
+slog操作日志
+scommons公共
 
 资源说明   version 版本  
 subject 科目  

gateway/src/main/resources/application.properties

@@ -50,6 +50,14 @@ spring.cloud.gateway.routes[5].filters[1].name=CircuitBreaker
 spring.cloud.gateway.routes[5].filters[1].args.name=fallbackcmd
 spring.cloud.gateway.routes[5].filters[1].args.fallbackUri=forward:/fallback
 
+spring.cloud.gateway.routes[6].id=path_slog
+spring.cloud.gateway.routes[6].uri=lb://slog
+spring.cloud.gateway.routes[6].predicates[0]=Path=/slog/**
+spring.cloud.gateway.routes[6].filters[0]=RewritePath=/slog/(?<segment>.*), /$\{segment}
+spring.cloud.gateway.routes[6].filters[1].name=CircuitBreaker
+spring.cloud.gateway.routes[6].filters[1].args.name=fallbackcmd
+spring.cloud.gateway.routes[6].filters[1].args.fallbackUri=forward:/fallback
+
 eureka.client.service-url.defaultZone=http://xhschool:Xhkjedud07@localhost:8081/eureka/
 eureka.client.register-with-eureka=true
 eureka.client.fetch-registry=true

gateway/src/test/java/com/xhkjedu/gateway/GatewayApplicationTests.java

@@ -8,6 +8,7 @@ class GatewayApplicationTests {
 
     @Test
     void contextLoads() {
+        System.out.println("网关打印");
     }
 
 }

pom.xml

@@ -21,6 +21,7 @@
         <module>sapi</module>
         <module>scommons</module>
         <module>sexam</module>
+        <module>slog</module>
     </modules>
 
     <parent>
@@ -87,6 +88,11 @@
                 <artifactId>sexam</artifactId>
                 <version>0.0.1-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>com.xhkjedu</groupId>
+                <artifactId>slog</artifactId>
+                <version>0.0.1-SNAPSHOT</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

sapi/pom.xml

@@ -32,12 +32,6 @@
             <version>3.17</version>
         </dependency>
 
-        <!--amqp的起步依赖-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-amqp</artifactId>
-        </dependency>
-
     </dependencies>
     <dependencyManagement>
         <dependencies>

sapi/src/main/java/com/xhkjedu/sapi/mapper/system/UserMapper.java

@@ -1,7 +1,6 @@
 package com.xhkjedu.sapi.mapper.system;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.sapi.model.gradeclass.TClassStudent;
 import com.xhkjedu.sapi.model.system.TUser;
 import com.xhkjedu.sapi.vo.system.UserVo;
 import org.apache.ibatis.annotations.Param;
@@ -40,4 +39,7 @@ public interface UserMapper extends TkMapper<TUser> {
 
     //删除学生绑定信息
     void delBindmac(@Param("schoolid") Integer schoolid);
+
+    //获取用户信息
+    TUser getUserTypeAndSchool(@Param("userid") Integer userid);
 }

sapi/src/main/resources/application.properties

@@ -46,8 +46,8 @@ spring.redis.jedis.pool.max-idle=300
 #最大等待时间：单位ms //高版本改为maxWaitMillis
 spring.redis.jedis.pool.max-wait=1000000
 spring.redis.jedis.pool.max-active=60000
-#缓存访问数据有效时长60*60*24*7
-redisdatatime=604800
+#缓存访问数据有效时长60*60*5
+redisdatatime=18000
 #secretKey必须为24位
 secretKey=nanhuakaizhangjianwangni
 #消费者mq

sapi/src/main/resources/mapper/system/UserMapper.xml

@@ -43,4 +43,9 @@
     <update id="delBindmac">
         update t_user set bindmac=0,mac=null where schoolid=#{schoolid}
     </update>
+
+    <!--获取用户信息-->
+    <select id="getUserTypeAndSchool" resultType="com.xhkjedu.sapi.model.system.TUser">
+        select usertype,schoolid from t_user where userid=#{userid}
+    </select>
 </mapper>

sclass/src/main/java/com/xhkjedu/slog/SclassApplication.java

@@ -1,6 +1,6 @@
-package com.xhkjedu.sclass;
+package com.xhkjedu.slog;
 
-import com.xhkjedu.sclass.config.ConfigKey;
+import com.xhkjedu.slog.config.ConfigKey;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import tk.mybatis.spring.annotation.MapperScan;

sclass/src/main/java/com/xhkjedu/slog/config/ConfigKey.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.config;
+package com.xhkjedu.slog.config;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

sclass/src/main/java/com/xhkjedu/slog/config/ScheduledConfig.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.config;
+package com.xhkjedu.slog.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Condition;

sclass/src/main/java/com/xhkjedu/slog/controller/classroom/ClassroomController.java

@@ -1,18 +1,18 @@
-package com.xhkjedu.sclass.controller.classroom;
+package com.xhkjedu.slog.controller.classroom;
 
 import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.xhkjedu.sclass.model.classroom.*;
-import com.xhkjedu.sclass.model.paperstudent.TPaperStudent;
-import com.xhkjedu.sclass.model.paperstudent.TPaperStudentScantron;
-import com.xhkjedu.sclass.service.classroom.ClassroomPaperService;
-import com.xhkjedu.sclass.service.classroom.ClassroomService;
-import com.xhkjedu.sclass.vo.classroom.*;
-import com.xhkjedu.sclass.vo.paper.CheckClassVo;
-import com.xhkjedu.sclass.vo.paperstudent.StudentVo;
-import com.xhkjedu.sclass.vo.room.RoomPVo;
-import com.xhkjedu.sclass.vo.room.RoomParamVo;
+import com.xhkjedu.slog.model.classroom.*;
+import com.xhkjedu.slog.model.paperstudent.TPaperStudent;
+import com.xhkjedu.slog.model.paperstudent.TPaperStudentScantron;
+import com.xhkjedu.slog.service.classroom.ClassroomPaperService;
+import com.xhkjedu.slog.service.classroom.ClassroomService;
+import com.xhkjedu.slog.vo.classroom.*;
+import com.xhkjedu.slog.vo.paper.CheckClassVo;
+import com.xhkjedu.slog.vo.paperstudent.StudentVo;
+import com.xhkjedu.slog.vo.room.RoomPVo;
+import com.xhkjedu.slog.vo.room.RoomParamVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;

sclass/src/main/java/com/xhkjedu/slog/controller/classroom/ClassroomVideoController.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.sclass.controller.classroom;
+package com.xhkjedu.slog.controller.classroom;
 
-import com.xhkjedu.sclass.model.classroom.TClassroomVideo;
-import com.xhkjedu.sclass.service.classroom.ClassroomVideoService;
+import com.xhkjedu.slog.model.classroom.TClassroomVideo;
+import com.xhkjedu.slog.service.classroom.ClassroomVideoService;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import org.springframework.web.bind.annotation.PostMapping;

sclass/src/main/java/com/xhkjedu/slog/controller/status/StatusController.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.controller.status;
+package com.xhkjedu.slog.controller.status;
 
 import com.xhkjedu.vo.ResultVo;
 import org.springframework.web.bind.annotation.GetMapping;

sclass/src/main/java/com/xhkjedu/slog/interceptors/HttpServletFilter.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.interceptors;
+package com.xhkjedu.slog.interceptors;
 
 import org.springframework.stereotype.Component;
 

sclass/src/main/java/com/xhkjedu/slog/interceptors/RequestInterceptor.java

@@ -1,8 +1,8 @@
-package com.xhkjedu.sclass.interceptors;
+package com.xhkjedu.slog.interceptors;
 
 import com.alibaba.fastjson.JSON;
 import com.xhkjedu.exception.MissingParametersException;
-import com.xhkjedu.sclass.utils.ClassUtil;
+import com.xhkjedu.slog.utils.ClassUtil;
 import com.xhkjedu.utils.JedisUtil;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;

sclass/src/main/java/com/xhkjedu/slog/interceptors/RequestWrapper.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.interceptors;
+package com.xhkjedu.slog.interceptors;
 
 import lombok.extern.slf4j.Slf4j;
 

sclass/src/main/java/com/xhkjedu/slog/interceptors/WebMvcConfg.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.interceptors;
+package com.xhkjedu.slog.interceptors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;

sclass/src/main/java/com/xhkjedu/slog/mapper/classroom/ClassroomActivestudentMapper.java

@@ -1,8 +1,8 @@
-package com.xhkjedu.sclass.mapper.classroom;
+package com.xhkjedu.slog.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.sclass.model.classroom.TClassroom;
-import com.xhkjedu.sclass.model.classroom.TClassroomActivestudent;
+import com.xhkjedu.slog.model.classroom.TClassroom;
+import com.xhkjedu.slog.model.classroom.TClassroomActivestudent;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/slog/mapper/classroom/ClassroomAskstudentMapper.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.sclass.mapper.classroom;
+package com.xhkjedu.slog.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.sclass.model.classroom.TClassroomAskstudent;
+import com.xhkjedu.slog.model.classroom.TClassroomAskstudent;
 import org.apache.ibatis.annotations.Param;
 
 public interface ClassroomAskstudentMapper extends TkMapper<TClassroomAskstudent> {

sclass/src/main/java/com/xhkjedu/slog/mapper/classroom/ClassroomAskteacherMapper.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.sclass.mapper.classroom;
+package com.xhkjedu.slog.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.sclass.model.classroom.TClassroomAskteacher;
+import com.xhkjedu.slog.model.classroom.TClassroomAskteacher;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/slog/mapper/classroom/ClassroomFileMapper.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.sclass.mapper.classroom;
+package com.xhkjedu.slog.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.sclass.model.classroom.TClassroomFile;
+import com.xhkjedu.slog.model.classroom.TClassroomFile;
 import org.apache.ibatis.annotations.Param;
 
 public interface ClassroomFileMapper extends TkMapper<TClassroomFile> {

sclass/src/main/java/com/xhkjedu/slog/mapper/classroom/ClassroomMapper.java

@@ -1,15 +1,15 @@
-package com.xhkjedu.sclass.mapper.classroom;
+package com.xhkjedu.slog.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.sclass.model.classroom.TClassroom;
-import com.xhkjedu.sclass.model.classroom.TClassroomFile;
-import com.xhkjedu.sclass.vo.classroom.ObjectiveVo;
-import com.xhkjedu.sclass.vo.classroom.ReportEQuestionVo;
-import com.xhkjedu.sclass.vo.classroom.ReportExamVo;
-import com.xhkjedu.sclass.vo.classroom.ReportRoomVo;
-import com.xhkjedu.sclass.vo.classroom.RoomCorrectVo;
-import com.xhkjedu.sclass.vo.classroom.SubjectiveVo;
-import com.xhkjedu.sclass.vo.paper.CheckClassVo;
+import com.xhkjedu.slog.model.classroom.TClassroom;
+import com.xhkjedu.slog.model.classroom.TClassroomFile;
+import com.xhkjedu.slog.vo.classroom.ObjectiveVo;
+import com.xhkjedu.slog.vo.classroom.ReportEQuestionVo;
+import com.xhkjedu.slog.vo.classroom.ReportExamVo;
+import com.xhkjedu.slog.vo.classroom.ReportRoomVo;
+import com.xhkjedu.slog.vo.classroom.RoomCorrectVo;
+import com.xhkjedu.slog.vo.classroom.SubjectiveVo;
+import com.xhkjedu.slog.vo.paper.CheckClassVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/slog/mapper/classroom/ClassroomPaperFileMapper.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.sclass.mapper.classroom;
+package com.xhkjedu.slog.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaperFile;
+import com.xhkjedu.slog.model.classroom.TClassroomPaperFile;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/slog/mapper/classroom/ClassroomPaperMapper.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.sclass.mapper.classroom;
+package com.xhkjedu.slog.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaper;
+import com.xhkjedu.slog.model.classroom.TClassroomPaper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/slog/mapper/classroom/ClassroomPaperQtypeMapper.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.sclass.mapper.classroom;
+package com.xhkjedu.slog.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaperQtype;
+import com.xhkjedu.slog.model.classroom.TClassroomPaperQtype;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/slog/mapper/classroom/ClassroomPaperScantronMapper.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.sclass.mapper.classroom;
+package com.xhkjedu.slog.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaperScantron;
+import com.xhkjedu.slog.model.classroom.TClassroomPaperScantron;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/slog/mapper/classroom/ClassroomPaperStudentMapper.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.sclass.mapper.classroom;
+package com.xhkjedu.slog.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaperStudent;
+import com.xhkjedu.slog.model.classroom.TClassroomPaperStudent;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/slog/mapper/classroom/ClassroomPaperStudentScantronMapper.java

@@ -1,8 +1,8 @@
-package com.xhkjedu.sclass.mapper.classroom;
+package com.xhkjedu.slog.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaperStudentScantron;
-import com.xhkjedu.sclass.model.paperstudent.TPaperStudentScantron;
+import com.xhkjedu.slog.model.classroom.TClassroomPaperStudentScantron;
+import com.xhkjedu.slog.model.paperstudent.TPaperStudentScantron;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/slog/mapper/classroom/ClassroomSignMapper.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.sclass.mapper.classroom;
+package com.xhkjedu.slog.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.sclass.model.classroom.TClassroomSign;
+import com.xhkjedu.slog.model.classroom.TClassroomSign;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/slog/mapper/classroom/ClassroomVideoMapper.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.sclass.mapper.classroom;
+package com.xhkjedu.slog.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.sclass.model.classroom.TClassroomVideo;
+import com.xhkjedu.slog.model.classroom.TClassroomVideo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/slog/model/classroom/TClassroom.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.model.classroom;
+package com.xhkjedu.slog.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/slog/model/classroom/TClassroomActivestudent.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.model.classroom;
+package com.xhkjedu.slog.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/slog/model/classroom/TClassroomAskstudent.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.model.classroom;
+package com.xhkjedu.slog.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/slog/model/classroom/TClassroomAskteacher.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.model.classroom;
+package com.xhkjedu.slog.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/slog/model/classroom/TClassroomFile.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.model.classroom;
+package com.xhkjedu.slog.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/slog/model/classroom/TClassroomPaper.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.model.classroom;
+package com.xhkjedu.slog.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/slog/model/classroom/TClassroomPaperFile.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.model.classroom;
+package com.xhkjedu.slog.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/slog/model/classroom/TClassroomPaperQtype.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.model.classroom;
+package com.xhkjedu.slog.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/slog/model/classroom/TClassroomPaperScantron.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.model.classroom;
+package com.xhkjedu.slog.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/slog/model/classroom/TClassroomPaperStudent.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.model.classroom;
+package com.xhkjedu.slog.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/slog/model/classroom/TClassroomPaperStudentScantron.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.model.classroom;
+package com.xhkjedu.slog.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/slog/model/classroom/TClassroomSign.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.model.classroom;
+package com.xhkjedu.slog.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/slog/model/classroom/TClassroomVideo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.model.classroom;
+package com.xhkjedu.slog.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/slog/model/paperstudent/TPaperStudent.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.model.paperstudent;
+package com.xhkjedu.slog.model.paperstudent;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/slog/model/paperstudent/TPaperStudentScantron.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.model.paperstudent;
+package com.xhkjedu.slog.model.paperstudent;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/slog/service/classroom/ClassroomPaperService.java

@@ -1,20 +1,20 @@
-package com.xhkjedu.sclass.service.classroom;
+package com.xhkjedu.slog.service.classroom;
 
 import com.alibaba.fastjson.JSON;
-import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperFileMapper;
-import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperMapper;
-import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperQtypeMapper;
-import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperScantronMapper;
-import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperStudentMapper;
-import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperStudentScantronMapper;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaper;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaperFile;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaperQtype;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaperScantron;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaperStudent;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaperStudentScantron;
-import com.xhkjedu.sclass.model.paperstudent.TPaperStudentScantron;
-import com.xhkjedu.sclass.utils.ArithUtil;
+import com.xhkjedu.slog.mapper.classroom.ClassroomPaperFileMapper;
+import com.xhkjedu.slog.mapper.classroom.ClassroomPaperMapper;
+import com.xhkjedu.slog.mapper.classroom.ClassroomPaperQtypeMapper;
+import com.xhkjedu.slog.mapper.classroom.ClassroomPaperScantronMapper;
+import com.xhkjedu.slog.mapper.classroom.ClassroomPaperStudentMapper;
+import com.xhkjedu.slog.mapper.classroom.ClassroomPaperStudentScantronMapper;
+import com.xhkjedu.slog.model.classroom.TClassroomPaper;
+import com.xhkjedu.slog.model.classroom.TClassroomPaperFile;
+import com.xhkjedu.slog.model.classroom.TClassroomPaperQtype;
+import com.xhkjedu.slog.model.classroom.TClassroomPaperScantron;
+import com.xhkjedu.slog.model.classroom.TClassroomPaperStudent;
+import com.xhkjedu.slog.model.classroom.TClassroomPaperStudentScantron;
+import com.xhkjedu.slog.model.paperstudent.TPaperStudentScantron;
+import com.xhkjedu.slog.utils.ArithUtil;
 import com.xhkjedu.utils.N_Utils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

sclass/src/main/java/com/xhkjedu/slog/service/classroom/ClassroomService.java

@@ -1,12 +1,12 @@
-package com.xhkjedu.sclass.service.classroom;
+package com.xhkjedu.slog.service.classroom;
 
 import com.alibaba.fastjson.JSON;
-import com.xhkjedu.sclass.mapper.classroom.*;
-import com.xhkjedu.sclass.model.classroom.*;
-import com.xhkjedu.sclass.utils.ArithUtil;
-import com.xhkjedu.sclass.vo.classroom.*;
-import com.xhkjedu.sclass.vo.paper.CheckClassVo;
-import com.xhkjedu.sclass.vo.room.RoomParamVo;
+import com.xhkjedu.slog.mapper.classroom.*;
+import com.xhkjedu.slog.model.classroom.*;
+import com.xhkjedu.slog.utils.ArithUtil;
+import com.xhkjedu.slog.vo.classroom.*;
+import com.xhkjedu.slog.vo.paper.CheckClassVo;
+import com.xhkjedu.slog.vo.room.RoomParamVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import lombok.extern.slf4j.Slf4j;

sclass/src/main/java/com/xhkjedu/slog/service/classroom/ClassroomVideoService.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.sclass.service.classroom;
+package com.xhkjedu.slog.service.classroom;
 
-import com.xhkjedu.sclass.mapper.classroom.ClassroomVideoMapper;
-import com.xhkjedu.sclass.model.classroom.TClassroomVideo;
+import com.xhkjedu.slog.mapper.classroom.ClassroomVideoMapper;
+import com.xhkjedu.slog.model.classroom.TClassroomVideo;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
 

sclass/src/main/java/com/xhkjedu/slog/task/UriMapTask.java

@@ -1,6 +1,6 @@
-package com.xhkjedu.sclass.task;
+package com.xhkjedu.slog.task;
 
-import com.xhkjedu.sclass.utils.ClassUtil;
+import com.xhkjedu.slog.utils.ClassUtil;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 

sclass/src/main/java/com/xhkjedu/slog/utils/ArithUtil.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.utils;
+package com.xhkjedu.slog.utils;
 
 import java.math.BigDecimal;
 

sclass/src/main/java/com/xhkjedu/slog/utils/ClassUtil.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.utils;
+package com.xhkjedu.slog.utils;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

sclass/src/main/java/com/xhkjedu/slog/vo/classroom/ObjectiveAnswerVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.vo.classroom;
+package com.xhkjedu.slog.vo.classroom;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/slog/vo/classroom/ObjectiveVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.vo.classroom;
+package com.xhkjedu.slog.vo.classroom;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/slog/vo/classroom/ReportEQuestionVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.vo.classroom;
+package com.xhkjedu.slog.vo.classroom;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/slog/vo/classroom/ReportExamVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.vo.classroom;
+package com.xhkjedu.slog.vo.classroom;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/slog/vo/classroom/ReportRoomVo.java

@@ -1,6 +1,6 @@
-package com.xhkjedu.sclass.vo.classroom;
+package com.xhkjedu.slog.vo.classroom;
 
-import com.xhkjedu.sclass.model.classroom.TClassroomFile;
+import com.xhkjedu.slog.model.classroom.TClassroomFile;
 import lombok.Data;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/slog/vo/classroom/RoomAskTeacherVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.vo.classroom;
+package com.xhkjedu.slog.vo.classroom;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/slog/vo/classroom/RoomCorrectCallVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.vo.classroom;
+package com.xhkjedu.slog.vo.classroom;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/slog/vo/classroom/RoomCorrectExamVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.vo.classroom;
+package com.xhkjedu.slog.vo.classroom;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/slog/vo/classroom/RoomCorrectVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.vo.classroom;
+package com.xhkjedu.slog.vo.classroom;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/slog/vo/classroom/RoomVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.vo.classroom;
+package com.xhkjedu.slog.vo.classroom;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/slog/vo/classroom/SubjectiveVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.vo.classroom;
+package com.xhkjedu.slog.vo.classroom;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/slog/vo/paper/CheckClassVo.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.sclass.vo.paper;
+package com.xhkjedu.slog.vo.paper;
 
-import com.xhkjedu.sclass.model.classroom.TClassroomPaperFile;
-import com.xhkjedu.sclass.vo.paperstudent.StudentVo;
+import com.xhkjedu.slog.model.classroom.TClassroomPaperFile;
+import com.xhkjedu.slog.vo.paperstudent.StudentVo;
 import lombok.Data;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/slog/vo/paper/PaperVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.vo.paper;
+package com.xhkjedu.slog.vo.paper;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/slog/vo/paperstudent/StudentVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.vo.paperstudent;
+package com.xhkjedu.slog.vo.paperstudent;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/slog/vo/room/RoomPVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.vo.room;
+package com.xhkjedu.slog.vo.room;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/slog/vo/room/RoomParamVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.vo.room;
+package com.xhkjedu.slog.vo.room;
 
 import lombok.Data;
 

sclass/src/main/resources/application.properties

@@ -37,7 +37,7 @@ mapper.mappers=com.xhkjedu.base.TkMapper
 mybatis.configuration.call-setters-on-nulls=true
 mapper.identity=MYSQL
 #打印日志
-logging.level.com.xhkjedu.sclass.mapper=debug
+logging.level.com.xhkjedu.slog.mapper=debug
 #分页
 spring.pagehelper.helper-dialect=mysql
 
@@ -52,8 +52,8 @@ spring.redis.jedis.pool.max-idle=300
 #最大等待时间：单位ms //高版本改为maxWaitMillis
 spring.redis.jedis.pool.max-wait=1000000
 spring.redis.jedis.pool.max-active=60000
-#缓存访问数据有效时长60*60*24*7
-redisdatatime=604800
+#缓存访问数据有效时长60*60*5
+redisdatatime=18000
 #secretKey必须为24位
 secretKey=nanhuakaizhangjianwangni
 

sclass/src/main/resources/mapper/classroom/ClassroomActivestudentMapper.xml

@@ -48,7 +48,7 @@
         select group_concat(asktid) from t_classroom_askteacher where roomid=#{roomid}
     </select>
     <!--课堂学生-->
-    <select id="listRoomStu" resultType="com.xhkjedu.sclass.model.classroom.TClassroomActivestudent">
+    <select id="listRoomStu" resultType="com.xhkjedu.slog.model.classroom.TClassroomActivestudent">
         select cs.studentid,(
             (select count(distinct s.userid) from t_classroom_sign s where s.roomid=#{roomid} and s.userid=cs.studentid)
         <if test="asktids!=null and asktids!=''">

sclass/src/main/resources/mapper/classroom/ClassroomMapper.xml

@@ -16,7 +16,7 @@
         where r.roomid=#{roomid};
     </select>
     <!--获取批阅信息-->
-    <resultMap id="correctResult" type="com.xhkjedu.sclass.vo.classroom.RoomCorrectVo">
+    <resultMap id="correctResult" type="com.xhkjedu.slog.vo.classroom.RoomCorrectVo">
         <result property="roomid" column="roomid"></result>
         <result property="roomname" column="roomname"></result>
         <result property="createtime" column="createtime"></result>
@@ -24,21 +24,21 @@
         <result property="classname" column="classname"></result>
         <result property="gradeid" column="gradeid"></result>
         <result property="teachername" column="teachername"></result>
-        <collection property="calls" ofType="com.xhkjedu.sclass.vo.classroom.RoomCorrectCallVo"
+        <collection property="calls" ofType="com.xhkjedu.slog.vo.classroom.RoomCorrectCallVo"
                     select="listCall" column="{roomid=roomid,realstunum=realstunum}">
         </collection>
-        <collection property="exams" ofType="com.xhkjedu.sclass.vo.classroom.RoomCorrectExamVo"
+        <collection property="exams" ofType="com.xhkjedu.slog.vo.classroom.RoomCorrectExamVo"
                     select="listExam" column="{roomid=roomid,realstunum=realstunum}">
         </collection>
     </resultMap>
-    <select id="listCall" resultType="com.xhkjedu.sclass.vo.classroom.RoomCorrectCallVo">
+    <select id="listCall" resultType="com.xhkjedu.slog.vo.classroom.RoomCorrectCallVo">
         select s.asktid,count(*)commitnum,count(*) stunum
         ,sum(case when s.radiocorrect!=0 then 1 else 0 end)correctnum
         from t_classroom_askstudent s left join t_classroom_askteacher rt on s.asktid=rt.asktid
         where rt.roomid=#{roomid} and rt.asktype between 32 and 33
         group by s.asktid order by rt.createtime
     </select>
-    <select id="listExam" resultType="com.xhkjedu.sclass.vo.classroom.RoomCorrectExamVo">
+    <select id="listExam" resultType="com.xhkjedu.slog.vo.classroom.RoomCorrectExamVo">
         select s.paperid,p.papername,count(*)commitnum,count(*) stunum
         ,sum(case when s.pschecked!=0 then 1 else 0 end)correctnum
         from t_classroom_paper_student s left join t_classroom_paper p on s.paperid=p.paperid
@@ -55,13 +55,13 @@
     </select>
 
     <!--获取提问批改学生列表-->
-    <resultMap id="checkResult" type="com.xhkjedu.sclass.vo.paper.CheckClassVo">
+    <resultMap id="checkResult" type="com.xhkjedu.slog.vo.paper.CheckClassVo">
         <result property="classid" column="classid"></result>
         <result property="classnum" column="classnum"></result>
         <result property="ytjnum" column="ytjnum"></result>
         <result property="ypynum" column="ypynum"></result>
         <result property="teacherpic" column="teacherpic"></result>
-        <collection property="students" ofType="com.xhkjedu.sclass.vo.paperstudent.StudentVo">
+        <collection property="students" ofType="com.xhkjedu.slog.vo.paperstudent.StudentVo">
             <result property="psid" column="psid"></result>
             <result property="studentid" column="studentid"></result>
             <result property="studentname" column="studentname"></result>
@@ -90,7 +90,7 @@
         group by ps.psid order by ps.studentid
     </select>
 
-    <resultMap id="objectiveResult" type="com.xhkjedu.sclass.vo.classroom.ObjectiveVo">
+    <resultMap id="objectiveResult" type="com.xhkjedu.slog.vo.classroom.ObjectiveVo">
         <result property="typename" column="typename"></result>
         <result property="answer" column="answer"></result>
         <result property="correctrate" column="correctrate"></result>
@@ -98,7 +98,7 @@
         <result property="psscore" column="psscore"></result>
         <result property="avgscore" column="avgscore"></result>
         <result property="maxscore" column="maxscore"></result>
-        <collection property="answers" ofType="com.xhkjedu.sclass.vo.classroom.ObjectiveAnswerVo">
+        <collection property="answers" ofType="com.xhkjedu.slog.vo.classroom.ObjectiveAnswerVo">
             <result property="section" column="section"></result>
             <result property="stunum" column="stunum"></result>
             <result property="stuscore" column="stuscore"></result>
@@ -132,7 +132,7 @@
         group by pss.useranswer
     </select>
 
-    <resultMap id="subjectiveResult" type="com.xhkjedu.sclass.vo.classroom.SubjectiveVo">
+    <resultMap id="subjectiveResult" type="com.xhkjedu.slog.vo.classroom.SubjectiveVo">
         <result property="typename" column="typename"></result>
         <result property="correctrate" column="correctrate"></result>
         <result property="psorder" column="psorder"></result>
@@ -222,11 +222,11 @@
         <collection property="asks" ofType="java.util.Map"
                     select="listStuAsk" column="{roomid=roomid,studentid=studentid}">
         </collection>
-        <collection property="files" ofType="com.xhkjedu.sclass.model.classroom.TClassroomFile"
+        <collection property="files" ofType="com.xhkjedu.slog.model.classroom.TClassroomFile"
                     select="listFile" column="{roomid=roomid}">
         </collection>
     </resultMap>
-    <select id="listFile" resultType="com.xhkjedu.sclass.model.classroom.TClassroomFile">
+    <select id="listFile" resultType="com.xhkjedu.slog.model.classroom.TClassroomFile">
         select * from t_classroom_file where roomid=#{roomid}
     </select>
     <select id="getReportStu" resultMap="stuRoomResult">
@@ -324,7 +324,7 @@
         <result property="wpynum" column="wpynum"></result>
         <result property="classnum" column="classnum"></result>
         <result property="signstate" column="signstate"></result>
-        <collection property="hdlist" ofType="com.xhkjedu.sclass.vo.classroom.RoomAskTeacherVo"
+        <collection property="hdlist" ofType="com.xhkjedu.slog.vo.classroom.RoomAskTeacherVo"
                     select="listAskTeachersForRoom" column="{roomid=roomid}">
             <result property="asktid" column="asktid"></result>
             <result property="asktype" column="asktype"></result>
@@ -362,7 +362,7 @@
         </if>
         ORDER BY c.createtime DESC
     </select>
-    <select id="listAskTeachersForRoom" resultType="com.xhkjedu.sclass.vo.classroom.RoomAskTeacherVo">
+    <select id="listAskTeachersForRoom" resultType="com.xhkjedu.slog.vo.classroom.RoomAskTeacherVo">
         select asktid,asktype from t_classroom_askteacher where roomid=#{roomid}
     </select>
     <select id="listFilesForRoom" resultType="java.util.Map">
@@ -386,7 +386,7 @@
         </foreach>
     </update>
     <!--课堂回顾详情-->
-    <select id="getReport" resultType="com.xhkjedu.sclass.vo.classroom.ReportRoomVo">
+    <select id="getReport" resultType="com.xhkjedu.slog.vo.classroom.ReportRoomVo">
         select r.roomname,r.classnum,r.realstunum,r.createtime,r.endtime,c.classname,c.gradeid,u.username createname
         ,(select count(*) from t_classroom_askteacher ct where ct.roomid=r.roomid and ct.asktype=20)asknum
         ,(select count(*) from t_classroom_askteacher ct where ct.roomid=r.roomid and ct.asktype=21)callnum
@@ -426,11 +426,11 @@
         order by convert(u.username using gbk)
     </select>
     <!--课堂截图列表-->
-    <select id="listFileReport" resultType="com.xhkjedu.sclass.model.classroom.TClassroomFile">
+    <select id="listFileReport" resultType="com.xhkjedu.slog.model.classroom.TClassroomFile">
         select * from t_classroom_file f where f.roomid=#{roomid} order by f.createtime
     </select>
     <!--课堂考试列表-->
-    <select id="listExamReport" resultType="com.xhkjedu.sclass.vo.classroom.ReportEQuestionVo">
+    <select id="listExamReport" resultType="com.xhkjedu.slog.vo.classroom.ReportEQuestionVo">
         select ps.paperid,ps.psorder,ps.psanswer,ps.psscore,ps.ctypename,ps.ctype,ps.pscaid
         ,sum(case when q.answered=1 then 1 else 0 end)commitrate
         ,sum(case when q.stuscore=ps.psscore then 1 else 0 end)correctrate
@@ -443,7 +443,7 @@
         group by ps.pscaid order by ps.psorder
     </select>
     <!--获取课堂考试列表-->
-    <select id="listPaper" resultType="com.xhkjedu.sclass.vo.classroom.ReportExamVo">
+    <select id="listPaper" resultType="com.xhkjedu.slog.vo.classroom.ReportExamVo">
         SELECT p.paperid,p.papername,c.classid,ifnull(truncate(SUM(ps.stuscore)*100/(p.paperscore*COUNT(ps.psid)),2),0)scorerate
         ,ifnull(truncate(SUM(ps.stuscore)/COUNT(ps.psid),2),0)avgscore,ifnull(MAX(ps.stuscore),0)maxscore,COUNT(ps.psid)ytjnum
         FROM t_classroom_paper p
@@ -490,7 +490,7 @@
         </foreach>
     </update>
     <!--根据班级ids获取学生数量-->
-    <select id="listStudentNumByClassIds" resultType="com.xhkjedu.sclass.model.classroom.TClassroom">
+    <select id="listStudentNumByClassIds" resultType="com.xhkjedu.slog.model.classroom.TClassroom">
         SELECT classid,classnum FROM t_class WHERE classid in
         <foreach collection="classids" item="classid" open="(" close=")" separator=",">
             ${classid}

sclass/src/main/resources/mapper/classroom/ClassroomPaperFileMapper.xml

@@ -2,14 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.sclass.mapper.classroom.ClassroomPaperFileMapper">
     <!-- 根据作业id获取作业附件 -->
-    <select id="listObjsByPaperid" resultType="com.xhkjedu.sclass.model.classroom.TClassroomPaperFile">
+    <select id="listObjsByPaperid" resultType="com.xhkjedu.slog.model.classroom.TClassroomPaperFile">
         SELECT pfid,paperid,filepath,fileclass,fileorder,createtime
         FROM
         <if test="qctype==2">t_paper_file</if>
         <if test="qctype==3">t_classroom_paper_file</if>
         WHERE paperid=#{paperid} ORDER BY fileorder asc
     </select>
-    <select id="listFilepath" resultType="com.xhkjedu.sclass.model.classroom.TClassroomPaperFile">
+    <select id="listFilepath" resultType="com.xhkjedu.slog.model.classroom.TClassroomPaperFile">
         SELECT paperid,filepath FROM t_classroom_paper_file
         WHERE paperid in
         <foreach collection="paperids" item="paperid" index="index" open="(" separator="," close=")">

sclass/src/main/resources/mapper/classroom/ClassroomPaperScantronMapper.xml

@@ -13,7 +13,7 @@
     </insert>
 
     <!--获取试题详情-->
-    <select id="listByIds" resultType="com.xhkjedu.sclass.model.classroom.TClassroomPaperScantron">
+    <select id="listByIds" resultType="com.xhkjedu.slog.model.classroom.TClassroomPaperScantron">
         select pscaid,psanswer,ctype from t_classroom_paper_scantron where pscaid in
         <foreach collection="pscaids" item="pscaid" index="index" open="(" separator="," close=")">
             ${pscaid}

sclass/src/main/resources/mapper/classroom/ClassroomPaperStudentMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.sclass.mapper.classroom.ClassroomPaperStudentMapper">
     <!--获取考试学生信息-->
-    <select id="findById" resultType="com.xhkjedu.sclass.model.classroom.TClassroomPaperStudent">
+    <select id="findById" resultType="com.xhkjedu.slog.model.classroom.TClassroomPaperStudent">
         select s.*,p.subjectid,p.papername from t_classroom_paper_student s
         left join t_classroom_paper p on p.paperid=s.paperid
         where s.psid=#{psid} limit 1

sclass/src/test/java/com/xhkjedu/slog/SclassApplicationTests.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass;
+package com.xhkjedu.slog;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;

scommons/pom.xml

@@ -73,12 +73,25 @@
             <version>2.0.2</version>
         </dependency>
 
+        <!--解析ip-->
+        <dependency>
+            <groupId>org.lionsoul</groupId>
+            <artifactId>ip2region</artifactId>
+            <version>2.6.6</version>
+        </dependency>
+
         <!--aop-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
 
+        <!--amqp的起步依赖-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

scommons/src/main/java/com/xhkjedu/annotation/Action.java

@@ -0,0 +1,19 @@
+package com.xhkjedu.annotation;
+
+import java.lang.annotation.*;
+
+/*
+ * @Description:自定义注解，主要作用在需要记录操作日志的接口
+ * @Author: WN
+ * @Date: 2023/11/15 14:41:48
+ **/
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Action {
+
+    /**
+     * 操作名称
+     */
+    String value() default "";
+}

scommons/src/main/java/com/xhkjedu/annotation/ScalaParam.java

@@ -0,0 +1,43 @@
+package com.xhkjedu.annotation;
+
+import org.springframework.core.annotation.AliasFor;
+
+import java.lang.annotation.*;
+
+/*
+ * @Description:自定义注解，主要作用在需要记录操作日志的接口
+ * @Author: WN
+ * @Date: 2023/11/15 14:42:13
+ **/
+@Target({ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface ScalaParam {
+
+    /**
+     * 操作名称
+     */
+    @AliasFor("value")
+    String fileValue();
+
+    /**
+     * 操作名称
+     */
+    String name() default "";
+
+    ;
+
+    /**
+     * 输入类型
+     */
+    String type() default "";
+
+    /**
+     * 当类型是select时，此值不能为空，多个值以逗号隔开
+     *
+     * @return
+     */
+    String options() default "";
+
+
+}

scommons/src/main/java/com/xhkjedu/constant/PlatformConstant.java

@@ -0,0 +1,28 @@
+package com.xhkjedu.constant;
+
+/*
+ * @Description:项目常量
+ * @Author: WN
+ * @Date: 2023/11/15 15:24:44
+ **/
+public final class PlatformConstant {
+
+    //请求头内容——用户id
+    public static final String XH_USER_ID = "Xh-User-Id";
+
+    //请求头内容——是否加密
+    public static final String XH_ST = "Xh-St";
+
+    //请求头内容——tokenKey
+    public static final String XH_TOKEN_KEY = "Xh-Token-Key";
+
+    //请求头内容——tokenValue
+    public static final String XH_TOKEN_VALUE = "Xh-Token-Value";
+
+    //请求头内容——终端类型
+    public static final String XH_DEVICE = "Xh-Device";
+
+    //请求头内容——版本号
+    public static final String XH_VERSION = "Xh-Version";
+
+}

scommons/src/main/java/com/xhkjedu/exception/ServiceException.java

@@ -0,0 +1,19 @@
+package com.xhkjedu.exception;
+
+/**
+ * @Description：业务处理异常
+ * @Author: WN
+ * @Date: 2023/11/15 17:50:40
+ **/
+public class ServiceException extends RuntimeException {
+    public ServiceException() {
+    }
+
+    public ServiceException(String message) {
+        super(message);
+    }
+
+    public ServiceException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

scommons/src/main/java/com/xhkjedu/model/slog/THandleLog.java

@@ -0,0 +1,72 @@
+package com.xhkjedu.model.slog;
+
+import com.xhkjedu.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * @Description：操作日志
+ * @Author: WN
+ * @Date: 2023/11/15 10:24:46
+ **/
+@Table(name = "t_handle_log")
+@Data
+public class THandleLog extends BaseBean {
+    @Id
+    private Integer handleid;//操作日志ID
+
+    //用户id
+    private Integer userid;
+
+    //用户姓名
+    private String username;
+
+    //登录账户
+    private String loginname;
+
+    //用户类型
+    private Integer usertype;
+
+    //操作时间
+    private Integer handletime;
+
+    //操作地址
+    private String handleurl;
+
+    //操作所属模块
+    private String handlemodel;
+
+    //操作类型（登录/增加/修改/删除/上传 等）
+    private String handleaction;
+
+    //操作状态1成功2失败
+    private Integer handlestate;
+
+    //操作内容
+    private String handlecontent;
+
+    //操作参数
+    private String handleparas;
+
+    //IP
+    private String handleip;
+
+    //IP归属地
+    private String handleaddress;
+
+    //终端类型
+    private String devicetype;
+
+    //终端版本号
+    private String versionnum;
+
+    //学校id
+    private Integer schoolid;
+
+    //截止时间
+    @Transient
+    private Integer endtime;
+}

scommons/src/main/java/com/xhkjedu/utils/DatesUtil.java

@@ -2,6 +2,8 @@ package com.xhkjedu.utils;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -15,6 +17,19 @@ public class DatesUtil {
         return new SimpleDateFormat("yyyy-MM-dd");
     }
 
+    /*
+     * @Description 获取当前时间
+     * @Date 2023/11/15 10:45:16
+     * @Author WN
+     * @Return java.lang.String
+     **/
+    public static String getNowDateTime(){
+        //格式化
+        DateTimeFormatter fmDate = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime today = LocalDateTime.now();
+        return today.format(fmDate);
+    }
+
     public static Integer getTimestamp(String time) {
         try {
             return Integer.valueOf(sdf().parse(time).getTime()/1000+"");

scommons/src/main/java/com/xhkjedu/utils/IpRegionUtil.java

@@ -0,0 +1,52 @@
+package com.xhkjedu.utils;
+
+import lombok.extern.slf4j.Slf4j;
+import org.lionsoul.ip2region.xdb.Searcher;
+
+import java.io.IOException;
+
+/**
+ * @Description 解析ip归属地
+ * @Author WN
+ * Date 2022/11/27 22:31
+ **/
+@Slf4j
+public class IpRegionUtil {
+
+    public String getIpForAddress(String ip,String dbPath){
+        String region = "";
+        // 1、创建 searcher 对象
+        // String dbPath = ConfigKey.ipregiondb;
+        Searcher searcher = null;
+        try {
+            searcher = Searcher.newWithFileOnly(dbPath);
+        } catch (IOException e) {
+//            System.out.printf("failed to create searcher with `%s`: %s\n", dbPath, e);
+            log.error("创建searcher失败："+ e.getMessage());
+            return null;
+        }
+
+        // 2、查询
+        try {
+//            long sTime = System.nanoTime();
+            region = searcher.search(ip);
+//            long cost = TimeUnit.NANOSECONDS.toMicros((long) (System.nanoTime() - sTime));
+//            System.out.printf("{region: %s, ioCount: %d, took: %d μs}\n", region, searcher.getIOCount(), cost);
+            if(N_Utils.isNotEmpty(region)){
+                region = region.replace("0|","").replace("|"," ");
+            }
+        } catch (Exception e) {
+//            System.out.printf("failed to search(%s): %s\n", ip, e);
+            log.error("根据ip获取地址失败："+ e.getMessage());
+            return null;
+        }
+
+        // 3、关闭资源
+        try {
+            searcher.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return region;
+    }
+}

scommons/src/main/java/com/xhkjedu/utils/N_Utils.java

@@ -2,8 +2,10 @@ package com.xhkjedu.utils;
 
 import com.xhkjedu.exception.MissingParametersException;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.util.CollectionUtils;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -983,6 +985,40 @@ public class N_Utils {
         return returnStr.toString();
     }
 
+    /*
+     * @Description 获取登录IP
+     * @Date 2023/11/15 11:30:26
+     * @Author WN
+     * @Param [request]
+     * @Return java.lang.String
+     **/
+    public static String getIpAddress(HttpServletRequest request){
+        String ip = request.getHeader("x-forwarded-for");
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("Proxy-Client-IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("WL-Proxy-Client-IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("HTTP_CLIENT_IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("HTTP_X_FORWARDED_FOR");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getRemoteAddr();
+        }
+
+        if(StringUtils.isNotEmpty(ip)){
+            String[] ipArr = ip.split(",");
+            if(ipArr.length > 0){
+                ip = ipArr[0];
+            }
+        }
+        return ip;
+    }
+
     /**
      * 生成id
      * @Param []

sexam/pom.xml

@@ -21,11 +21,6 @@
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
 
-        <!--amqp的起步依赖-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-amqp</artifactId>
-        </dependency>
         <!--  导入和导出excel时需要的jar包 -->
         <dependency>
             <groupId>org.apache.poi</groupId>

sexam/src/main/resources/application.properties

@@ -48,8 +48,8 @@ spring.redis.jedis.pool.max-idle=300
 #最大等待时间：单位ms //高版本改为maxWaitMillis
 spring.redis.jedis.pool.max-wait=1000000
 spring.redis.jedis.pool.max-active=60000
-#缓存访问数据有效时长60*60*24*7
-redisdatatime=604800
+#缓存访问数据有效时长60*60*5
+redisdatatime=18000
 
 #消费者mq
 rabbitmq.examImgMergeHandleQueue=xhkjedutest.xhschool.examImgMergeHandleQueue_dev

slive/pom.xml

@@ -26,11 +26,7 @@
             <artifactId>httpclient</artifactId>
             <version>4.5.9</version>
         </dependency>
-        <!--amqp的起步依赖-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-amqp</artifactId>
-        </dependency>
+
         <!--  导入和导出excel时需要的jar包 -->
         <dependency>
             <groupId>org.apache.poi</groupId>
@@ -42,13 +38,6 @@
             <artifactId>poi</artifactId>
             <version>3.17</version>
         </dependency>
-
-        <!--解析ip-->
-        <dependency>
-            <groupId>org.lionsoul</groupId>
-            <artifactId>ip2region</artifactId>
-            <version>2.6.6</version>
-        </dependency>
     </dependencies>
     <dependencyManagement>
         <dependencies>

slive/src/main/java/com/xhkjedu/slive/service/liveplay/CourseSectionStudentService.java

@@ -1,13 +1,13 @@
 package com.xhkjedu.slive.service.liveplay;
 
+import com.xhkjedu.slive.config.ConfigKey;
 import com.xhkjedu.slive.mapper.liveplay.CourseSectionMapper;
 import com.xhkjedu.slive.mapper.liveplay.CourseSectionStudentMapper;
 import com.xhkjedu.slive.model.liveplay.LCourseSection;
 import com.xhkjedu.slive.model.liveplay.LCourseSectionStudent;
-import com.xhkjedu.slive.utils.IpRegionUtil;
-import com.xhkjedu.slive.utils.LiveUtil;
 import com.xhkjedu.slive.vo.liveplay.CSStudentVo;
 import com.xhkjedu.slive.vo.liveplay.CourseVo;
+import com.xhkjedu.utils.IpRegionUtil;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import org.springframework.stereotype.Service;
@@ -36,11 +36,11 @@ public class CourseSectionStudentService {
             model.setTotaltime(0);
         }
 
-        String ip = LiveUtil.getIpAddress(request);
+        String ip = N_Utils.getIpAddress(request);
         String region = null;
         if(N_Utils.isNotEmpty(ip)){
             IpRegionUtil ipRegionUtil = new IpRegionUtil();
-            region = ipRegionUtil.getIpForAddress(ip);
+            region = ipRegionUtil.getIpForAddress(ip, ConfigKey.ipregiondb);
         }
         model.setLogip(ip);
         model.setLogaddress(region);

slive/src/main/java/com/xhkjedu/slive/utils/LiveUtil.java

@@ -1,9 +1,7 @@
 package com.xhkjedu.slive.utils;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 
-import javax.servlet.http.HttpServletRequest;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
@@ -191,38 +189,4 @@ public class LiveUtil {
         return rtnlst;
     }
 
-    /**
-     * @Description 获取请求ip
-     * @Param [request]
-     * @Return java.lang.String
-     * @Author wn
-     * @Date 2022/11/27 22:26
-     **/
-    public static String getIpAddress(HttpServletRequest request){
-        String ip = request.getHeader("x-forwarded-for");
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("Proxy-Client-IP");
-        }
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("WL-Proxy-Client-IP");
-        }
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("HTTP_CLIENT_IP");
-        }
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("HTTP_X_FORWARDED_FOR");
-        }
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getRemoteAddr();
-        }
-
-        if(StringUtils.isNotEmpty(ip)){
-            String[] ipArr = ip.split(",");
-            if(ipArr.length > 0){
-                ip = ipArr[0];
-            }
-        }
-        return ip;
-    }
-
 }

slive/src/main/resources/application.properties

@@ -53,8 +53,8 @@ spring.redis.jedis.pool.max-idle=300
 #最大等待时间：单位ms //高版本改为maxWaitMillis
 spring.redis.jedis.pool.max-wait=1000000
 spring.redis.jedis.pool.max-active=60000
-#缓存访问数据有效时长60*60*24*7
-redisdatatime=604800
+#缓存访问数据有效时长60*60*5
+redisdatatime=18000
 #secretKey必须为24位
 secretKey=nanhuakaizhangjianwangni
 

slog/.gitignore

@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/

slog/.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

slog/mvnw

@@ -0,0 +1,316 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /usr/local/etc/mavenrc ] ; then
+    . /usr/local/etc/mavenrc
+  fi
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`\\unset -f command; \\command -v java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ -n "$MVNW_REPOURL" ]; then
+      jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl -o "$wrapperJarPath" "$jarUrl" -f
+        else
+            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+        fi
+
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  $MAVEN_DEBUG_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" \
+  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

slog/mvnw.cmd

@@ -0,0 +1,188 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% ^
+  %JVM_CONFIG_MAVEN_PROPS% ^
+  %MAVEN_OPTS% ^
+  %MAVEN_DEBUG_OPTS% ^
+  -classpath %WRAPPER_JAR% ^
+  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%"=="on" pause
+
+if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
+
+cmd /C exit /B %ERROR_CODE%

slog/pom.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.xhkjedu</groupId>
+    <artifactId>slog</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>slog</name>
+    <description>Demo project for Spring Boot</description>
+
+    <parent>
+        <groupId>com.xhkjedu</groupId>
+        <artifactId>cloud-schoolapi</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <dependencies>
+        <dependency>
+            <groupId>com.xhkjedu</groupId>
+            <artifactId>scommons</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+
+    </dependencies>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                        </exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <!--编译跳过测试文件检查的生命周期-->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.2</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

slog/src/main/java/com/xhkjedu/slog/SlogApplication.java

@@ -0,0 +1,17 @@
+package com.xhkjedu.slog;
+
+import com.xhkjedu.slog.config.ConfigKey;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import tk.mybatis.spring.annotation.MapperScan;
+
+@SpringBootApplication(scanBasePackages = "com.xhkjedu")
+@MapperScan("com.xhkjedu.slog.mapper")
+public class SlogApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SlogApplication.class, args);
+        System.out.println("构建号：" + ConfigKey.buildnum);
+    }
+
+}

slog/src/main/java/com/xhkjedu/slog/config/ConfigKey.java

@@ -0,0 +1,28 @@
+package com.xhkjedu.slog.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author ywx
+ * @classname ConfigKey
+ * @description 读取配置文件类
+ * @date 2020/10/16 9:19
+ **/
+@Component
+public class ConfigKey {
+    public static Integer buildnum;//构建号
+
+    @Value("${buildnum}")
+    public void setBuildnum(Integer buildnum){
+        this.buildnum = buildnum;
+    }
+
+    public static String ipregiondb;//解析ip地址归属地
+
+    @Value("${ipregiondb}")
+    public void setIpregiondb(String ipregiondb){
+        ConfigKey.ipregiondb = ipregiondb;
+    }
+
+}

slog/src/main/java/com/xhkjedu/slog/config/RabbitConfig.java

@@ -0,0 +1,24 @@
+package com.xhkjedu.slog.config;
+
+import org.springframework.amqp.core.Queue;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/*
+ * @Description: mq
+ * @Author: WN
+ * @Date: 2023/11/15 14:32:28
+ **/
+@Configuration
+public class RabbitConfig {
+    //消费者mq-操作日志
+    @Value("${rabbitmq.handleLogQueue}")
+    private String handleLogQueue;
+
+    //消费者mq-操作日志
+    @Bean
+    public Queue handleLogQueue() {
+        return new Queue(handleLogQueue);
+    }
+}