فهرست منبع

refactor:后端项目,业务模块,使用公共模块中的实体,修改使用的实体位置

yang yi 10 ماه پیش
والد
کامیت
ad3feb032a
24فایلهای تغییر یافته به همراه68 افزوده شده و 67 حذف شده
  1. 2 1
      open-api/src/main/java/space/anyi/openapi/OpenApiApplication.java
  2. 11 11
      src/main/java/space/anyi/openAPI/controller/InterfaceInfoController.java
  3. 6 6
      src/main/java/space/anyi/openAPI/controller/InterfaceParamController.java
  4. 9 9
      src/main/java/space/anyi/openAPI/controller/UserController.java
  5. 1 1
      src/main/java/space/anyi/openAPI/exception/SystemException.java
  6. 2 2
      src/main/java/space/anyi/openAPI/filter/JWTAuthenticationTokenFilter.java
  7. 1 1
      src/main/java/space/anyi/openAPI/handler/exception/GlobalExceptionHandler.java
  8. 1 1
      src/main/java/space/anyi/openAPI/handler/security/AccessDeniedHandlerImpl.java
  9. 1 1
      src/main/java/space/anyi/openAPI/handler/security/AuthenticationEntryPointImpl.java
  10. 1 1
      src/main/java/space/anyi/openAPI/mapper/InterfaceInfoMapper.java
  11. 1 1
      src/main/java/space/anyi/openAPI/mapper/InterfaceParamMapper.java
  12. 1 1
      src/main/java/space/anyi/openAPI/mapper/UserInterfaceInfoMapper.java
  13. 1 1
      src/main/java/space/anyi/openAPI/mapper/UserMapper.java
  14. 6 6
      src/main/java/space/anyi/openAPI/service/impl/InterfaceInfoServiceImpl.java
  15. 4 4
      src/main/java/space/anyi/openAPI/service/impl/InterfaceParamServiceImpl.java
  16. 1 1
      src/main/java/space/anyi/openAPI/service/impl/PermissionServiceImpl.java
  17. 3 3
      src/main/java/space/anyi/openAPI/service/impl/UserDetailsServiceImpl.java
  18. 3 3
      src/main/java/space/anyi/openAPI/service/impl/UserInterfaceInfoServiceImpl.java
  19. 8 8
      src/main/java/space/anyi/openAPI/service/impl/UserServiceImpl.java
  20. 1 1
      src/main/java/space/anyi/openAPI/util/SecurityUtils.java
  21. 1 1
      src/main/resources/mapper/InterfaceInfoMapper.xml
  22. 1 1
      src/main/resources/mapper/InterfaceParamMapper.xml
  23. 1 1
      src/main/resources/mapper/UserInterfaceInfoMapper.xml
  24. 1 1
      src/main/resources/mapper/UserMapper.xml

+ 2 - 1
open-api/src/main/java/space/anyi/openapi/OpenApiApplication.java

