优化子模块共同代码

sapi/src/main/java/com/xhkjedu/sapi/vo/system/UserVo.java

@@ -1,116 +0,0 @@
-package com.xhkjedu.sapi.vo.system;
-
-import lombok.Data;
-
-/**
- * @ClassName UserVo
- * Description
- * Author WN
- * Date 2020/5/29 17:16
- **/
-@Data
-public class UserVo {
-    //用户表
-    private Integer userid;
-
-    //姓名
-    private String username;
-
-    //登录账号
-    private String loginname;
-
-    //登录密码
-    private String loginpwd;
-
-    //学生学号
-    private String studentno;
-
-    //用户手机号
-    private String userphone;
-
-    //出生日期
-    private Integer userbirthday;
-
-    //身份证号
-    private String cardid;
-
-    //头像地址
-    private String headpic;
-
-    //用户类型999超级管理员0学校管理员1老师2学生
-    private Integer usertype;
-
-    //用户状态1正常2删除
-    private Integer userstate;
-
-    //是否绑定硬件地址0不绑定1绑定
-    private Integer bindmac;
-
-    //硬件地址
-    private String mac;
-
-    //硬件地址绑定的账号
-    private String macname;
-
-    //学校是否绑定硬件地址0不绑定1绑定
-    private Integer sbindmac;
-
-    //操作密码（教师操作密码）
-    private String opepassword;
-
-    //创建人id
-    private Integer createid;
-
-    //创建人姓名
-    private String createname;
-
-    //创建时间
-    private Integer createtime;
-
-    //删除人id
-    private Integer deleteid;
-
-    //删除时间
-    private Integer deletetime;
-
-    //学校id
-    private Integer schoolid;
-
-    private String schoolname;
-
-    //学校阶段1小学2初中3高中4大学
-    private Integer schoollevel;
-
-    //学校状态1正常10删除
-    private Integer schoolstate;
-
-    //错误率%
-    private Integer errorrate;
-
-    //当前年份
-    private Integer year;
-
-    //性别1男2女
-    private Integer usersex;
-
-    //云平台码
-    private String cloudcode;
-
-    //行政班数量
-    private Integer xznum;
-
-    //是否绑定手机号0不绑定1绑定
-    private Integer bindphone;
-
-    //是否有手机号0没有1有
-    private Integer hasphone;
-
-    //学校域名地址
-    private String schooldomain;
-
-    //有效期
-    private String usertime;
-    private String token_key;
-    private String token_value;
-
-}

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

@@ -18,4 +18,11 @@ public class ConfigKey {
         this.buildnum = buildnum;
     }
 
+    public static String ipregiondb;//解析ip地址归属地
+
+    @Value("${ipregiondb}")
+    public void setIpregiondb(String ipregiondb){
+        ConfigKey.ipregiondb = ipregiondb;
+    }
+
 }

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

@@ -1,43 +0,0 @@
-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 "";
-
-
-}

sexam/src/main/java/com/xhkjedu/sexam/vo/system/UserVo.java

@@ -1,18 +0,0 @@
-package com.xhkjedu.sexam.vo.system;
-
-import lombok.Data;
-
-/**
- * @author ywx
- * @className UserVo
- * @description 用户
- * @date 2022/7/28 9:45
- **/
-@Data
-public class UserVo {
-    private Integer userid;//用户id
-    private String username;//姓名
-    private String loginname;//账号
-    private String userphone;//手机号
-    private Integer classid;//班级id
-}

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

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

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

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

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

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

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

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

slog/src/main/java/com/xhkjedu/slog/controller/log/HandleLogController.java

@@ -1,9 +1,9 @@
-package com.xhkjedu.slog.controller.log;
+package com.xhkjedu.sclass.controller.log;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xhkjedu.model.slog.THandleLog;
-import com.xhkjedu.slog.service.log.HandleLogService;
+import com.xhkjedu.sclass.service.log.HandleLogService;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;

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

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

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

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

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

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

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

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

slog/src/main/java/com/xhkjedu/slog/mapper/log/HandleLogMapper.java

@@ -1,8 +1,7 @@
-package com.xhkjedu.slog.mapper.log;
+package com.xhkjedu.sclass.mapper.log;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.model.slog.THandleLog;
-import com.xhkjedu.slog.vo.UserVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -22,7 +21,4 @@ public interface HandleLogMapper extends TkMapper<THandleLog> {
 
     //操作日志列表-区域
     List<Map> listHandleLogForCloud(@Param("log")THandleLog log);
-
-    //用户信息
-    UserVo getUserTypeAndSchoolid(@Param("userid")Integer userid);
 }

slog/src/main/java/com/xhkjedu/slog/mq/HandleLogMq.java

@@ -1,8 +1,8 @@
-package com.xhkjedu.slog.mq;
+package com.xhkjedu.sclass.mq;
 
 import com.alibaba.fastjson.JSONObject;
 import com.xhkjedu.model.slog.THandleLog;
-import com.xhkjedu.slog.service.log.HandleLogService;
+import com.xhkjedu.sclass.service.log.HandleLogService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;

slog/src/main/java/com/xhkjedu/slog/service/log/HandleLogService.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.slog.service.log;
+package com.xhkjedu.sclass.service.log;
 
 import com.xhkjedu.model.slog.THandleLog;
-import com.xhkjedu.slog.mapper.log.HandleLogMapper;
+import com.xhkjedu.sclass.mapper.log.HandleLogMapper;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
 

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

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

slog/src/main/java/com/xhkjedu/slog/utils/LogUtil.java

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

slog/src/main/java/com/xhkjedu/slog/vo/UserVo.java

@@ -1,22 +0,0 @@
-package com.xhkjedu.slog.vo;
-
-import lombok.Data;
-
-/**
- * @Description：用户信息
- * @Author: WN
- * @Date: 2023/11/15 12:53:37
- **/
-@Data
-public class UserVo {
-
-    private Integer userid;
-
-    private Integer usertype;
-
-    private String username;
-
-    private String loginname;
-
-    private Integer schoolid;
-}

slog/src/test/java/com/xhkjedu/slog/SlogApplicationTests.java

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