feat:web模块包名调整

This commit is contained in:
曾文豪
2024-06-26 10:13:42 +08:00
parent c0ded4356f
commit 093d39a108
60 changed files with 149 additions and 162 deletions

View File

@@ -1,15 +0,0 @@
package com.tiesheng.core;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.context.annotation.ComponentScan;
/**
* @author hao
*/
@ComponentScan({
"com.tiesheng.core.**.*",
})
@MapperScan("com.tiesheng.core.mapper")
public class CoreAutoConfigurer {
}

View File

@@ -1,12 +0,0 @@
package com.tiesheng.core;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.context.annotation.ComponentScan;
@ComponentScan({
"com.tiesheng.role.**.*",
})
@MapperScan("com.tiesheng.role.mapper")
public class RoleAutoConfigurer {
}

View File

@@ -1,11 +1,11 @@
package com.tiesheng.core;
package com.tiesheng.web;
import com.tiesheng.core.service.TieshengWebConfigurer;
import com.tiesheng.database.DatabaseAutoConfigurer;
import com.tiesheng.encrypt.EncryptAutoConfigurer;
import com.tiesheng.login.LoginAutoConfigurer;
import com.tiesheng.message.MessageAutoConfigurer;
import com.tiesheng.util.UtilAutoConfigurer;
import com.tiesheng.web.service.TieshengWebConfigurer;
import org.springframework.context.annotation.Import;
import java.lang.annotation.*;
@@ -19,11 +19,10 @@ import java.lang.annotation.*;
@Import({
UtilAutoConfigurer.class,
MessageAutoConfigurer.class,
CoreAutoConfigurer.class,
WebAutoConfigurer.class,
LoginAutoConfigurer.class,
DatabaseAutoConfigurer.class,
EncryptAutoConfigurer.class,
RoleAutoConfigurer.class,
})
public @interface EnableTieshengWeb {

View File

@@ -0,0 +1,16 @@
package com.tiesheng.web;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.context.annotation.ComponentScan;
/**
* @author hao
*/
@ComponentScan({
"com.tiesheng.web.**.*",
"com.tiesheng.role.**.*",
})
@MapperScan(value = {"com.tiesheng.web.mapper", "com.tiesheng.role.mapper"})
public class WebAutoConfigurer {
}

View File

@@ -1,8 +1,8 @@
package com.tiesheng.core.config.exception;
package com.tiesheng.web.config.exception;
import cn.hutool.core.exceptions.ValidateException;
import cn.hutool.extra.spring.SpringUtil;
import com.tiesheng.core.service.TieshengWebConfigurer;
import com.tiesheng.web.service.TieshengWebConfigurer;
import com.tiesheng.util.exception.ApiException;
import com.tiesheng.util.exception.ApiRespEnum;
import com.tiesheng.util.pojos.ApiResp;

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.config.json;
package com.tiesheng.web.config.json;
import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
import com.tiesheng.util.CommonUtil;

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.config.mybatis;
package com.tiesheng.web.config.mybatis;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.config.mybatis;
package com.tiesheng.web.config.mybatis;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.config.operation;
package com.tiesheng.web.config.operation;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.map.MapUtil;
@@ -6,7 +6,7 @@ import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import com.tiesheng.annotation.operation.OperationIgnore;
import com.tiesheng.annotation.operation.OperationLog;
import com.tiesheng.core.service.CoreLogService;
import com.tiesheng.web.service.CoreLogService;
import com.tiesheng.util.ServletKit;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;

View File

@@ -1,6 +1,6 @@
package com.tiesheng.core.config.template;
package com.tiesheng.web.config.template;
import com.tiesheng.core.pojos.dto.TemplateDealDTO;
import com.tiesheng.web.pojos.dto.TemplateDealDTO;
import org.springframework.stereotype.Service;
@Service

View File

@@ -1,7 +1,7 @@
package com.tiesheng.core.config.template;
package com.tiesheng.web.config.template;
import cn.hutool.core.util.StrUtil;
import com.tiesheng.core.pojos.dto.TemplateDealDTO;
import com.tiesheng.web.pojos.dto.TemplateDealDTO;
import org.springframework.stereotype.Service;
@Service

View File

@@ -1,16 +1,16 @@
package com.tiesheng.core.controller;
package com.tiesheng.web.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.tiesheng.annotation.token.TokenIgnore;
import com.tiesheng.core.pojos.dao.CoreConfigEnum;
import com.tiesheng.core.pojos.dao.CoreConfigSystem;
import com.tiesheng.core.pojos.dto.config.ConfigSystemDTO;
import com.tiesheng.core.pojos.dto.config.EnumTypeDTO;
import com.tiesheng.core.service.CoreConfigService;
import com.tiesheng.core.service.TieshengWebConfigurer;
import com.tiesheng.web.pojos.dao.CoreConfigEnum;
import com.tiesheng.web.pojos.dao.CoreConfigSystem;
import com.tiesheng.web.pojos.dto.config.ConfigSystemDTO;
import com.tiesheng.web.pojos.dto.config.EnumTypeDTO;
import com.tiesheng.web.service.CoreConfigService;
import com.tiesheng.web.service.TieshengWebConfigurer;
import com.tiesheng.util.exception.ApiException;
import com.tiesheng.util.pojos.ApiResp;
import com.tiesheng.util.pojos.PageDTO;

View File

@@ -1,15 +1,15 @@
package com.tiesheng.core.controller;
package com.tiesheng.web.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.tiesheng.core.pojos.dao.CoreLogLogin;
import com.tiesheng.core.pojos.dao.CoreLogMessage;
import com.tiesheng.core.pojos.dao.CoreLogOperation;
import com.tiesheng.core.pojos.dao.CoreLogProcess;
import com.tiesheng.web.pojos.dao.CoreLogLogin;
import com.tiesheng.web.pojos.dao.CoreLogMessage;
import com.tiesheng.web.pojos.dao.CoreLogOperation;
import com.tiesheng.web.pojos.dao.CoreLogProcess;
import com.tiesheng.util.pojos.PageDTO;
import com.tiesheng.core.pojos.vo.ProcessDetailVo;
import com.tiesheng.core.service.CoreLogService;
import com.tiesheng.web.pojos.vo.ProcessDetailVo;
import com.tiesheng.web.service.CoreLogService;
import com.tiesheng.util.pojos.ApiResp;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;

View File

@@ -1,17 +1,16 @@
package com.tiesheng.core.controller;
package com.tiesheng.web.controller;
import cn.hutool.captcha.LineCaptcha;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.tiesheng.annotation.token.TokenIgnore;
import com.tiesheng.core.config.template.ToolTemplateHandler;
import com.tiesheng.core.pojos.dto.*;
import com.tiesheng.core.pojos.vo.TemplateInfoVO;
import com.tiesheng.core.pojos.vo.PicVerifyVo;
import com.tiesheng.core.service.FileUploadService;
import com.tiesheng.core.service.TimedCacheService;
import com.tiesheng.web.config.template.ToolTemplateHandler;
import com.tiesheng.web.pojos.dto.*;
import com.tiesheng.web.pojos.vo.TemplateInfoVO;
import com.tiesheng.web.pojos.vo.PicVerifyVo;
import com.tiesheng.web.service.FileUploadService;
import com.tiesheng.web.service.TimedCacheService;
import com.tiesheng.util.exception.ApiException;
import com.tiesheng.util.pojos.ApiResp;
import org.springframework.beans.factory.annotation.Autowired;

View File

@@ -1,7 +1,7 @@
package com.tiesheng.core.mapper;
package com.tiesheng.web.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.tiesheng.core.pojos.dao.CoreConfigEnum;
import com.tiesheng.web.pojos.dao.CoreConfigEnum;
public interface CoreConfigEnumMapper extends BaseMapper<CoreConfigEnum> {
}
}

