Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

jeecg-mall-api/src/main/java/org/jeecg/com/util/ThirdSessionHolder.java

@@ -2,7 +2,7 @@ package org.jeecg.com.util;
 
 import com.alibaba.ttl.TransmittableThreadLocal;
 import lombok.experimental.UtilityClass;
-import org.jeecg.modules.wxuser.entity.ThirdSession;
+import org.jeecg.modules.wxuser.dto.ThirdSession;
 
 /**
  * sessionToken工具类

jeecg-mall-api/src/main/java/org/jeecg/interceptor/ThirdSessionInterceptor.java

@@ -3,32 +3,22 @@ package org.jeecg.interceptor;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-import com.alibaba.druid.support.json.JSONUtils;
-import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authc.AuthenticationException;
 import org.jeecg.annotation.ApiLogin;
 import org.jeecg.com.util.ThirdSessionHolder;
 import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.exception.JeecgBoot401Exception;
-import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.TenantContextHolder;
-import org.jeecg.modules.wxuser.entity.ThirdSession;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.http.MediaType;
+import org.jeecg.modules.wxuser.dto.ThirdSession;
 import org.springframework.stereotype.Component;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.concurrent.TimeUnit;
 
 /**
  * ThirdSession拦截器，校验每个请求的ThirdSession

jeecg-mall-api/src/main/java/org/jeecg/modules/wxuser/entity/ThirdSession.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.wxuser.entity;
+package org.jeecg.modules.wxuser.dto;
 
 import lombok.Data;
 

jeecg-mall-api/src/main/java/org/jeecg/modules/wxuser/service/impl/UserInfoServiceImpl.java

@@ -19,7 +19,7 @@ import org.jeecg.common.util.TenantContextHolder;
 import org.jeecg.modules.mall.entity.MallUserInfo;
 import org.jeecg.modules.wxuser.dto.LoginDto;
 import org.jeecg.modules.wxuser.dto.WxOpenDataDto;
-import org.jeecg.modules.wxuser.entity.ThirdSession;
+import org.jeecg.modules.wxuser.dto.ThirdSession;
 import org.jeecg.modules.mall.entity.WxAppConfig;
 import org.jeecg.modules.wxuser.entity.WxUser;
 import org.jeecg.modules.wxuser.mapper.UserInfoMapper;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/DTO/CesGoodStockRecordsDto.java

@@ -0,0 +1,6 @@
+package org.jeecg.modules.rooms.DTO;
+
+import org.jeecg.modules.rooms.entity.CesGoodStockRecords;
+
+public class CesGoodStockRecordsDto extends CesGoodStockRecords {
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/controller/CesGoodStockRecordsController.java

@@ -8,13 +8,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.Enum.ResultCode;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.modules.rooms.entity.CesGoodStockRecords;
-import org.jeecg.modules.rooms.entity.CesGoodStockRecordsDto;
+import org.jeecg.modules.rooms.DTO.CesGoodStockRecordsDto;
 import org.jeecg.modules.rooms.service.CesGoodStockRecordsServiceImpl;
 import org.springframework.web.bind.annotation.*;
 
-import org.springframework.stereotype.Controller;
-
 import javax.annotation.Resource;
 
 /**

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/entity/CesGoodStockRecordsDto.java

@@ -1,4 +0,0 @@
-package org.jeecg.modules.rooms.entity;
-
-public class CesGoodStockRecordsDto extends CesGoodStockRecords{
-}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/service/CesGoodStockRecordsServiceImpl.java

@@ -7,7 +7,7 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.modules.rooms.entity.CesGoodStockRecords;
-import org.jeecg.modules.rooms.entity.CesGoodStockRecordsDto;
+import org.jeecg.modules.rooms.DTO.CesGoodStockRecordsDto;
 import org.jeecg.modules.rooms.entity.CesGoods;
 import org.jeecg.modules.rooms.mapper.CesGoodStockRecordsMapper;
 import org.slf4j.Logger;