();
+ hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
+ hints.put(EncodeHintType.CHARACTER_SET, CHARSET);
+ hints.put(EncodeHintType.MARGIN, 1);
+ BitMatrix bitMatrix = new MultiFormatWriter().encode(content,
+ BarcodeFormat.QR_CODE, size, size, hints);
+ int width = bitMatrix.getWidth();
+ int height = bitMatrix.getHeight();
+ BufferedImage image = new BufferedImage(width, height,
+ BufferedImage.TYPE_INT_RGB);
+ for (int x = 0; x < width; x++) {
+ for (int y = 0; y < height; y++) {
+ image.setRGB(x, y, bitMatrix.get(x, y) ? BLUE_FOREGROUND_COLOR
+ : 0xFFFFFFFF);
+ }
+ }
+ // 从classpath读取LOGO图片并插入二维码中间
+ InputStream logoStream = QRCodeUtil.class.getClassLoader().getResourceAsStream(EMBEDDED_LOGO_PATH);
+ if (logoStream != null) {
+ Image logo = ImageIO.read(logoStream);
+ logoStream.close();
+ int logoWidth = Math.min(logo.getWidth(null), 100);
+ int logoHeight = Math.min(logo.getHeight(null), 100);
+ Image scaledLogo = logo.getScaledInstance(logoWidth, logoHeight, Image.SCALE_SMOOTH);
+ Graphics2D graph = image.createGraphics();
+ int x = (size - logoWidth) / 2;
+ int y = (size - logoHeight) / 2;
+ graph.drawImage(scaledLogo, x, y, logoWidth, logoHeight, null);
+ Shape shape = new RoundRectangle2D.Float(x, y, logoWidth, logoHeight, 6, 6);
+ graph.setStroke(new BasicStroke(3f));
+ graph.draw(shape);
+ graph.dispose();
+ }
+ return image;
+ }
+
+ public static MultipartFile getMultipartFile(File file) {
+ try (InputStream input = new FileInputStream(file)) {
+ return new MockMultipartFile(
+ "file", // 字段名
+ file.getName(), // 原始文件名
+ MediaType.IMAGE_JPEG_VALUE, // 文件类型
+ input.readAllBytes() // 文件内容
+ );
+ } catch (Exception e) {
+ throw new IllegalArgumentException("Invalid file: " + e, e);
+ }
+ }
+
+
+ public static void main(String[] args) throws Exception {
+ String text = "https://www.baidu.com/s?ie=UTF-8&wd=%E7%99%BE%E5%BA%A6";
+ //这里设置自定义网站url
+ String logoPath =null;
+ String destPath = "d:\\pic\\";
+// String url=QRCodeUtil.encode(text, logoPath, destPath, true);
+// System.out.println(url);
+
+
+ /* String file="D:\\11.jpg";
+ String info=QRCodeUtil.decode(file);
+ System.out.println(info);*/
+ // 将地址转换为二维码图片 base64编码返回给页面
+ String base64 = getBase64(text);
+ System.out.println("data:image/jpeg;base64," + base64);
+ }
+
+}
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/file/FileTypeUtils.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/file/FileTypeUtils.java
new file mode 100644
index 00000000..51028ce5
--- /dev/null
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/file/FileTypeUtils.java
@@ -0,0 +1,51 @@
+package com.zdxt.enforcementcode.common.util.file;
+
+
+
+import org.dromara.common.core.utils.StringUtils;
+
+import java.io.File;
+
+/**
+ * Created with IntelliJ IDEA.
+ * Description:
+ * User: ouyunhui
+ * Date: 2020-12-08
+ * Time: 15:59
+ */
+public class FileTypeUtils {
+ /**
+ * 获取文件类型
+ *
+ * 例如: ruoyi.txt, 返回: txt
+ *
+ * @param file 文件名
+ * @return 后缀（不含".")
+ */
+ public static String getFileType(File file)
+ {
+ if (null == file)
+ {
+ return StringUtils.EMPTY;
+ }
+ return getFileType(file.getName());
+ }
+
+ /**
+ * 获取文件类型
+ *
+ * 例如: ruoyi.txt, 返回: txt
+ *
+ * @param fileName 文件名
+ * @return 后缀（不含".")
+ */
+ public static String getFileType(String fileName)
+ {
+ int separatorIndex = fileName.lastIndexOf(".");
+ if (separatorIndex < 0)
+ {
+ return "";
+ }
+ return fileName.substring(separatorIndex + 1).toLowerCase();
+ }
+}
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/file/FileUploadUtils.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/file/FileUploadUtils.java
new file mode 100644
index 00000000..413bd0e0
--- /dev/null
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/file/FileUploadUtils.java
@@ -0,0 +1,252 @@
+package com.zdxt.enforcementcode.common.util.file;
+
+
+import com.zdxt.enforcementcode.common.Constants;
+import com.zdxt.enforcementcode.common.config.RuoYiConfig;
+import com.zdxt.enforcementcode.common.util.Md5Utils;
+import com.zdxt.enforcementcode.exception.FileSizeLimitExceededException;
+import com.zdxt.enforcementcode.exception.InvalidExtensionException;
+import org.apache.commons.io.FilenameUtils;
+import org.dromara.common.core.exception.base.BaseException;
+import org.dromara.common.core.utils.DateUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * 文件上传工具类
+ *
+ * @author ruoyi
+ */
+public class FileUploadUtils
+{
+ /**
+ * 默认大小 50M
+ */
+ public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
+
+ /**
+ * 默认的文件名最大长度 100
+ */
+ public static final int DEFAULT_FILE_NAME_LENGTH = 100;
+
+ /**
+ * 常见的视频类型
+ */
+ public static final String VIDEO_TYPE = "rm|rmvb|wmv|avi|mp4|3gp|mkvrm|rmvb|avi|mp4|3gp|mkv";
+
+ /**
+ * 默认上传的地址
+ */
+ private static String defaultBaseDir = RuoYiConfig.getProfile();
+
+ private static int counter = 0;
+
+ public static void setDefaultBaseDir(String defaultBaseDir)
+ {
+ FileUploadUtils.defaultBaseDir = defaultBaseDir;
+ }
+
+ public static String getDefaultBaseDir()
+ {
+ return defaultBaseDir;
+ }
+
+ /**
+ * 以默认配置进行文件上传
+ *
+ * @param file 上传的文件
+ * @return 文件名称
+ * @throws Exception
+ */
+ public static final String upload(MultipartFile file) throws IOException
+ {
+ try
+ {
+ return upload(getDefaultBaseDir(), file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+ }
+ catch (Exception e)
+ {
+ throw new IOException(e.getMessage(), e);
+ }
+ }
+
+ /**
+ * 根据文件路径上传
+ *
+ * @param baseDir 相对应用的基目录
+ * @param file 上传的文件
+ * @return 文件名称
+ * @throws IOException`
+ */
+ public static final String upload(String baseDir, MultipartFile file) throws IOException
+ {
+ try
+ {
+ return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+ }
+ catch (Exception e)
+ {
+ throw new IOException(e.getMessage(), e);
+ }
+ }
+
+ /**
+ * 文件上传
+ *
+ * @param baseDir 相对应用的基目录
+ * @param file 上传的文件
+ * @return 返回上传成功的文件名
+ * @throws FileSizeLimitExceededException 如果超出最大大小
+ * @throws IOException 比如读写文件出错时
+ * @throws InvalidExtensionException 文件校验异常
+ */
+ public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension)
+ throws Exception
+ {
+ int fileNamelength = file.getOriginalFilename().length();
+ if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH)
+ {
+ throw new Exception("文件名称过长");
+ }
+
+ assertAllowed(file, allowedExtension);
+
+ String fileName = extractFilename(file);
+
+ File desc = getAbsoluteFile(baseDir, fileName);
+ file.transferTo(desc);
+ String pathFileName = getPathFileName(baseDir, fileName);
+ return pathFileName;
+ }
+
+ /**
+ * 编码文件名
+ */
+ public static final String extractFilename(MultipartFile file)
+ {
+ String fileName = file.getOriginalFilename();
+ String extension = getExtension(file);
+ fileName = DateUtils.datePath() + "/" + encodingFilename(fileName) + "." + extension;
+ return fileName;
+ }
+
+ private static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException
+ {
+ File desc = new File(uploadDir + File.separator + fileName);
+
+ if (!desc.getParentFile().exists())
+ {
+ desc.getParentFile().mkdirs();
+ }
+ if (!desc.exists())
+ {
+ desc.createNewFile();
+ }
+ return desc;
+ }
+
+ private static final String getPathFileName(String uploadDir, String fileName) throws IOException
+ {
+ int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
+ String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
+ String pathFileName = Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
+ return pathFileName;
+ }
+
+ /**
+ * 编码文件名
+ */
+ private static final String encodingFilename(String fileName)
+ {
+ fileName = fileName.replace("_", " ");
+ fileName = Md5Utils.hash(fileName + System.nanoTime() + counter++);
+ return fileName;
+ }
+
+ /**
+ * 文件大小校验
+ *
+ * @param file 上传的文件
+ * @return
+ */
+ public static final void assertAllowed(MultipartFile file, String[] allowedExtension)
+ throws Exception
+ {
+ long size = file.getSize();
+
+ int begin = file.getOriginalFilename().lastIndexOf(".");
+ int last = file.getOriginalFilename().length();
+ //获得文件后缀名
+ String a = file.getOriginalFilename().substring(begin+1, last);
+ if(VIDEO_TYPE.indexOf(a) == -1){ //判断是否是视频
+ if (DEFAULT_MAX_SIZE != -1 && size > DEFAULT_MAX_SIZE)
+ {
+ throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024);
+ }
+ }
+
+ String fileName = file.getOriginalFilename();
+ String extension = getExtension(file);
+ if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension))
+ {
+ if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION)
+ {
+ throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension,
+ fileName);
+ }
+ else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION)
+ {
+ throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension,
+ fileName);
+ }
+ else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION)
+ {
+ throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension,
+ fileName);
+ }
+ else
+ {
+ throw new InvalidExtensionException(allowedExtension, extension, fileName);
+ }
+ }
+
+ }
+
+ /**
+ * 判断MIME类型是否是允许的MIME类型
+ *
+ * @param extension
+ * @param allowedExtension
+ * @return
+ */
+ public static final boolean isAllowedExtension(String extension, String[] allowedExtension)
+ {
+ for (String str : allowedExtension)
+ {
+ if (str.equalsIgnoreCase(extension))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 获取文件名的后缀
+ *
+ * @param file 表单文件
+ * @return 后缀名
+ */
+ public static final String getExtension(MultipartFile file)
+ {
+ String extension = FilenameUtils.getExtension(file.getOriginalFilename());
+ if (StringUtils.isEmpty(extension))
+ {
+ extension = MimeTypeUtils.getExtension(file.getContentType());
+ }
+ return extension;
+ }
+}
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/file/FileUtils.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/file/FileUtils.java
new file mode 100644
index 00000000..4b588ece
--- /dev/null
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/file/FileUtils.java
@@ -0,0 +1,138 @@
+package com.zdxt.enforcementcode.common.util.file;
+
+
+import jakarta.servlet.http.HttpServletRequest;
+
+import java.io.*;
+import java.net.URLEncoder;
+
+/**
+ * 文件处理工具类
+ *
+ * @author ruoyi
+ */
+public class FileUtils
+{
+ public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+";
+
+ /**
+ * 输出指定文件的byte数组
+ *
+ * @param filePath 文件路径
+ * @param os 输出流
+ * @return
+ */
+ public static void writeBytes(String filePath, OutputStream os) throws IOException
+ {
+ FileInputStream fis = null;
+ try
+ {
+ File file = new File(filePath);
+ if (!file.exists())
+ {
+ throw new FileNotFoundException(filePath);
+ }
+ fis = new FileInputStream(file);
+ byte[] b = new byte[1024];
+ int length;
+ while ((length = fis.read(b)) > 0)
+ {
+ os.write(b, 0, length);
+ }
+ }
+ catch (IOException e)
+ {
+ throw e;
+ }
+ finally
+ {
+ if (os != null)
+ {
+ try
+ {
+ os.close();
+ }
+ catch (IOException e1)
+ {
+ e1.printStackTrace();
+ }
+ }
+ if (fis != null)
+ {
+ try
+ {
+ fis.close();
+ }
+ catch (IOException e1)
+ {
+ e1.printStackTrace();
+ }
+ }
+ }
+ }
+
+ /**
+ * 删除文件
+ *
+ * @param filePath 文件
+ * @return
+ */
+ public static boolean deleteFile(String filePath)
+ {
+ boolean flag = false;
+ File file = new File(filePath);
+ // 路径为文件且不为空则进行删除
+ if (file.isFile() && file.exists())
+ {
+ file.delete();
+ flag = true;
+ }
+ return flag;
+ }
+
+ /**
+ * 文件名称验证
+ *
+ * @param filename 文件名称
+ * @return true 正常 false 非法
+ */
+ public static boolean isValidFilename(String filename)
+ {
+ return filename.matches(FILENAME_PATTERN);
+ }
+
+ /**
+ * 下载文件名重新编码
+ *
+ * @param request 请求对象
+ * @param fileName 文件名
+ * @return 编码后的文件名
+ */
+ public static String setFileDownloadHeader(HttpServletRequest request, String fileName) throws UnsupportedEncodingException
+ {
+ final String agent = request.getHeader("USER-AGENT");
+ String filename = fileName;
+ if (agent.contains("MSIE"))
+ {
+ // IE浏览器
+ filename = URLEncoder.encode(filename, "utf-8");
+ filename = filename.replace("+", " ");
+ }
+ else if (agent.contains("Firefox"))
+ {
+ // 火狐浏览器
+ filename = new String(fileName.getBytes(), "ISO8859-1");
+ }
+ else if (agent.contains("Chrome"))
+ {
+ // google浏览器
+ filename = URLEncoder.encode(filename, "utf-8");
+ }
+ else
+ {
+ // 其它浏览器
+ filename = URLEncoder.encode(filename, "utf-8");
+ }
+ return filename;
+ }
+}
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/file/MimeTypeUtils.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/file/MimeTypeUtils.java
new file mode 100644
index 00000000..ce41ead2
--- /dev/null
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/file/MimeTypeUtils.java
@@ -0,0 +1,55 @@
+package com.zdxt.enforcementcode.common.util.file;
+
+/**
+ * 媒体类型工具类
+ *
+ * @author ruoyi
+ */
+public class MimeTypeUtils
+{
+ public static final String IMAGE_PNG = "image/png";
+
+ public static final String IMAGE_JPG = "image/jpg";
+
+ public static final String IMAGE_JPEG = "image/jpeg";
+
+ public static final String IMAGE_BMP = "image/bmp";
+
+ public static final String IMAGE_GIF = "image/gif";
+
+ public static final String[] IMAGE_EXTENSION = { "bmp", "gif", "jpg", "jpeg", "png" };
+
+ public static final String[] FLASH_EXTENSION = { "swf", "flv" };
+
+ public static final String[] MEDIA_EXTENSION = { "swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg",
+ "asf", "rm", "rmvb" };
+
+ public static final String[] DEFAULT_ALLOWED_EXTENSION = {
+ // 图片
+ "bmp", "gif", "jpg", "jpeg", "png",
+ // word excel powerpoint
+ "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
+ // 压缩文件
+ "rar", "zip", "gz", "bz2",
+ // pdf
+ "pdf","apk", "mp4" , "mkv"};
+
+ public static String getExtension(String prefix)
+ {
+ switch (prefix)
+ {
+ case IMAGE_PNG:
+ return "png";
+ case IMAGE_JPG:
+ return "jpg";
+ case IMAGE_JPEG:
+ return "jpeg";
+ case IMAGE_BMP:
+ return "bmp";
+ case IMAGE_GIF:
+ return "gif";
+ default:
+ return "";
+ }
+ }
+}
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseLoginController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseLoginController.java
index 9c61ca5f..c5abf117 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseLoginController.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseLoginController.java
@@ -1,18 +1,22 @@
package com.zdxt.enforcementcode.controller.app.enterprise;
+import cn.dev33.satoken.annotation.SaIgnore;
import com.zdxt.enforcementcode.domain.bo.enterprise.AppEnterpriseLoginBo;
import com.zdxt.enforcementcode.service.enterprise.IAppEnterpriseLoginService;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
+import java.util.Map;
+
/**
* 企业端-用户登录
*/
@@ -20,24 +24,20 @@ import org.springframework.web.bind.annotation.RestController;
@Validated
@RequiredArgsConstructor
@RestController
-@RequestMapping("/app-ent/login")
+@RequestMapping("/enterprise/login")
public class AppEnterpriseLoginController {
-
-
@Autowired
private IAppEnterpriseLoginService appEnterpriseLoginService;
/**
- * 企业端用户登录
+ * 企业端用户登录（深i企）
*/
+ @SaIgnore
@ApiResponse(description = "企业端-用户登录")
- @PostMapping("siqLogin")
- @ResponseBody
- public Boolean siqLogin(AppEnterpriseLoginBo bo){
-
- Boolean flag = appEnterpriseLoginService.addSiqUser(bo);
-
- return flag;
+ @PostMapping("/siqLogin")
+ public R> siqLogin(@RequestBody AppEnterpriseLoginBo bo){
+ Map result = appEnterpriseLoginService.siqLogin(bo);
+ return R.ok("登录成功", result);
}
}
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/common/FileController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/common/FileController.java
new file mode 100644
index 00000000..d0b6e6a8
--- /dev/null
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/common/FileController.java
@@ -0,0 +1,42 @@
+package com.zdxt.enforcementcode.controller.common;
+
+import com.zdxt.enforcementcode.service.common.FileUploadApi;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 文件上传 控制层
+ *
+ * @author Lion Li
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/common/file")
+public class FileController extends BaseController {
+
+ private final FileUploadApi fileUploadApi;
+
+ /**
+ * 上传文件
+ *
+ * @param file 文件
+ */
+ @Log(title = "文件上传", businessType = BusinessType.INSERT)
+ @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ public R upload(@RequestPart("file") MultipartFile file) {
+ String filePath = fileUploadApi.upload(file);
+ return R.ok("上传成功", filePath);
+ }
+
+}
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseInformation.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseInformation.java
index dce61e39..6cf66419 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseInformation.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseInformation.java
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial;
@@ -19,7 +20,7 @@ import java.io.Serial;
*/
@Data
@TableName("enterprise_information")
-public class EnterpriseInformation implements Serializable {
+public class EnterpriseInformation extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
@@ -34,13 +35,13 @@ public class EnterpriseInformation implements Serializable {
* 覆盖父类字段: 数据库中create_by存储的是人名字符串而非用户ID，跳过查询避免类型转换异常
*/
@TableField(value = "create_by", fill = FieldFill.INSERT)
- private String createBy;
+ private Long createBy;
/**
* 覆盖父类字段: 数据库中update_by存储的是人名字符串而非用户ID，跳过查询避免类型转换异常
*/
@TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE)
- private String updateBy;
+ private Long updateBy;
/**
* 企业名称
@@ -95,7 +96,7 @@ public class EnterpriseInformation implements Serializable {
/**
* 部门ID
*/
- private Long deptId;
+ private String deptId;
/**
* 二维码id
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/enterprise/AppEnterpriseLoginBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/enterprise/AppEnterpriseLoginBo.java
index d2d8dd8c..3b1a555f 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/enterprise/AppEnterpriseLoginBo.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/enterprise/AppEnterpriseLoginBo.java
@@ -8,7 +8,18 @@ import lombok.Data;
@JsonIgnoreProperties(ignoreUnknown = true)
public class AppEnterpriseLoginBo {
+ /**
+ * 用户ID
+ */
private String userId;
+
+ /**
+ * 用户名称
+ */
private String userName;
+
+ /**
+ * 用户码
+ */
private String code;
}
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/exception/FileException.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/exception/FileException.java
new file mode 100644
index 00000000..6fdbf96c
--- /dev/null
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/exception/FileException.java
@@ -0,0 +1,19 @@
+package com.zdxt.enforcementcode.exception;
+
+import org.dromara.common.core.exception.base.BaseException;
+
+/**
+ * 文件信息异常类
+ *
+ * @author ruoyi
+ */
+public class FileException extends BaseException
+{
+ private static final long serialVersionUID = 1L;
+
+ public FileException(String code, Object[] args)
+ {
+ super("file", code, args, null);
+ }
+
+}
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/exception/FileNameLengthLimitExceededException.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/exception/FileNameLengthLimitExceededException.java
new file mode 100644
index 00000000..b7ae9d0a
--- /dev/null
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/exception/FileNameLengthLimitExceededException.java
@@ -0,0 +1,16 @@
+package com.zdxt.enforcementcode.exception;
+
+/**
+ * 文件名称超长限制异常类
+ *
+ * @author ruoyi
+ */
+public class FileNameLengthLimitExceededException extends FileException
+{
+ private static final long serialVersionUID = 1L;
+
+ public FileNameLengthLimitExceededException(int defaultFileNameLength)
+ {
+ super("upload.filename.exceed.length", new Object[] { defaultFileNameLength });
+ }
+}
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/exception/FileSizeLimitExceededException.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/exception/FileSizeLimitExceededException.java
new file mode 100644
index 00000000..4a305d4a
--- /dev/null
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/exception/FileSizeLimitExceededException.java
@@ -0,0 +1,16 @@
+package com.zdxt.enforcementcode.exception;
+
+/**
+ * 文件名大小限制异常类
+ *
+ * @author ruoyi
+ */
+public class FileSizeLimitExceededException extends FileException
+{
+ private static final long serialVersionUID = 1L;
+
+ public FileSizeLimitExceededException(long defaultMaxSize)
+ {
+ super("upload.exceed.maxSize", new Object[] { defaultMaxSize });
+ }
+}
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/exception/InvalidExtensionException.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/exception/InvalidExtensionException.java
new file mode 100644
index 00000000..428bf56e
--- /dev/null
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/exception/InvalidExtensionException.java
@@ -0,0 +1,73 @@
+package com.zdxt.enforcementcode.exception;
+
+
+import org.apache.tomcat.util.http.fileupload.FileUploadException;
+
+import java.util.Arrays;
+
+/**
+ * 文件上传 误异常类
+ *
+ * @author ruoyi
+ */
+public class InvalidExtensionException extends FileUploadException
+{
+ private static final long serialVersionUID = 1L;
+
+ private String[] allowedExtension;
+ private String extension;
+ private String filename;
+
+ public InvalidExtensionException(String[] allowedExtension, String extension, String filename)
+ {
+ super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]");
+ this.allowedExtension = allowedExtension;
+ this.extension = extension;
+ this.filename = filename;
+ }
+
+ public String[] getAllowedExtension()
+ {
+ return allowedExtension;
+ }
+
+ public String getExtension()
+ {
+ return extension;
+ }
+
+ public String getFilename()
+ {
+ return filename;
+ }
+
+ public static class InvalidImageExtensionException extends InvalidExtensionException
+ {
+ private static final long serialVersionUID = 1L;
+
+ public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename)
+ {
+ super(allowedExtension, extension, filename);
+ }
+ }
+
+ public static class InvalidFlashExtensionException extends InvalidExtensionException
+ {
+ private static final long serialVersionUID = 1L;
+
+ public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename)
+ {
+ super(allowedExtension, extension, filename);
+ }
+ }
+
+ public static class InvalidMediaExtensionException extends InvalidExtensionException
+ {
+ private static final long serialVersionUID = 1L;
+
+ public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename)
+ {
+ super(allowedExtension, extension, filename);
+ }
+ }
+}
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/common/FileUploadApi.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/common/FileUploadApi.java
new file mode 100644
index 00000000..4c900c73
--- /dev/null
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/common/FileUploadApi.java
@@ -0,0 +1,28 @@
+package com.zdxt.enforcementcode.service.common;
+
+
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+/**
+ * 文件上传API
+ *
+ * @author QingWang.Li
+ * @date 2020/3/20 16:44
+ */
+
+@RestController
+public interface FileUploadApi {
+
+ /**
+ * 上传文件
+ *
+ * @param file 上传的文件
+ * @return 文件路径
+ * @throws IOException
+ */
+ String upload(MultipartFile file);
+
+}
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/common/impl/FileUploadApiImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/common/impl/FileUploadApiImpl.java
new file mode 100644
index 00000000..78a95949
--- /dev/null
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/common/impl/FileUploadApiImpl.java
@@ -0,0 +1,31 @@
+package com.zdxt.enforcementcode.service.common.impl;
+
+
+import com.zdxt.enforcementcode.common.util.file.FileUploadUtils;
+import com.zdxt.enforcementcode.service.common.FileUploadApi;
+import org.dromara.common.core.exception.base.BaseException;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+/**
+ * 文件上传API-实现类
+ *
+ * @author QingWang.Li
+ * @date 2020/3/20 16:50
+ */
+@Service
+public class FileUploadApiImpl implements FileUploadApi {
+
+ @Override
+ public String upload(MultipartFile file) {
+ String filePath = FileUploadUtils.getDefaultBaseDir();
+ try {
+ return FileUploadUtils.upload(filePath, file);
+ } catch (IOException e) {
+ throw new BaseException("上传失败");
+ }
+ }
+
+}
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/IAppEnterpriseLoginService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/IAppEnterpriseLoginService.java
index 4b9a179a..6fb1dd1c 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/IAppEnterpriseLoginService.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/IAppEnterpriseLoginService.java
@@ -4,12 +4,18 @@ import com.alibaba.fastjson.JSONObject;
import com.zdxt.enforcementcode.domain.bo.enterprise.AppEnterpriseLoginBo;
import org.dromara.system.domain.vo.SysUserVo;
+import java.util.Map;
+
/**
* 企业端-企业用户登录Service接口
*/
public interface IAppEnterpriseLoginService {
-
- Boolean addSiqUser(AppEnterpriseLoginBo bo);
+ /**
+ * 深I企登录
+ * @param bo 登录参数
+ * @return 登录结果，包含token和用户信息
+ */
+ Map siqLogin(AppEnterpriseLoginBo bo);
}
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java
index 74abde73..f799b7f9 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java
@@ -1,40 +1,57 @@
package com.zdxt.enforcementcode.service.enterprise.impl;
-import cn.hutool.core.util.ArrayUtil;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.digest.DigestUtil;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zdxt.enforcementcode.common.util.ApiConstants;
-import com.zdxt.enforcementcode.common.util.HttpUtil;
-import com.zdxt.enforcementcode.common.util.IdCardCryptoUtil;
-import com.zdxt.enforcementcode.common.util.UserConstants;
+import com.zdxt.enforcementcode.common.util.*;
import com.zdxt.enforcementcode.domain.EnterpriseInformation;
+import com.zdxt.enforcementcode.domain.EnterpriseUser;
+import com.zdxt.enforcementcode.domain.EnterpriseUserRef;
+import com.zdxt.enforcementcode.domain.bo.QrCodeGenerateHistoryBo;
import com.zdxt.enforcementcode.domain.bo.enterprise.AppEnterpriseLoginBo;
import com.zdxt.enforcementcode.mapper.EnterpriseInformationMapper;
+import com.zdxt.enforcementcode.mapper.EnterpriseUserMapper;
+import com.zdxt.enforcementcode.mapper.EnterpriseUserRefMapper;
+import com.zdxt.enforcementcode.service.IQrCodeGenerateHistoryService;
+import com.zdxt.enforcementcode.service.common.FileUploadApi;
import com.zdxt.enforcementcode.service.enterprise.IAppEnterpriseLoginService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.exception.base.BaseException;
import org.dromara.common.core.utils.DateUtils;
import org.dromara.common.core.utils.StringUtils;
-import org.dromara.system.domain.SysUser;
-import org.dromara.system.domain.SysUserPost;
-import org.dromara.system.domain.SysUserRole;
-import org.dromara.system.domain.vo.SysUserVo;
-import org.dromara.system.mapper.SysUserMapper;
+import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.system.mapper.SysUserPostMapper;
import org.dromara.system.mapper.SysUserRoleMapper;
+import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.File;
import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
/**
* 企业端-登录Service业务层处理
+ *
+ * 实现深i企第三方登录的完整业务流程，使用 Redis 分布式锁防止并发注册
+ *
+ *
+ * @author Lion Li
+ * @date 2026-05-09
*/
@Slf4j
@RequiredArgsConstructor
@@ -43,14 +60,15 @@ public class AppEnterpriseLoginServiceImpl implements IAppEnterpriseLoginService
@Value("${siq.code}")
private String code;
+
@Value("${siq.secretKey}")
private String secretKey;
+
@Value("${siq.siqUrl}")
private String siqUrl;
-
@Autowired
- private SysUserMapper sysUserMapper;
+ private RedissonClient redissonClient;
@Autowired
private SysUserPostMapper sysUserPostMapper;
@@ -61,261 +79,461 @@ public class AppEnterpriseLoginServiceImpl implements IAppEnterpriseLoginService
@Autowired
private EnterpriseInformationMapper enterpriseInformationMapper;
+ @Autowired
+ private EnterpriseUserMapper enterpriseUserMapper;
+
+ @Autowired
+ private EnterpriseUserRefMapper enterpriseUserRefMapper;
+
+ @Autowired
+ private IQrCodeGenerateHistoryService iQrCodeGenerateHistoryService;
+
+
+ @Autowired
+ private FileUploadApi fileUploadApi;
+
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+
+ @Value("${sjdm.profile}")
+ private String filePath;
+
+ @Value("${sjdm.qr_code_url}")
+ private String qrCodeUrl;
+
+ @Value("${siq.mock.enabled:false}")
+ private boolean mockEnabled;
+
+ /**
+ * 深i企用户登录并自动注册（带分布式锁防重）
+ *
+ * @param bo 登录参数
+ * @return 登录结果，包含token和用户信息
+ */
@Override
- public Boolean addSiqUser(AppEnterpriseLoginBo bo) {
-
- //调用深i企登录接口
- JSONObject userInfo =siqLoginInfo(bo);
- //判断用户信息
- Map checkUserInfo = checkUserInfo(userInfo);
- if (UserConstants.USER_NAME_NOT_UNIQUE.equals(checkUserInfo.get("unique"))) {
- return false;
+ public Map siqLogin(AppEnterpriseLoginBo bo) {
+ JSONObject userInfo;
+
+ if (mockEnabled) {
+ log.info("使用模拟数据进行深i企登录测试");
+ userInfo = getMockSiqUserInfo(bo.getCode());
+ } else {
+ userInfo = siqLoginInfo(bo);
}
- if (checkUserInfo.get("userId") != null) {
- return false;
+
+ String siqUserId = userInfo.getString("userId");
+
+ String lockKey = "siq_login_lock:" + siqUserId;
+ try {
+ log.info("深i企登录获取分布式锁成功: lockKey={}, userId={}", lockKey, siqUserId);
+
+ EnterpriseUser newUser = saveOrUpdateEnterpriseUser(userInfo);
+
+ EnterpriseInformation enterpriseInformation = addSiqUserCompany(userInfo, newUser);
+
+ if (newUser != null && enterpriseInformation != null) {
+ createUserEnterpriseRef(newUser.getUserId(), enterpriseInformation);
+ }
+
+ String token = generateToken(newUser, enterpriseInformation);
+
+ Map result = new HashMap<>();
+ result.put("token", token);
+ result.put("userId", newUser.getUserId());
+ result.put("userName", newUser.getUserName());
+ result.put("loginName", newUser.getLoginName());
+ result.put("phonenumber", newUser.getPhonenumber() != null ? newUser.getPhonenumber() : "");
+ result.put("enterpriseId", enterpriseInformation.getId());
+ result.put("enterpriseName", enterpriseInformation.getEnterpriseName());
+ result.put("enterpriseNumber", enterpriseInformation.getEnterpriseNumber());
+
+ return result;
+
+ } catch (Exception e) {
+ log.error("深i企登录处理异常: lockKey={}", lockKey, e);
+ throw new BaseException("登录处理失败：" + e.getMessage());
}
- //封装添加用户信息
- String phone =checkUserInfo.get("phone").toString();
- SysUser sysUser = addUserInfo(userInfo, phone );
- //用户密码加密
- Boolean result=false;
- result =encryptPassword(sysUser);
- //添加深i企用户关联企业信息
- if (result == true) {
- result= addSiqUserCompany(userInfo);
+ }
+
+ /**
+ * 保存或更新企业用户信息
+ *
+ * 根据 userName 和 userType 判断用户是否存在：
+ * - 不存在：插入新用户
+ * - 存在：更新用户信息
+ *
+ *
+ * @param userInfo 深i企返回的用户信息
+ * @return 是否操作成功
+ */
+ private EnterpriseUser saveOrUpdateEnterpriseUser(JSONObject userInfo) {
+ String loginName = userInfo.getString("account");
+ String userType = "siq";
+ EnterpriseUser newUser = null;
+ if (StringUtils.isEmpty(loginName)) {
+ log.error("深i企用户账号为空");
+ throw new BaseException("深i企用户账号不能为空");
}
- // 用户登录-需要生成Token （暂时搁置）
- return result;
+
+ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EnterpriseUser::getLoginName, loginName)
+ .eq(EnterpriseUser::getUserType, userType);
+
+ EnterpriseUser existUser = enterpriseUserMapper.selectOne(queryWrapper);
+ Long userId;
+
+ if (existUser == null) {
+ log.info("企业用户不存在，执行新增操作: userName={}, userType={}", loginName, userType);
+ newUser = buildEnterpriseUser(userInfo, userType);
+ enterpriseUserMapper.insert(newUser);
+ } else {
+ log.info("企业用户已存在，执行更新操作: userId={}, loginName={}", existUser.getUserId(), loginName);
+ newUser = buildEnterpriseUser(userInfo, userType);
+ newUser.setUserId(existUser.getUserId());
+ enterpriseUserMapper.updateById(newUser);
+ }
+ return newUser;
}
/**
- * 调用深i企登录接口返回用户登录信息
+ * 构建企业用户对象
+ *
+ * @param userInfo 深i企返回的用户信息
+ * @param userType 用户类型
+ * @return 企业用户对象
*/
+ private EnterpriseUser buildEnterpriseUser(JSONObject userInfo, String userType) {
+ EnterpriseUser user = new EnterpriseUser();
+ String phone = IdCardCryptoUtil.symmetricDecryptIdCard(secretKey, userInfo.getString("phone"));
+ // 基本信息
+ user.setUserName(userInfo.getString("userName"));
+ user.setUserType(userType);
+ user.setLoginName(userInfo.getString("account"));
+ user.setPhonenumber(phone);
+ user.setNickName(userInfo.getString("userName"));
- public JSONObject siqLoginInfo(AppEnterpriseLoginBo bo){
+ // 设置默认部门ID
+ user.setDeptId(UserConstants.DEFAULT_DEPT);
- Map params = new HashMap<>();
+ // 设置默认密码（MD5加盐加密）
+ String defaultPassword = UserConstants.DEFAULT_PASSWORD;
+ user.setPassword(DigestUtil.md5Hex(user.getLoginName() + defaultPassword + user.getSalt()));
- String accessKeySign = IdCardCryptoUtil.symmetricEncryptIdCard(secretKey,bo.getCode());
- params.put("accessKeySign",accessKeySign);
- params.put("accessKeySign{}",accessKeySign);
- params.put("appCode",code);
+ // 账号状态：正常
+ user.setStatus("0");
- String data = HttpUtil.httpSendPost(siqUrl + ApiConstants.API_SIQUSERLOGIN, JSONObject.toJSONString(params),new HashMap<>());
- JSONObject jsonObject = JSONObject.parseObject(data);
- JSONObject userInfo = jsonObject.getJSONObject("data");
+ // 删除标志：存在
+ user.setDelFlag("0");
- return userInfo;
+ // 最后登录时间
+ user.setLoginDate(DateUtils.getNowDate());
+
+ // 备注
+ user.setRemark("深i企同步用户");
+
+ return user;
}
/**
- * 判断用户登录信息
+ * 调用深i企登录接口返回用户登录信息
+ *
+ * @param bo 登录参数，包含授权码
+ * @return 用户信息JSON对象
*/
- public Map checkUserInfo(JSONObject userInfo) {
-
- Map map = new HashMap<>();
- // 判断用户唯一校验
- String userUnique;
- LambdaQueryWrapper queryAccountWrapper = new LambdaQueryWrapper<>();
- queryAccountWrapper.eq(SysUser::getLoginName, userInfo.getString("account"))
- .eq(SysUser::getUserSource, UserConstants.DEFAULT_USER_SOURCE);
- userUnique = String.valueOf(sysUserMapper.selectCount(queryAccountWrapper));
-
- if (UserConstants.USER_NAME_NOT_UNIQUE.equals(userUnique)) {
- map.put("unique", UserConstants.USER_NAME_NOT_UNIQUE);
- return map;
- }
-
- LambdaQueryWrapper queryPhoneWrapper = new LambdaQueryWrapper<>();
- queryPhoneWrapper.eq(SysUser::getLoginName, userInfo.getString("phone"))
- .eq(SysUser::getUserSource, UserConstants.DEFAULT_USER_SOURCE);
- userUnique = String.valueOf(sysUserMapper.selectCount(queryPhoneWrapper));
+ public JSONObject siqLoginInfo(AppEnterpriseLoginBo bo) {
+ try {
+ Map params = new HashMap<>();
+
+ String accessKeySign = IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, bo.getCode());
+ params.put("accessKeySign", accessKeySign);
+ params.put("appCode", code);
+
+ String data = HttpUtil.httpSendPost(
+ siqUrl + ApiConstants.API_SIQUSERLOGIN,
+ JSONObject.toJSONString(params),
+ new HashMap<>()
+ );
+
+ JSONObject jsonObject = JSONObject.parseObject(data);
+ JSONObject userInfo = jsonObject.getJSONObject("data");
+
+ if (userInfo == null) {
+ log.error("深i企接口返回数据为空: {}", data);
+ throw new BaseException("深i企接口返回数据异常");
+ }
- if (UserConstants.USER_NAME_NOT_UNIQUE.equals(userUnique)) {
- map.put("unique", UserConstants.USER_NAME_NOT_UNIQUE);
- return map;
- }
+ log.debug("深i企登录返回用户信息: userId={}", userInfo.getString("userId"));
+ return userInfo;
- // 判断用户名是否重复
- String phone = IdCardCryptoUtil.symmetricDecryptIdCard(secretKey, userInfo.getString("phone"));
- LambdaQueryWrapper queryLoginNameWrapper = new LambdaQueryWrapper<>();
- queryLoginNameWrapper.eq(SysUser::getLoginName, phone)
- .eq(SysUser::getUserSource, UserConstants.DEFAULT_USER_SOURCE);
- SysUser sysUser = sysUserMapper.selectOne(queryLoginNameWrapper);
- if (sysUser != null && sysUser.getUserId() != null) {
- map.put("userId", sysUser.getUserId());
- map.put("phone", phone);
- return map;
+ } catch (BaseException e) {
+ throw e;
+ } catch (Exception e) {
+ log.error("调用深i企接口异常", e);
+ throw new BaseException("获取深i企用户信息失败");
}
- return map;
}
-
/**
- * 封装添加用户信息
+ * 添加深i企用户关联企业信息
+ *
+ * @param userInfo 深i企返回的企业信息
+ * @return 是否添加成功
*/
- public SysUser addUserInfo(JSONObject userInfo,String phone) {
-
- //新增用户信息
- SysUser user = new SysUser();
- if (StringUtils.isNotEmpty(userInfo.getString("account"))) {
-
- // 设置默认用户权限，权限默认值
- user.setRoleId(UserConstants.DEFAULT_ROLE);
- user.setUserName(userInfo.getString("userName"));
- if (StringUtils.isNotEmpty(userInfo.getString("account"))) {
- user.setLoginName(userInfo.getString("account"));
- } else {
- user.setLoginName(phone);
+ public EnterpriseInformation addSiqUserCompany(JSONObject userInfo, EnterpriseUser newUser) {
+ String enterpriseNumber = userInfo.getString("corpCid");
+
+ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EnterpriseInformation::getEnterpriseNumber, enterpriseNumber);
+ EnterpriseInformation existingEnterprise = enterpriseInformationMapper.selectOne(queryWrapper);
+
+ if (existingEnterprise != null) {
+ log.info("企业已存在，执行更新操作: enterpriseNumber={}, enterpriseId={}",
+ enterpriseNumber, existingEnterprise.getId());
+
+ existingEnterprise.setEnterpriseName(userInfo.getString("corpName"));
+ existingEnterprise.setCompanyOrgType(userInfo.getString("companyOrgType"));
+
+ String establishDate = userInfo.getString("establishDate");
+ try {
+ if (StrUtil.isNotEmpty(establishDate)) {
+ Date establishDateD = format.parse(establishDate);
+ existingEnterprise.setEstablishmentTime(establishDateD);
+ }
+ } catch (Exception e) {
+ log.warn("解析企业成立日期失败: {}", establishDate, e);
}
- user.setPhonenumber(phone);
- // 设置默认密码
- user.setPassword(UserConstants.DEFAULT_PASSWORD);
- user.setCreateTime(DateUtils.getNowDate());
- // 设置默认部门ID
- user.setDeptId(UserConstants.DEFAULT_DEPT);
- // 设置用户类型
- user.setUserSource(UserConstants.DEFAULT_USER_SOURCE);
- user.setDelFlag(UserConstants.NORMAL_DEL_FLAG);
-
- }else if(StringUtils.isNotEmpty(userInfo.getString("phone"))){
- // 设置默认用户权限，权限默认值
- user.setRoleId(UserConstants.DEFAULT_ROLE);
- user.setUserName(userInfo.getString("userName"));
- if (StringUtils.isNotEmpty(userInfo.getString("account"))) {
- user.setLoginName(userInfo.getString("account"));
- } else {
- user.setLoginName(phone);
+
+ existingEnterprise.setBusinessScope(userInfo.getString("businessScope"));
+ existingEnterprise.setEnterpriseAddress(userInfo.getString("regLocation"));
+ existingEnterprise.setRegisteredCapital(userInfo.getString("regCapital"));
+ existingEnterprise.setEnterpriseTel(
+ IdCardCryptoUtil.symmetricDecryptIdCard(secretKey, userInfo.getString("phone"))
+ );
+ existingEnterprise.setLegalPerson(userInfo.getString("legalPersonName"));
+ existingEnterprise.setUserId(newUser.getUserId());
+
+ String termStart = userInfo.getString("termStart");
+ try {
+ if (StrUtil.isNotEmpty(termStart)) {
+ Date termStartD = format.parse(termStart);
+ termStart = format.format(termStartD);
+ }
+ } catch (Exception e) {
+ termStart = "";
+ log.warn("解析营业期限开始时间失败: {}", termStart, e);
+ }
+
+ String termEnd = userInfo.getString("termEnd");
+ try {
+ if (StrUtil.isNotEmpty(termEnd)) {
+ Date termEndD = format.parse(termEnd);
+ termEnd = format.format(termEndD);
+ }
+ } catch (Exception e) {
+ termEnd = "";
+ log.warn("解析营业期限结束时间失败: {}", termEnd, e);
+ }
+
+ existingEnterprise.setOperatingTerm(termStart);
+ existingEnterprise.setOperatingTermEnd(termEnd);
+ existingEnterprise.setUpdateTime(DateUtils.getNowDate());
+ existingEnterprise.setUpdateBy(newUser.getUserId());
+
+ enterpriseInformationMapper.updateById(existingEnterprise);
+ log.info("企业信息更新成功: enterpriseNumber={}, enterpriseId={}",
+ enterpriseNumber, existingEnterprise.getId());
+ return existingEnterprise;
+ } else {
+ log.info("企业不存在，执行新增操作: enterpriseNumber={}", enterpriseNumber);
+
+ EnterpriseInformation enterpriseInformation = new EnterpriseInformation();
+ enterpriseInformation.setId(IdUtil.simpleUUID());
+ enterpriseInformation.setCreateTime(DateUtils.getNowDate());
+ enterpriseInformation.setCreateBy(newUser.getUserId());
+ enterpriseInformation.setDeptId(newUser.getDeptId());
+
+ String salt = PasswordTools.encrypt(enterpriseNumber);
+ enterpriseInformation.setSalt(salt);
+ enterpriseInformation.setEnterpriseNumber(enterpriseNumber);
+ enterpriseInformation.setEnterpriseName(userInfo.getString("corpName"));
+ enterpriseInformation.setCompanyOrgType(userInfo.getString("companyOrgType"));
+
+ String establishDate = userInfo.getString("establishDate");
+ try {
+ if (StrUtil.isNotEmpty(establishDate)) {
+ Date establishDateD = format.parse(establishDate);
+ enterpriseInformation.setEstablishmentTime(establishDateD);
+ }
+ } catch (Exception e) {
+ log.warn("解析企业成立日期失败: {}", establishDate, e);
+ }
+
+ enterpriseInformation.setBusinessScope(userInfo.getString("businessScope"));
+ enterpriseInformation.setEnterpriseAddress(userInfo.getString("regLocation"));
+ enterpriseInformation.setRegisteredCapital(userInfo.getString("regCapital"));
+ enterpriseInformation.setEnterpriseTel(
+ IdCardCryptoUtil.symmetricDecryptIdCard(secretKey, userInfo.getString("phone"))
+ );
+ enterpriseInformation.setLegalPerson(userInfo.getString("legalPersonName"));
+ enterpriseInformation.setUserId(newUser.getUserId());
+
+ String termStart = userInfo.getString("termStart");
+ try {
+ if (StrUtil.isNotEmpty(termStart)) {
+ Date termStartD = format.parse(termStart);
+ termStart = format.format(termStartD);
+ }
+ } catch (Exception e) {
+ termStart = "";
+ log.warn("解析营业期限开始时间失败: {}", termStart, e);
+ }
+
+ String termEnd = userInfo.getString("termEnd");
+ try {
+ if (StrUtil.isNotEmpty(termEnd)) {
+ Date termEndD = format.parse(termEnd);
+ termEnd = format.format(termEndD);
+ }
+ } catch (Exception e) {
+ termEnd = "";
+ log.warn("解析营业期限结束时间失败: {}", termEnd, e);
}
- user.setPhonenumber(phone);
- // 设置默认密码
- user.setPassword(UserConstants.DEFAULT_PASSWORD);
- user.setCreateTime(DateUtils.getNowDate());
- // 设置默认部门ID
- user.setDeptId(UserConstants.DEFAULT_DEPT);
- // 设置用户类型
- user.setUserSource(UserConstants.DEFAULT_USER_SOURCE);
- user.setDelFlag(UserConstants.NORMAL_DEL_FLAG);
+
+ enterpriseInformation.setOperatingTerm(termStart);
+ enterpriseInformation.setOperatingTermEnd(termEnd);
+
+ enterpriseInformationMapper.insert(enterpriseInformation);
+ log.info("企业信息保存成功: enterpriseNumber={}, enterpriseId={}",
+ enterpriseInformation.getEnterpriseNumber(), enterpriseInformation.getId());
+
+ /**生成二维码**/
+ qrCodeGenerate(enterpriseInformation);
+ return enterpriseInformation;
}
- return user ;
}
/**
- * 用户密码加密
+ *
+ * @return
*/
- public Boolean encryptPassword(SysUser user) {
- // 用户密码加密
- user.setPassword(DigestUtil.md5Hex(user.getLoginName()+user.getPassword()+user.getSalt()));
- // 新增用户
- int rows = 0;
- Boolean flag=false;
- rows= sysUserMapper.insert(user);
- // 新增岗位
- if (ArrayUtil.isNotEmpty(user.getPostIds())) {
- List userPostList = new ArrayList<>();
- for (Long postId : user.getPostIds()) {
- SysUserPost userPost = new SysUserPost();
- userPost.setUserId(user.getUserId());
- userPost.setPostId(postId);
- userPostList.add(userPost);
- }
- flag= sysUserPostMapper.insertBatch(userPostList);
- }
- // 新增用户与角色管理
- if (ArrayUtil.isNotEmpty(user.getRoleId())) {
- List userRoleList = new ArrayList<>();
- for (Long roleId : user.getRoleIds()) {
- SysUserRole userPost = new SysUserRole();
- userPost.setUserId(user.getUserId());
- userPost.setRoleId(roleId);
- userRoleList.add(userPost);
- }
- flag=sysUserRoleMapper.insertBatch(userRoleList);
+ private void qrCodeGenerate(EnterpriseInformation enterpriseInformation){
+ String uuid = IdUtil.simpleUUID();
+ Map jsonMap = new HashMap<>();
+ jsonMap.put("salt", enterpriseInformation.getSalt());
+ jsonMap.put("codeId", uuid);
+ jsonMap.put("type", "zfjd");
+ String text = JSON.toJSONString(jsonMap);
+ //这里设置自定义网站url
+ String logoPath = qrCodeUrl;
+ try {
+ File encode = QRCodeUtil.encodeFile(text, logoPath, filePath, true);
+ MultipartFile multipartFile = QRCodeUtil.getMultipartFile(encode);
+ String upload = fileUploadApi.upload(multipartFile);
+
+// String uuid = IdUtil.simpleUUID();
+ QrCodeGenerateHistoryBo qrCodeGenerateHistory = new QrCodeGenerateHistoryBo();
+ qrCodeGenerateHistory.setId(uuid);
+ //生成时间
+ qrCodeGenerateHistory.setGenerateTime(DateUtils.getNowDate());
+ //二维码地址
+ qrCodeGenerateHistory.setQrCodeUrl(upload);
+ //统一信用代码
+ qrCodeGenerateHistory.setEnterpriseNumber(enterpriseInformation.getEnterpriseNumber());
+ //变更原因
+ qrCodeGenerateHistory.setReasonsChange("登记");
+ iQrCodeGenerateHistoryService.insertByBo(qrCodeGenerateHistory);
+ } catch (Exception e) {
+ e.printStackTrace();
}
+ }
- if (rows==1 && flag==true) {
- return true;
- }else{
- return false;
+ private void createUserEnterpriseRef(Long userId, EnterpriseInformation enterpriseInformation) {
+ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EnterpriseUserRef::getUserId, userId)
+ .eq(EnterpriseUserRef::getEnterpriseId, enterpriseInformation.getId());
+
+ Long count = enterpriseUserRefMapper.selectCount(queryWrapper);
+ if (count > 0) {
+ log.info("用户与企业关联关系已存在: userId={}, enterpriseId={}", userId, enterpriseInformation.getId());
+ return;
}
- }
+ EnterpriseUser enterpriseUser = enterpriseUserMapper.selectById(userId);
+
+ EnterpriseUserRef userRef = new EnterpriseUserRef();
+ userRef.setRefId(UUID.randomUUID().toString().replace("-", ""));
+ userRef.setUserId(userId);
+ userRef.setUserName(enterpriseUser != null ? enterpriseUser.getUserName() : "");
+ userRef.setEnterpriseId(enterpriseInformation.getId());
+ userRef.setEnterpriseName(enterpriseInformation.getEnterpriseName());
+ userRef.setEnterpriseNumber(enterpriseInformation.getEnterpriseNumber());
+ userRef.setRemark("深i企登录自动关联");
+
+ enterpriseUserRefMapper.insert(userRef);
+ log.info("用户与企业关联关系创建成功: userId={}, userName={}, enterpriseId={}, enterpriseName={}",
+ userId, userRef.getUserName(), enterpriseInformation.getId(), enterpriseInformation.getEnterpriseName());
+ }
- // 添加深i企用户关联企业信息
/**
- * 添加深i企用户关联企业信息
+ * 生成token
+ * @param user
+ * @param enterpriseInformation
+ * @return
*/
- public Boolean addSiqUserCompany(JSONObject userInfo){
-
- EnterpriseInformation enterpriseInformation = new EnterpriseInformation();
- // 企业纳税识别号
- enterpriseInformation.setEnterpriseNumber(userInfo.getString("corpCid"));
- LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EnterpriseInformation::getEnterpriseNumber, enterpriseInformation.getEnterpriseNumber());
- if (enterpriseInformationMapper.selectCount(queryWrapper) > 0) {
- return false;
- }
- //企业名称
- enterpriseInformation.setEnterpriseName(userInfo.getString("corpName"));
- //企业类型
- enterpriseInformation.setCompanyOrgType(userInfo.getString("companyOrgType"));
- //注册时间
- String establishDate = userInfo.getString("establishDate");
- try {
- if (StrUtil.isNotEmpty(establishDate)) {
- Date establishDateD = format.parse(establishDate);
- enterpriseInformation.setEstablishmentTime(establishDateD);
- }
- } catch (Exception e) {
- log.warn("解析企业成立日期失败: {}", establishDate, e);
- }
- //经营范围
- enterpriseInformation.setBusinessScope(userInfo.getString("businessScope"));
- //注册地址
- enterpriseInformation.setEnterpriseAddress(userInfo.getString("regLocation"));
- //注册资金
- enterpriseInformation.setRegisteredCapital(userInfo.getString("regCapital"));
- //企业联系人电话
- enterpriseInformation.setEnterpriseTel(IdCardCryptoUtil.symmetricDecryptIdCard(secretKey,userInfo.getString("phone")));
- //企业法人
- enterpriseInformation.setLegalPerson(userInfo.getString("legalPersonName"));
- //用户Id
- enterpriseInformation.setUserId(Long.valueOf(userInfo.getString("userId")));
- //营业时间
- //开始时间
- String termStart = userInfo.getString("termStart");
- try {
- Date termStartD = format.parse(termStart);
- termStart = format.format(termStartD);
- } catch (Exception e) {
- termStart = "";
- }
- //结束时间 返回为空表示为永久
- String termEnd = userInfo.getString("termEnd");
- try {
- if(StrUtil.isNotEmpty(termEnd)){
- Date termEndD = format.parse(termEnd);
- termEnd = format.format(termEndD);
- }
- } catch (Exception e) {
- termEnd = "";
- }
- //营业期限-开始时间
- enterpriseInformation.setOperatingTerm(termStart);
- //营业期限-结束时间 为空表示 无固定期限
- enterpriseInformation.setOperatingTermEnd(termEnd);
-
- return enterpriseInformationMapper.insert(enterpriseInformation)>0? Boolean.TRUE:Boolean.FALSE;
-
- }
- // 深i企用户登录
- public SysUserVo siqLogin(JSONObject userInfo){
-
- SysUserVo sysUserVo = new SysUserVo();
-
-
- return sysUserVo;
+ private String generateToken(EnterpriseUser user, EnterpriseInformation enterpriseInformation) {
+ LoginUser loginUser = new LoginUser();
+ loginUser.setUserId(user.getUserId());
+ loginUser.setUsername(user.getLoginName());
+ loginUser.setNickname(user.getUserName());
+ loginUser.setUserType(user.getUserType());
+ loginUser.setDeptId(String.valueOf(user.getDeptId()));
+ loginUser.setTenantId("000000");
+ loginUser.setDeptId(enterpriseInformation.getId());
+ loginUser.setDeptName(enterpriseInformation.getEnterpriseName());
+
+ SaLoginParameter model = new SaLoginParameter();
+ model.setDeviceType("app");
+ model.setExtra(LoginHelper.CLIENT_KEY, "enterprise_app");
+ model.setTimeout(86400);
+ model.setActiveTimeout(1800);
+
+ LoginHelper.login(loginUser, model);
+
+ String token = StpUtil.getTokenValue();
+ log.info("生成token成功: userId={}, token={}", user.getUserId(), token);
+
+ return token;
}
+ /**
+ * 获取模拟的深i企用户信息（用于测试）
+ *
+ * @param code 授权码
+ * @return 模拟的用户信息JSON对象
+ */
+ private JSONObject getMockSiqUserInfo(String code) {
+ JSONObject userInfo = new JSONObject();
+
+ userInfo.put("userId", "100001");
+ userInfo.put("account", "test_user_" + (code != null ? code.hashCode() % 1000 : 1));
+ userInfo.put("userName", "测试用户");
+ userInfo.put("phone", IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, "13800138000"));
+
+ userInfo.put("corpCid", "91440300788302281W");
+ userInfo.put("corpName", "吉田拉链（深圳）有限公司公明工厂");
+ userInfo.put("companyOrgType", "有限责任公司");
+ userInfo.put("establishDate", "2010-01-15");
+ userInfo.put("businessScope", "生产经营拉链、服装辅料及相关产品");
+ userInfo.put("regLocation", "深圳市光明新区公明街道塘尾社区宝塘工业区");
+ userInfo.put("regCapital", "5000万元人民币");
+ userInfo.put("legalPersonName", "张三");
+ userInfo.put("termStart", "2010-01-15");
+ userInfo.put("termEnd", "2040-01-14");
+
+ log.info("返回模拟深i企用户信息: userId={}, account={}, corpName={}",
+ userInfo.getString("userId"),
+ userInfo.getString("account"),
+ userInfo.getString("corpName"));
+
+ return userInfo;
+ }
}
diff --git a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/domain/SysUser.java b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/domain/SysUser.java
index 8bf663c0..d624d8c8 100644
--- a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/domain/SysUser.java
+++ b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/domain/SysUser.java
@@ -265,21 +265,8 @@ public class SysUser extends TenantEntity {
@TableField("rylb")
private String rylb;
- private Long roleId;
- /**
- * 岗位组
- * @param userId
- */
- private Long[] postIds;
-
- /**
- * 角色组
- * @param userId
- */
- private Long[] roleIds;
-
public SysUser(Long userId) {
this.userId = userId;
}
diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml
index 517e18fa..ce484129 100644
--- a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml
+++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml
@@ -107,13 +107,13 @@ spring:
spring.data:
redis:
# 地址
- host: localhost
+ host: 139.186.148.21
# 端口，默认为6379
port: 6379
# 数据库索引
database: 0
# redis 密码必须配置
- #password: ruoyi123
+ password: zdxt@123
# 连接超时时间
timeout: 10s
# 是否开启ssl
@@ -294,4 +294,8 @@ siq:
siqUrl: http://egbpub.siqhz.com/egb/api/thirdauth
code: zfjdm
# secretKey: eWIzY3BMRVNEQXhvUUlXMA==
- secretKey: ENC(zTr/tj2VgFxQyunI4eIL7NyRWDPSMPSB0VlwTYeHTdsEWyu1H96xWw==)
+# secretKey: ENC(zTr/tj2VgFxQyunI4eIL7NyRWDPSMPSB0VlwTYeHTdsEWyu1H96xWw==)
+ secretKey: SXRpWEhVN3RHM3ZFbzRQcQ==
+ # 模拟数据开关（true=使用模拟数据，false=调用真实接口）
+ mock:
+ enabled: true
diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml
index 20db6d55..007193af 100644
--- a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml
+++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml
@@ -223,45 +223,17 @@ api-decrypt:
springdoc:
api-docs:
- # 是否开启接口文档
enabled: true
- components:
- securitySchemes:
- Authorization:
- type: apiKey
- in: header
- name: Authorization
- description: "Bearer Token，格式: Bearer {token}"
- clientid:
- type: apiKey
- in: header
- name: clientid
- description: "客户端ID"
- info:
- # 标题
- title: '标题：zdxt-Vue-Plus多租户管理系统_接口文档'
- # 描述
- description: '描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...'
- # 版本
- version: '版本号: ${project.version}'
- # 作者信息
- contact:
- name: Lion Li
- email: crazylionli@163.com
- url: https://gitee.com/dromara/zdxt-Vue-Plus
- #这里定义了两个分组，可定义多个，也可以不定义
- group-configs:
- - group: enforcementcode
- packages-to-scan: com.zdxt.enforcementcode
-# - group: 2.通用模块
-# packages-to-scan: org.dromara.web
-# - group: 3.系统模块
-# packages-to-scan: org.dromara.system
-# - group: 4.代码生成模块
-# packages-to-scan: org.dromara.generator
-# - group: 5.工作流模块
-# packages-to-scan: org.dromara.workflow
+ path: /v3/api-docs
+ swagger-ui:
+ enabled: true
+ path: /swagger-ui
+ default-flat-param-object: true # 参见 https://doc.xiaominfo.com/docs/faq/v4/knife4j-parameterobject-flat-param 文档
+knife4j:
+ enable: true
+ setting:
+ language: zh_cn
# 防止XSS攻击
xss:
# 过滤开关
@@ -321,3 +293,8 @@ warm-flow:
node-tooltip: true
# 默认Authorization，如果有多个token，用逗号分隔
token-name: ${sa-token.token-name},clientid
+
+# 项目相关配置
+sjdm:
+ profile: /usr/local/uploadPath
+ qr_code_url: /usr/local/uploads/zfjd_logo.png
diff --git a/zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/rest/test/AppEnterpriseLoginControllerTest.java b/zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/rest/test/AppEnterpriseLoginControllerTest.java
new file mode 100644
index 00000000..6994f5fb
--- /dev/null
+++ b/zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/rest/test/AppEnterpriseLoginControllerTest.java
@@ -0,0 +1,301 @@
+//package com.zdxt.rest.test;
+//
+//import cn.dev33.satoken.context.mock.SaTokenContextMockUtil;
+//import org.dromara.ZdxtAdminApplication;
+//import org.junit.jupiter.api.*;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.http.MediaType;
+//import org.springframework.test.web.servlet.MockMvc;
+//import org.springframework.test.web.servlet.MvcResult;
+//
+//import java.nio.charset.StandardCharsets;
+//
+//import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+//import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+//import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+//
+///**
+// * AppEnterpriseLoginController 企业端-用户登录接口测试
+// *
+// * 覆盖以下接口：
+// * 1. POST /app-ent/login/siqLogin - 深i企用户登录
+// *
+// *
+// * 注意：此测试需要配置真实的深i企接口地址，或在测试环境中 Mock 相关服务
+// *
+// *
+// * @author zdxt
+// */
+//@SpringBootTest(classes = ZdxtAdminApplication.class)
+//@AutoConfigureMockMvc
+//@DisplayName("AppEnterpriseLoginController 企业端-用户登录接口测试")
+//@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+//public class AppEnterpriseLoginControllerTest {
+//
+// @Autowired
+// private MockMvc mockMvc;
+//
+// private static final String BASE_URL = "/app-ent/login";
+// private static final String TEST_CLIENT_ID = "e5cd7e4891bf95d1d19206ce24a7b32e";
+//
+// @BeforeEach
+// public void setUp() {
+// SaTokenContextMockUtil.setMockContext();
+// }
+//
+// @AfterEach
+// public void tearDown() {
+// SaTokenContextMockUtil.clearContext();
+// }
+//
+// // ==================== siqLogin 接口测试 ====================
+//
+// @DisplayName("深i企登录 - 正常请求（需要有效的授权码）")
+// @Test
+// @Order(1)
+// public void testSiqLoginSuccess() throws Exception {
+// String requestBody = "{\"code\":\"test_authorization_code\"}";
+//
+// MvcResult result = mockMvc.perform(post(BASE_URL + "/siqLogin")
+// .contentType(MediaType.APPLICATION_JSON)
+// .content(requestBody))
+// .andDo(print())
+// .andExpect(status().isOk())
+// .andReturn();
+//
+// String responseBody = result.getResponse().getContentAsString(StandardCharsets.UTF_8);
+// System.out.println("深i企登录接口响应: " + responseBody);
+//
+// if (responseBody.contains("\"code\":200")) {
+// Assertions.assertTrue(responseBody.contains("token"), "返回数据应包含 token");
+// Assertions.assertTrue(responseBody.contains("userId"), "返回数据应包含 userId");
+// Assertions.assertTrue(responseBody.contains("userName"), "返回数据应包含 userName");
+// Assertions.assertTrue(responseBody.contains("enterpriseId"), "返回数据应包含 enterpriseId");
+// Assertions.assertTrue(responseBody.contains("enterpriseName"), "返回数据应包含 enterpriseName");
+// System.out.println("深i企登录成功，返回了完整的用户和企业信息");
+// } else {
+// System.out.println("深i企登录失败（可能由于授权码无效或深i企接口未配置）: " + responseBody);
+// }
+// }
+//
+// @DisplayName("深i企登录 - 缺少授权码参数应返回失败")
+// @Test
+// @Order(2)
+// public void testSiqLoginMissingCode() throws Exception {
+// String requestBody = "{}";
+//
+// mockMvc.perform(post(BASE_URL + "/siqLogin")
+// .contentType(MediaType.APPLICATION_JSON)
+// .content(requestBody))
+// .andDo(print())
+// .andExpect(status().isOk())
+// .andExpect(jsonPath("$.code").value(500));
+//
+// System.out.println("缺少授权码参数返回失败测试成功");
+// }
+//
+// @DisplayName("深i企登录 - 空授权码应返回失败")
+// @Test
+// @Order(3)
+// public void testSiqLoginEmptyCode() throws Exception {
+// String requestBody = "{\"code\":\"\"}";
+//
+// mockMvc.perform(post(BASE_URL + "/siqLogin")
+// .contentType(MediaType.APPLICATION_JSON)
+// .content(requestBody))
+// .andDo(print())
+// .andExpect(status().isOk())
+// .andExpect(jsonPath("$.code").value(500));
+//
+// System.out.println("空授权码返回失败测试成功");
+// }
+//
+// @DisplayName("深i企登录 - 无效授权码应返回失败")
+// @Test
+// @Order(4)
+// public void testSiqLoginInvalidCode() throws Exception {
+// String requestBody = "{\"code\":\"invalid_code_12345\"}";
+//
+// MvcResult result = mockMvc.perform(post(BASE_URL + "/siqLogin")
+// .contentType(MediaType.APPLICATION_JSON)
+// .content(requestBody))
+// .andDo(print())
+// .andExpect(status().isOk())
+// .andReturn();
+//
+// String responseBody = result.getResponse().getContentAsString(StandardCharsets.UTF_8);
+//
+// if (responseBody.contains("\"code\":500")) {
+// System.out.println("无效授权码返回失败测试成功");
+// } else {
+// System.out.println("注意：无效授权码未返回预期错误，响应: " + responseBody);
+// }
+// }
+//
+// @DisplayName("深i企登录 - 验证返回数据结构完整性")
+// @Test
+// @Order(5)
+// public void testSiqLoginResponseStructure() throws Exception {
+// String requestBody = "{\"code\":\"test_code\"}";
+//
+// MvcResult result = mockMvc.perform(post(BASE_URL + "/siqLogin")
+// .contentType(MediaType.APPLICATION_JSON)
+// .content(requestBody))
+// .andDo(print())
+// .andExpect(status().isOk())
+// .andReturn();
+//
+// String responseBody = result.getResponse().getContentAsString(StandardCharsets.UTF_8);
+// System.out.println("验证返回数据结构响应: " + responseBody);
+//
+// if (responseBody.contains("\"code\":200")) {
+// Assertions.assertTrue(responseBody.contains("\"data\""), "返回数据应包含 data 字段");
+//
+// String data = extractDataJson(responseBody);
+// if (data != null) {
+// Assertions.assertTrue(data.contains("token"), "data 中应包含 token");
+// Assertions.assertTrue(data.contains("userId"), "data 中应包含 userId");
+// Assertions.assertTrue(data.contains("userName"), "data 中应包含 userName");
+// Assertions.assertTrue(data.contains("loginName"), "data 中应包含 loginName");
+// Assertions.assertTrue(data.contains("phonenumber"), "data 中应包含 phonenumber");
+// Assertions.assertTrue(data.contains("enterpriseId"), "data 中应包含 enterpriseId");
+// Assertions.assertTrue(data.contains("enterpriseName"), "data 中应包含 enterpriseName");
+// Assertions.assertTrue(data.contains("enterpriseNumber"), "data 中应包含 enterpriseNumber");
+// System.out.println("返回数据结构完整，包含所有必需字段");
+// }
+// } else {
+// System.out.println("登录失败，无法验证数据结构");
+// }
+// }
+//
+// @DisplayName("深i企登录 - 重复登录应能正常处理（同一授权码多次调用）")
+// @Test
+// @Order(6)
+// public void testSiqLoginDuplicateCall() throws Exception {
+// String requestBody = "{\"code\":\"test_code\"}";
+//
+// for (int i = 1; i <= 3; i++) {
+// System.out.println("========== 第 " + i + " 次调用深i企登录 ==========");
+//
+// MvcResult result = mockMvc.perform(post(BASE_URL + "/siqLogin")
+// .contentType(MediaType.APPLICATION_JSON)
+// .content(requestBody))
+// .andDo(print())
+// .andExpect(status().isOk())
+// .andReturn();
+//
+// String responseBody = result.getResponse().getContentAsString(StandardCharsets.UTF_8);
+// System.out.println("第 " + i + " 次调用响应: " + responseBody);
+//
+// Thread.sleep(1000);
+// }
+//
+// System.out.println("========== 重复登录测试完成 ==========");
+// }
+//
+// @DisplayName("深i企登录 - 验证 Token 格式")
+// @Test
+// @Order(7)
+// public void testSiqLoginTokenFormat() throws Exception {
+// String requestBody = "{\"code\":\"test_code\"}";
+//
+// MvcResult result = mockMvc.perform(post(BASE_URL + "/siqLogin")
+// .contentType(MediaType.APPLICATION_JSON)
+// .content(requestBody))
+// .andDo(print())
+// .andExpect(status().isOk())
+// .andReturn();
+//
+// String responseBody = result.getResponse().getContentAsString(StandardCharsets.UTF_8);
+//
+// if (responseBody.contains("\"code\":200")) {
+// String token = extractTokenFromResponse(responseBody);
+// if (token != null && !token.isEmpty()) {
+// Assertions.assertTrue(token.length() > 10, "Token 长度应大于10个字符");
+// System.out.println("Token 格式验证通过，Token: " + token);
+// } else {
+// System.out.println("未能提取到 Token");
+// }
+// } else {
+// System.out.println("登录失败，无法验证 Token 格式");
+// }
+// }
+//
+// @DisplayName("深i企登录 - 验证企业信息关联")
+// @Test
+// @Order(8)
+// public void testSiqLoginEnterpriseAssociation() throws Exception {
+// String requestBody = "{\"code\":\"test_code\"}";
+//
+// MvcResult result = mockMvc.perform(post(BASE_URL + "/siqLogin")
+// .contentType(MediaType.APPLICATION_JSON)
+// .content(requestBody))
+// .andDo(print())
+// .andExpect(status().isOk())
+// .andReturn();
+//
+// String responseBody = result.getResponse().getContentAsString(StandardCharsets.UTF_8);
+//
+// if (responseBody.contains("\"code\":200")) {
+// String data = extractDataJson(responseBody);
+// if (data != null) {
+// String enterpriseId = extractJsonValue(data, "enterpriseId");
+// String enterpriseName = extractJsonValue(data, "enterpriseName");
+// String enterpriseNumber = extractJsonValue(data, "enterpriseNumber");
+//
+// if (enterpriseId != null && enterpriseName != null && enterpriseNumber != null) {
+// Assertions.assertFalse(enterpriseId.isEmpty(), "企业ID不应为空");
+// Assertions.assertFalse(enterpriseName.isEmpty(), "企业名称不应为空");
+// Assertions.assertFalse(enterpriseNumber.isEmpty(), "企业统一信用代码不应为空");
+// System.out.println("企业信息关联验证通过");
+// System.out.println("企业ID: " + enterpriseId);
+// System.out.println("企业名称: " + enterpriseName);
+// System.out.println("企业统一信用代码: " + enterpriseNumber);
+// }
+// }
+// } else {
+// System.out.println("登录失败，无法验证企业信息关联");
+// }
+// }
+//
+// // ==================== 工具方法 ====================
+//
+// /**
+// * 从 JSON 响应中提取 data 字段
+// */
+// private String extractDataJson(String responseBody) {
+// if (responseBody != null && responseBody.contains("\"data\":{")) {
+// int start = responseBody.indexOf("\"data\":{") + 7;
+// int end = responseBody.lastIndexOf("}");
+// if (start > 0 && end > start) {
+// return responseBody.substring(start, end + 1);
+// }
+// }
+// return null;
+// }
+//
+// /**
+// * 从响应中提取 Token
+// */
+// private String extractTokenFromResponse(String responseBody) {
+// return extractJsonValue(responseBody, "token");
+// }
+//
+// /**
+// * 从 JSON 字符串中提取指定字段的值
+// */
+// private String extractJsonValue(String json, String key) {
+// if (json != null && json.contains("\"" + key + "\"")) {
+// int start = json.indexOf("\"" + key + "\":\"") + key.length() + 4;
+// int end = json.indexOf("\"", start);
+// if (start > 0 && end > start) {
+// return json.substring(start, end);
+// }
+// }
+// return null;
+// }
+//}
+//{
+//}