View File

@@ -1,7 +1,7 @@
package com.tiesheng.core.mapper;
package com.tiesheng.web.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.tiesheng.core.pojos.dao.CoreConfigSystem;
import com.tiesheng.web.pojos.dao.CoreConfigSystem;
public interface CoreConfigSystemMapper extends BaseMapper<CoreConfigSystem> {
}
}

View File

@@ -1,7 +1,7 @@
package com.tiesheng.core.mapper;
package com.tiesheng.web.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.tiesheng.core.pojos.dao.CoreLogLogin;
import com.tiesheng.web.pojos.dao.CoreLogLogin;
public interface CoreLogLoginMapper extends BaseMapper<CoreLogLogin> {
}

View File

@@ -1,7 +1,7 @@
package com.tiesheng.core.mapper;
package com.tiesheng.web.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.tiesheng.core.pojos.dao.CoreLogMessage;
import com.tiesheng.web.pojos.dao.CoreLogMessage;
public interface CoreLogMessageMapper extends BaseMapper<CoreLogMessage> {
}
}

View File

@@ -1,10 +1,10 @@
package com.tiesheng.core.mapper;
package com.tiesheng.web.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.tiesheng.core.pojos.dao.CoreLogOperation;
import com.tiesheng.web.pojos.dao.CoreLogOperation;
import org.apache.ibatis.annotations.Param;
public interface CoreLogOperationMapper extends BaseMapper<CoreLogOperation> {

View File

@@ -1,7 +1,7 @@
package com.tiesheng.core.mapper;
package com.tiesheng.web.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.tiesheng.core.pojos.dao.CoreLogProcess;
import com.tiesheng.web.pojos.dao.CoreLogProcess;
public interface CoreLogProcessMapper extends BaseMapper<CoreLogProcess> {
}
}