@@ -2,8 +2,9 @@ package space.anyi.openapi;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 public class OpenApiApplication {
 
     public static void main(String[] args) {

+ 11 - 11
src/main/java/space/anyi/openAPI/controller/InterfaceInfoController.java

@@ -6,17 +6,17 @@ import io.swagger.annotations.ApiImplicitParams;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import space.anyi.client.OpenAPIClient;
-import space.anyi.openAPI.model.PageVO;
-import space.anyi.openAPI.model.ResponseResult;
-import space.anyi.openAPI.model.commom.RequestID;
-import space.anyi.openAPI.model.interfaceInfo.InterfaceInfo;
-import space.anyi.openAPI.model.interfaceInfo.InterfaceStatus;
-import space.anyi.openAPI.model.interfaceInfo.dto.RequestAddInterfaceInfo;
-import space.anyi.openAPI.model.interfaceInfo.dto.RequestPageInterfaceInfo;
-import space.anyi.openAPI.model.interfaceInfo.dto.RequestUpdateInterfaceInfo;
-import space.anyi.openAPI.model.interfaceInfo.vo.InterfaceInfoVO;
-import space.anyi.openAPI.model.interfaceParam.dto.RequestOnlineDebugParam;
-import space.anyi.openAPI.service.InterfaceInfoService;
+import space.anyi.openAPI.comom.model.commom.PageVO;
+import space.anyi.openAPI.comom.model.commom.RequestID;
+import space.anyi.openAPI.comom.model.commom.ResponseResult;
+import space.anyi.openAPI.comom.model.interfaceInfo.InterfaceInfo;
+import space.anyi.openAPI.comom.model.interfaceInfo.InterfaceStatus;
+import space.anyi.openAPI.comom.model.interfaceInfo.dto.RequestAddInterfaceInfo;
+import space.anyi.openAPI.comom.model.interfaceInfo.dto.RequestPageInterfaceInfo;
+import space.anyi.openAPI.comom.model.interfaceInfo.dto.RequestUpdateInterfaceInfo;
+import space.anyi.openAPI.comom.model.interfaceInfo.vo.InterfaceInfoVO;
+import space.anyi.openAPI.comom.model.interfaceParam.dto.RequestOnlineDebugParam;
+import space.anyi.openAPI.comom.service.InterfaceInfoService;
 import space.anyi.openAPI.util.BeanCopyUtil;
 import space.anyi.openAPI.util.SecurityUtils;
 

+ 6 - 6
src/main/java/space/anyi/openAPI/controller/InterfaceParamController.java

@@ -4,12 +4,12 @@ import cn.hutool.core.util.IdUtil;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import org.springframework.web.bind.annotation.*;
-import space.anyi.openAPI.model.ResponseResult;
-import space.anyi.openAPI.model.interfaceParam.InterfaceParam;
-import space.anyi.openAPI.model.interfaceParam.dto.RequestAddInterfaceParam;
-import space.anyi.openAPI.model.interfaceParam.dto.RequestUpdateInterfaceParam;
-import space.anyi.openAPI.model.interfaceParam.vo.InterfaceParamVO;
-import space.anyi.openAPI.service.InterfaceParamService;
+import space.anyi.openAPI.comom.model.commom.ResponseResult;
+import space.anyi.openAPI.comom.model.interfaceParam.InterfaceParam;
+import space.anyi.openAPI.comom.model.interfaceParam.dto.RequestAddInterfaceParam;
+import space.anyi.openAPI.comom.model.interfaceParam.dto.RequestUpdateInterfaceParam;
+import space.anyi.openAPI.comom.model.interfaceParam.vo.InterfaceParamVO;
+import space.anyi.openAPI.comom.service.InterfaceParamService;
 import space.anyi.openAPI.util.BeanCopyUtil;
 import space.anyi.openAPI.util.SecurityUtils;
 

+ 9 - 9
src/main/java/space/anyi/openAPI/controller/UserController.java

@@ -8,15 +8,15 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
-import space.anyi.openAPI.model.PageVO;
-import space.anyi.openAPI.model.ResponseResult;
-import space.anyi.openAPI.model.user.LoginUserDetails;
-import space.anyi.openAPI.model.user.User;
-import space.anyi.openAPI.model.user.dto.RequestLoginUser;
-import space.anyi.openAPI.model.user.dto.RequestRegisterUser;
-import space.anyi.openAPI.model.user.dto.UserDTO;
-import space.anyi.openAPI.model.user.vo.UserVO;
-import space.anyi.openAPI.service.UserService;
+import space.anyi.openAPI.comom.model.commom.PageVO;
+import space.anyi.openAPI.comom.model.commom.ResponseResult;
+import space.anyi.openAPI.comom.model.user.User;
+import space.anyi.openAPI.comom.model.user.dto.RequestLoginUser;
+import space.anyi.openAPI.comom.model.user.dto.RequestRegisterUser;
+import space.anyi.openAPI.comom.model.user.dto.UserDTO;
+import space.anyi.openAPI.comom.model.user.vo.UserVO;
+import space.anyi.openAPI.comom.service.UserService;
+import space.anyi.openAPI.model.LoginUserDetails;
 import space.anyi.openAPI.util.BeanCopyUtil;
 import space.anyi.openAPI.util.SecurityUtils;
 

+ 1 - 1
src/main/java/space/anyi/openAPI/exception/SystemException.java

@@ -1,7 +1,7 @@
 package space.anyi.openAPI.exception;
 
 
-import space.anyi.openAPI.model.ResponseResult;
+import space.anyi.openAPI.comom.model.commom.ResponseResult;
 
 /**
  * @ProjectName: BI

+ 2 - 2
src/main/java/space/anyi/openAPI/filter/JWTAuthenticationTokenFilter.java

@@ -12,9 +12,9 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 import org.springframework.web.filter.OncePerRequestFilter;
+import space.anyi.openAPI.comom.model.commom.ResponseResult;
 import space.anyi.openAPI.constant.SystemConstants;
-import space.anyi.openAPI.model.ResponseResult;
-import space.anyi.openAPI.model.user.LoginUserDetails;
+import space.anyi.openAPI.model.LoginUserDetails;
 import space.anyi.openAPI.util.JwtUtil;
 import space.anyi.openAPI.util.WebUtils;
 

+ 1 - 1
src/main/java/space/anyi/openAPI/handler/exception/GlobalExceptionHandler.java

@@ -4,8 +4,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
+import space.anyi.openAPI.comom.model.commom.ResponseResult;
 import space.anyi.openAPI.exception.SystemException;
-import space.anyi.openAPI.model.ResponseResult;
 
 /**
  * @ProjectName: BI

+ 1 - 1
src/main/java/space/anyi/openAPI/handler/security/AccessDeniedHandlerImpl.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.web.access.AccessDeniedHandler;
 import org.springframework.stereotype.Component;
-import space.anyi.openAPI.model.ResponseResult;
+import space.anyi.openAPI.comom.model.commom.ResponseResult;
 import space.anyi.openAPI.util.WebUtils;
 
 import javax.annotation.Resource;

+ 1 - 1
src/main/java/space/anyi/openAPI/handler/security/AuthenticationEntryPointImpl.java

@@ -6,7 +6,7 @@ import org.springframework.security.authentication.InternalAuthenticationService
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.stereotype.Component;
-import space.anyi.openAPI.model.ResponseResult;
+import space.anyi.openAPI.comom.model.commom.ResponseResult;
 import space.anyi.openAPI.util.WebUtils;
 
 import javax.annotation.Resource;

+ 1 - 1
src/main/java/space/anyi/openAPI/mapper/InterfaceInfoMapper.java

@@ -1,7 +1,7 @@
 package space.anyi.openAPI.mapper;
 
-import space.anyi.openAPI.model.interfaceInfo.InterfaceInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import space.anyi.openAPI.comom.model.interfaceInfo.InterfaceInfo;
 
 /**
 * @author 杨逸

+ 1 - 1
src/main/java/space/anyi/openAPI/mapper/InterfaceParamMapper.java

@@ -1,7 +1,7 @@
 package space.anyi.openAPI.mapper;
 
-import space.anyi.openAPI.model.interfaceParam.InterfaceParam;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import space.anyi.openAPI.comom.model.interfaceParam.InterfaceParam;
 
 /**
 * @author 杨逸

+ 1 - 1
src/main/java/space/anyi/openAPI/mapper/UserInterfaceInfoMapper.java

@@ -1,7 +1,7 @@
 package space.anyi.openAPI.mapper;
 
-import space.anyi.openAPI.model.userInterfaceInfo.UserInterfaceInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import space.anyi.openAPI.comom.model.userInterfaceInfo.UserInterfaceInfo;
 
 /**
 * @author 杨逸

+ 1 - 1
src/main/java/space/anyi/openAPI/mapper/UserMapper.java

@@ -2,7 +2,7 @@ package space.anyi.openAPI.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import space.anyi.openAPI.model.user.User;
+import space.anyi.openAPI.comom.model.user.User;
 
 /**
 * @author 杨逸

+ 6 - 6
src/main/java/space/anyi/openAPI/service/impl/InterfaceInfoServiceImpl.java

@@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.util.StringUtils;
-import space.anyi.openAPI.model.PageVO;
-import space.anyi.openAPI.model.interfaceInfo.InterfaceInfo;
-import space.anyi.openAPI.model.interfaceInfo.dto.RequestPageInterfaceInfo;
-import space.anyi.openAPI.model.interfaceInfo.vo.InterfaceInfoVO;
-import space.anyi.openAPI.service.InterfaceInfoService;
+import space.anyi.openAPI.comom.model.commom.PageVO;
+import space.anyi.openAPI.comom.model.interfaceInfo.InterfaceInfo;
+import space.anyi.openAPI.comom.model.interfaceInfo.dto.RequestPageInterfaceInfo;
+import space.anyi.openAPI.comom.model.interfaceInfo.vo.InterfaceInfoVO;
+import space.anyi.openAPI.comom.service.InterfaceInfoService;
 import space.anyi.openAPI.mapper.InterfaceInfoMapper;
 import org.springframework.stereotype.Service;
 
@@ -23,7 +23,7 @@ import java.util.stream.Collectors;
 */
 @Service
 public class InterfaceInfoServiceImpl extends ServiceImpl<InterfaceInfoMapper, InterfaceInfo>
-    implements InterfaceInfoService{
+    implements InterfaceInfoService {
 
     @Override
     public PageVO listPage(RequestPageInterfaceInfo requestPageInterfaceInfo) {

+ 4 - 4
src/main/java/space/anyi/openAPI/service/impl/InterfaceParamServiceImpl.java

@@ -3,10 +3,10 @@ package space.anyi.openAPI.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import space.anyi.openAPI.comom.model.interfaceParam.InterfaceParam;
+import space.anyi.openAPI.comom.model.interfaceParam.vo.InterfaceParamVO;
+import space.anyi.openAPI.comom.service.InterfaceParamService;
 import space.anyi.openAPI.mapper.InterfaceParamMapper;
-import space.anyi.openAPI.model.interfaceParam.InterfaceParam;
-import space.anyi.openAPI.model.interfaceParam.vo.InterfaceParamVO;
-import space.anyi.openAPI.service.InterfaceParamService;
 import space.anyi.openAPI.util.BeanCopyUtil;
 
 import java.util.List;
@@ -19,7 +19,7 @@ import java.util.stream.Collectors;
 */
 @Service
 public class InterfaceParamServiceImpl extends ServiceImpl<InterfaceParamMapper, InterfaceParam>
-    implements InterfaceParamService{
+    implements InterfaceParamService {
 
     @Override
     public List<InterfaceParamVO> getInterfaceParamByInterfaceInfoId(Long interfaceInfoId) {

+ 1 - 1
src/main/java/space/anyi/openAPI/service/impl/PermissionServiceImpl.java

@@ -1,7 +1,7 @@
 package space.anyi.openAPI.service.impl;
 
 import org.springframework.stereotype.Service;
-import space.anyi.openAPI.service.PermissionService;
+import space.anyi.openAPI.comom.service.PermissionService;
 import space.anyi.openAPI.util.SecurityUtils;
 
 /**

+ 3 - 3
src/main/java/space/anyi/openAPI/service/impl/UserDetailsServiceImpl.java

@@ -5,11 +5,11 @@ import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
+import space.anyi.openAPI.comom.model.commom.ResponseResult;
+import space.anyi.openAPI.comom.model.user.User;
 import space.anyi.openAPI.exception.SystemException;
 import space.anyi.openAPI.mapper.UserMapper;
-import space.anyi.openAPI.model.ResponseResult;
-import space.anyi.openAPI.model.user.LoginUserDetails;
-import space.anyi.openAPI.model.user.User;
+import space.anyi.openAPI.model.LoginUserDetails;
 
 import javax.annotation.Resource;
 import java.util.Objects;

+ 3 - 3
src/main/java/space/anyi/openAPI/service/impl/UserInterfaceInfoServiceImpl.java

@@ -1,8 +1,8 @@
 package space.anyi.openAPI.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import space.anyi.openAPI.model.userInterfaceInfo.UserInterfaceInfo;
-import space.anyi.openAPI.service.UserInterfaceInfoService;
+import space.anyi.openAPI.comom.model.userInterfaceInfo.UserInterfaceInfo;
+import space.anyi.openAPI.comom.service.UserInterfaceInfoService;
 import space.anyi.openAPI.mapper.UserInterfaceInfoMapper;
 import org.springframework.stereotype.Service;
 
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
 */
 @Service
 public class UserInterfaceInfoServiceImpl extends ServiceImpl<UserInterfaceInfoMapper, UserInterfaceInfo>
-    implements UserInterfaceInfoService{
+    implements UserInterfaceInfoService {
 
 }
 

+ 8 - 8
src/main/java/space/anyi/openAPI/service/impl/UserServiceImpl.java

@@ -15,17 +15,17 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
+import space.anyi.openAPI.comom.model.commom.PageVO;
+import space.anyi.openAPI.comom.model.commom.ResponseResult;
+import space.anyi.openAPI.comom.model.user.User;
+import space.anyi.openAPI.comom.model.user.UserInfo;
+import space.anyi.openAPI.comom.model.user.dto.UserDTO;
+import space.anyi.openAPI.comom.model.user.vo.UserVO;
+import space.anyi.openAPI.comom.service.UserService;
 import space.anyi.openAPI.constant.SystemConstants;
 import space.anyi.openAPI.exception.SystemException;
 import space.anyi.openAPI.mapper.UserMapper;
-import space.anyi.openAPI.model.PageVO;
-import space.anyi.openAPI.model.ResponseResult;
-import space.anyi.openAPI.model.user.LoginUserDetails;
-import space.anyi.openAPI.model.user.User;
-import space.anyi.openAPI.model.user.UserInfo;
-import space.anyi.openAPI.model.user.dto.UserDTO;
-import space.anyi.openAPI.model.user.vo.UserVO;
-import space.anyi.openAPI.service.UserService;
+import space.anyi.openAPI.model.LoginUserDetails;
 import space.anyi.openAPI.util.BeanCopyUtil;
 import space.anyi.openAPI.util.JwtUtil;
 import space.anyi.openAPI.util.SecurityUtils;

+ 1 - 1
src/main/java/space/anyi/openAPI/util/SecurityUtils.java

@@ -2,7 +2,7 @@ package space.anyi.openAPI.util;
 
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
-import space.anyi.openAPI.model.user.LoginUserDetails;
+import space.anyi.openAPI.model.LoginUserDetails;
 
 import java.util.Objects;
 

+ 1 - 1
src/main/resources/mapper/InterfaceInfoMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="space.anyi.openAPI.mapper.InterfaceInfoMapper">
 
-    <resultMap id="BaseResultMap" type="space.anyi.openAPI.model.interfaceInfo.InterfaceInfo">
+    <resultMap id="BaseResultMap" type="space.anyi.openAPI.comom.model.interfaceInfo.InterfaceInfo">
             <id property="id" column="id" jdbcType="BIGINT"/>
             <result property="name" column="name" jdbcType="VARCHAR"/>
             <result property="description" column="description" jdbcType="VARCHAR"/>

+ 1 - 1
src/main/resources/mapper/InterfaceParamMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="space.anyi.openAPI.mapper.InterfaceParamMapper">
 
-    <resultMap id="BaseResultMap" type="space.anyi.openAPI.model.interfaceParam.InterfaceParam">
+    <resultMap id="BaseResultMap" type="space.anyi.openAPI.comom.model.interfaceParam.InterfaceParam">
             <id property="id" column="id" jdbcType="BIGINT"/>
             <result property="interfaceInfoId" column="interface_info_id" jdbcType="BIGINT"/>
             <result property="name" column="name" jdbcType="VARCHAR"/>

+ 1 - 1
src/main/resources/mapper/UserInterfaceInfoMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="space.anyi.openAPI.mapper.UserInterfaceInfoMapper">
 
-    <resultMap id="BaseResultMap" type="space.anyi.openAPI.model.userInterfaceInfo.UserInterfaceInfo">
+    <resultMap id="BaseResultMap" type="space.anyi.openAPI.comom.model.userInterfaceInfo.UserInterfaceInfo">
             <id property="id" column="id" jdbcType="BIGINT"/>
             <result property="userId" column="user_id" jdbcType="BIGINT"/>
             <result property="interfaceInfoId" column="interface_info_id" jdbcType="BIGINT"/>

+ 1 - 1
src/main/resources/mapper/UserMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="space.anyi.openAPI.mapper.UserMapper">
 
-    <resultMap id="BaseResultMap" type="space.anyi.openAPI.model.user.User">
+    <resultMap id="BaseResultMap" type="space.anyi.openAPI.comom.model.user.User">
             <id property="id" column="id" jdbcType="BIGINT"/>
             <result property="userAccount" column="user_account" jdbcType="VARCHAR"/>
             <result property="userPassword" column="user_password" jdbcType="VARCHAR"/>