[fix]

合并冲突文件

application-webadmin/src/main/java/com/tourism/webadmin/app/website/controller/LoginToWebsiteController.java

@@ -14,13 +14,19 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.code.kaptcha.Producer;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.tourism.common.additional.constant.CacheConstants;
 import com.tourism.common.additional.constant.Constants;
 import com.tourism.common.additional.sign.Base64;
 import com.tourism.common.additional.uuid.IdUtils;
+import com.tourism.common.core.annotation.DisableDataFilter;
+import com.tourism.common.core.annotation.MyRequestBody;
 import com.tourism.common.core.constant.ApplicationConstant;
 import com.tourism.common.core.constant.ErrorCodeEnum;
-import com.tourism.common.core.object.*;
+import com.tourism.common.core.object.LoginUserInfo;
+import com.tourism.common.core.object.ResponseResult;
+import com.tourism.common.core.object.TokenData;
 import com.tourism.common.core.upload.BaseUpDownloader;
 import com.tourism.common.core.upload.UpDownloaderFactory;
 import com.tourism.common.core.upload.UploadResponseInfo;
@@ -31,24 +37,22 @@ import com.tourism.common.log.model.constant.SysOperationLogType;
 import com.tourism.common.redis.cache.SessionCacheHelper;
 import com.tourism.common.satoken.util.SaTokenUtil;
 import com.tourism.webadmin.app.website.dto.CheckImageDto;
+import com.tourism.webadmin.app.website.dto.TourUserRegisterDto;
+import com.tourism.webadmin.app.website.service.LoginToWebsiteService;
 import com.tourism.webadmin.app.website.vo.WebSiteCaptchaImageVo;
 import com.tourism.webadmin.back.dto.TourBookInfoDto;
-import com.tourism.webadmin.app.website.dto.TourUserRegisterDto;
 import com.tourism.webadmin.back.model.TourBookInfo;
 import com.tourism.webadmin.back.model.TourCountryCode;
 import com.tourism.webadmin.back.model.TourUser;
 import com.tourism.webadmin.back.model.constant.TourUserStatus;
-import com.tourism.webadmin.app.website.service.LoginToWebsiteService;
 import com.tourism.webadmin.back.service.TourCountryCodeService;
 import com.tourism.webadmin.back.service.TourUserService;
 import com.tourism.webadmin.back.service.impl.TourBookInfoServiceImpl;
 import com.tourism.webadmin.back.util.SMSUtils;
-import com.tourism.common.additional.config.ApplicationConfig;
 import com.tourism.webadmin.config.SmsSwitch;
 import com.tourism.webadmin.upms.model.SysUser;
 import io.jsonwebtoken.lang.Collections;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import com.tourism.common.core.annotation.DisableDataFilter;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -63,7 +67,8 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.FastByteArrayOutputStream;
 import org.springframework.web.bind.annotation.*;
-import com.google.code.kaptcha.Producer;
+import org.springframework.web.multipart.MultipartFile;
+
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
@@ -74,9 +79,6 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import com.tourism.common.core.annotation.MyRequestBody;
-import org.springframework.web.multipart.MultipartFile;
-
 /**
  * 登录接口控制器类。
  *