View File

@@ -1,7 +1,7 @@
package com.tiesheng.core.mapper;
package com.tiesheng.web.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.tiesheng.core.pojos.dao.CorePlatformUnique;
import com.tiesheng.web.pojos.dao.CorePlatformUnique;
public interface CorePlatformUniqueMapper extends BaseMapper<CorePlatformUnique> {
}
}

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.pojos;
package com.tiesheng.web.pojos;
/**
* 当前token的数据

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.pojos.dao;
package com.tiesheng.web.pojos.dao;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.pojos.dao;
package com.tiesheng.web.pojos.dao;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.pojos.dao;
package com.tiesheng.web.pojos.dao;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.pojos.dao;
package com.tiesheng.web.pojos.dao;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.pojos.dao;
package com.tiesheng.web.pojos.dao;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.pojos.dao;
package com.tiesheng.web.pojos.dao;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.pojos.dao;
package com.tiesheng.web.pojos.dao;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.pojos.dto;
package com.tiesheng.web.pojos.dto;
/**
* @author hao

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.pojos.dto;
package com.tiesheng.web.pojos.dto;
/**
* @author hao

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.pojos.dto;
package com.tiesheng.web.pojos.dto;
/**
* @author hao

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.pojos.dto;
package com.tiesheng.web.pojos.dto;
import cn.hutool.captcha.CaptchaUtil;
import cn.hutool.captcha.LineCaptcha;

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.pojos.dto;
package com.tiesheng.web.pojos.dto;
import javax.validation.constraints.NotEmpty;

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.pojos.dto;
package com.tiesheng.web.pojos.dto;
public class TemplateInfoDTO {

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.pojos.dto.config;
package com.tiesheng.web.pojos.dto.config;
import javax.validation.constraints.NotEmpty;

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.pojos.dto.config;
package com.tiesheng.web.pojos.dto.config;
public class EnumTypeDTO {

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.pojos.vo;
package com.tiesheng.web.pojos.vo;
public class PicVerifyVo {

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.pojos.vo;
package com.tiesheng.web.pojos.vo;
/**
* @author lgc

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.pojos.vo;
package com.tiesheng.web.pojos.vo;
public class TemplateInfoVO {

View File

@@ -1,8 +1,8 @@
package com.tiesheng.core.service;
package com.tiesheng.web.service;
import com.tiesheng.core.mapper.CoreConfigEnumMapper;
import com.tiesheng.core.mapper.CoreConfigSystemMapper;
import com.tiesheng.core.pojos.dao.CoreConfigSystem;
import com.tiesheng.web.mapper.CoreConfigEnumMapper;
import com.tiesheng.web.mapper.CoreConfigSystemMapper;
import com.tiesheng.web.pojos.dao.CoreConfigSystem;
import com.tiesheng.util.service.TsServiceBase;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.service;
package com.tiesheng.web.service;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
@@ -7,18 +7,18 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.servlet.ServletUtil;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.tiesheng.core.mapper.CoreLogLoginMapper;
import com.tiesheng.core.mapper.CoreLogMessageMapper;
import com.tiesheng.core.mapper.CoreLogOperationMapper;
import com.tiesheng.core.mapper.CoreLogProcessMapper;
import com.tiesheng.core.pojos.RequestUserInfo;
import com.tiesheng.core.pojos.dao.CoreLogLogin;
import com.tiesheng.core.pojos.dao.CoreLogOperation;
import com.tiesheng.core.pojos.dao.CoreLogProcess;
import com.tiesheng.core.pojos.dao.CorePlatformUnique;
import com.tiesheng.core.pojos.vo.ProcessDetailVo;
import com.tiesheng.core.util.ProcessImportConsumer;
import com.tiesheng.core.util.ProcessSyncConsumer;
import com.tiesheng.web.mapper.CoreLogLoginMapper;
import com.tiesheng.web.mapper.CoreLogMessageMapper;
import com.tiesheng.web.mapper.CoreLogOperationMapper;
import com.tiesheng.web.mapper.CoreLogProcessMapper;
import com.tiesheng.web.pojos.RequestUserInfo;
import com.tiesheng.web.pojos.dao.CoreLogLogin;
import com.tiesheng.web.pojos.dao.CoreLogOperation;
import com.tiesheng.web.pojos.dao.CoreLogProcess;
import com.tiesheng.web.pojos.dao.CorePlatformUnique;
import com.tiesheng.web.pojos.vo.ProcessDetailVo;
import com.tiesheng.web.util.ProcessImportConsumer;
import com.tiesheng.web.util.ProcessSyncConsumer;
import com.tiesheng.util.config.TsTokenConfig;
import com.tiesheng.util.pojos.TokenBean;
import com.tiesheng.util.ServletKit;

View File

@@ -1,12 +1,12 @@
package com.tiesheng.core.service;
package com.tiesheng.web.service;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject;
import com.tiesheng.core.mapper.CoreLogMessageMapper;
import com.tiesheng.core.pojos.dao.CoreLogMessage;
import com.tiesheng.web.mapper.CoreLogMessageMapper;
import com.tiesheng.web.pojos.dao.CoreLogMessage;
import com.tiesheng.message.pojos.MessageReqResp;
import com.tiesheng.message.pojos.UserChannel;
import com.tiesheng.message.service.TieshengMessageSender;

View File

@@ -1,8 +1,8 @@
package com.tiesheng.core.service;
package com.tiesheng.web.service;
import cn.hutool.core.util.StrUtil;
import com.tiesheng.core.mapper.CorePlatformUniqueMapper;
import com.tiesheng.core.pojos.dao.CorePlatformUnique;
import com.tiesheng.web.mapper.CorePlatformUniqueMapper;
import com.tiesheng.web.pojos.dao.CorePlatformUnique;
import com.tiesheng.util.pojos.TokenBean;
import com.tiesheng.login.pojos.DoLoginInfo;
import com.tiesheng.login.service.TieshengLoginConfigurer;

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.service;
package com.tiesheng.web.service;
import cn.hutool.core.io.FileTypeUtil;
import cn.hutool.core.io.FileUtil;

View File

@@ -1,9 +1,9 @@
package com.tiesheng.core.service;
package com.tiesheng.web.service;
import cn.hutool.log.LogFactory;
import com.tiesheng.core.pojos.RequestUserInfo;
import com.tiesheng.core.pojos.dao.CoreConfigSystem;
import com.tiesheng.core.pojos.dao.CorePlatformUnique;
import com.tiesheng.web.pojos.RequestUserInfo;
import com.tiesheng.web.pojos.dao.CoreConfigSystem;
import com.tiesheng.web.pojos.dao.CorePlatformUnique;
import com.tiesheng.util.pojos.TokenBean;
import com.tiesheng.util.ServletKit;
import com.tiesheng.util.exception.ApiRespEnum;

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.service;
package com.tiesheng.web.service;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.servlet.ServletUtil;

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.util;
package com.tiesheng.web.util;
import java.util.List;

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.util;
package com.tiesheng.web.util;
public interface ProcessSyncConsumer {