stjdydayou 4 سال پیش
والد
کامیت
693cda224b
39فایلهای تغییر یافته به همراه90 افزوده شده و 87 حذف شده
  1. 0 1
      src/main/java/com/zhiqiyun/open/core/schedule/AutoEquipmentPassengerPeople.java
  2. 90 86
      src/main/java/com/zhiqiyun/open/core/service/impl/UploadFileInfoServiceImpl.java
  3. 0 0
      src/main/resources/public/index.html
  4. 0 0
      src/main/resources/public/static/css/app.f2efab09.css
  5. 0 0
      src/main/resources/public/static/css/chunk-1d9f9eae.d33309cc.css
  6. 0 0
      src/main/resources/public/static/css/chunk-2914c052.d33309cc.css
  7. 0 0
      src/main/resources/public/static/css/chunk-41fc9b08.e5f0ac0b.css
  8. 0 0
      src/main/resources/public/static/css/chunk-78a3203a.a26c90f5.css
  9. 0 0
      src/main/resources/public/static/css/chunk-7d2734ac.d33309cc.css
  10. 0 0
      src/main/resources/public/static/css/chunk-a8284054.544fa637.css
  11. 0 0
      src/main/resources/public/static/css/chunk-ad2707dc.d33309cc.css
  12. 0 0
      src/main/resources/public/static/js/app.1584cf64.js
  13. 0 0
      src/main/resources/public/static/js/chunk-0e6c0183.d4da2a86.js
  14. 0 0
      src/main/resources/public/static/js/chunk-1d9f9eae.087e4c9f.js
  15. 0 0
      src/main/resources/public/static/js/chunk-1f91f110.2e7c3c6a.js
  16. 0 0
      src/main/resources/public/static/js/chunk-2914c052.102c2629.js
  17. 0 0
      src/main/resources/public/static/js/chunk-2ecfd031.88a72abb.js
  18. 0 0
      src/main/resources/public/static/js/chunk-2ecfd031.e4192ad3.js
  19. 0 0
      src/main/resources/public/static/js/chunk-381877e5.141578ad.js
  20. 0 0
      src/main/resources/public/static/js/chunk-41fc9b08.0c29ed9a.js
  21. 0 0
      src/main/resources/public/static/js/chunk-41fc9b08.202375b2.js
  22. 0 0
      src/main/resources/public/static/js/chunk-4ce0a38e.f46ad862.js
  23. 0 0
      src/main/resources/public/static/js/chunk-66422ce4.e8850385.js
  24. 0 0
      src/main/resources/public/static/js/chunk-67aa66b6.fb7dfabb.js
  25. 0 0
      src/main/resources/public/static/js/chunk-68cddace.723964a0.js
  26. 0 0
      src/main/resources/public/static/js/chunk-6bc75950.f2682a2f.js
  27. 0 0
      src/main/resources/public/static/js/chunk-70d5bf9f.0ff8f9e1.js
  28. 0 0
      src/main/resources/public/static/js/chunk-755fa2ec.18edb867.js
  29. 0 0
      src/main/resources/public/static/js/chunk-755fa2ec.bdcd3fe6.js
  30. 0 0
      src/main/resources/public/static/js/chunk-78a3203a.795bdd7e.js
  31. 0 0
      src/main/resources/public/static/js/chunk-7959003c.55b90961.js
  32. 0 0
      src/main/resources/public/static/js/chunk-7d2734ac.298c7581.js
  33. 0 0
      src/main/resources/public/static/js/chunk-7d56abd5.749dc0c1.js
  34. 0 0
      src/main/resources/public/static/js/chunk-8b1a81cc.00e1ed95.js
  35. 0 0
      src/main/resources/public/static/js/chunk-a8284054.39f34525.js
  36. 0 0
      src/main/resources/public/static/js/chunk-ad2707dc.3024ccdd.js
  37. 0 0
      src/main/resources/public/static/js/chunk-e36848bc.b9671c40.js
  38. 0 0
      src/main/resources/public/static/js/chunk-e5f2c62a.9007ae5b.js
  39. 0 0
      src/main/resources/public/static/js/chunk-libs.e2c94e34.js

+ 0 - 1
src/main/java/com/zhiqiyun/open/core/schedule/AutoEquipmentPassengerPeople.java

@@ -67,7 +67,6 @@ public class AutoEquipmentPassengerPeople {
 
             String redisKey = String.format("equipment%s", equipment.getId());
             BoundListOperations<String, String> boundListOps = this.stringRedisTemplate.boundListOps(redisKey);
-            log.info("{}>>>>>{}", boundListOps.size(), JSON.toJSONString(boundListOps.range(0, 10000)));
             String faceId;
             if (PassengerType.IN.equals(type)) {
                 faceId = RandomUtil.getuuid();

+ 90 - 86
src/main/java/com/zhiqiyun/open/core/service/impl/UploadFileInfoServiceImpl.java

@@ -29,90 +29,94 @@ import java.util.List;
 @Slf4j
 @Service
 public class UploadFileInfoServiceImpl extends ServiceImpl<UploadFileInfoMapper, UploadFileInfo> implements UploadFileInfoService {
-	@Value("${uploader.max-size}")
-	private long maxSize;
-
-	@Value("${uploader.allow-file-types}")
-	private String[] allowExtensions;
-
-	@Value("${uploader.save-path}")
-	private String savePath;
-
-	@Value("${uploader.file-host}")
-	private String fileHost;
-
-	@Autowired
-	private SequenceService sequenceService;
-
-	@Override
-	public UploadResult handle(String originalFilename, byte[] fileBuff) {
-		UploadResult result = new UploadResult();
-		result.setSuccess(false);
-		result.setOriginalFileName(originalFilename);
-		try {
-			// 验证文件件大小
-			if (fileBuff.length > maxSize * 1024) {
-				throw new UploadException("上传文件大小不能超过" + (maxSize / 1024) + "M");
-			}
-
-			MagicMatch magicMatch = Magic.getMagicMatch(fileBuff);
-
-			String extension = magicMatch.getExtension();
-			String mimeType = magicMatch.getMimeType();
-
-			// 验证文件类型
-			if (extension == null) {
-				throw new UploadException("无的文件扩展名,请重新上传");
-			}
-
-			extension = extension.toLowerCase();
-			List<String> listAllowExtensions = Arrays.asList(allowExtensions);
-			if (!listAllowExtensions.contains(extension)) {
-				throw new UploadException(String.format("只能上传%s类型的文件", String.join(",", allowExtensions)));
-			}
-
-			String filePath = String.format("%s/%s", savePath, DateUtil.format("yyyy/MM/dd"));
-			File fileDir = new File(filePath);
-			if (!fileDir.exists()) {
-				boolean mkdirResult = fileDir.mkdirs();
-				if (!mkdirResult) {
-					log.warn("mkdir save file path error {}", filePath);
-					throw new UploadException("创建上传目录失败");
-				}
-			}
-			filePath = String.format("%s/%s.%s", filePath, DigestUtils.md5Hex(fileBuff), extension);
-			File file = new File(filePath);
-
-
-			try {
-				ByteArrayInputStream in = new ByteArrayInputStream(fileBuff);
-				BufferedImage bi = ImageIO.read(in);
-				Thumbnails.of(bi).size(1200, 1200).toFile(file);
-			} catch (IOException e) {
-				log.warn("upload is not image file", e);
-				throw new UploadException("只能上传图片文件");
-			}
-
-			result.setSuccess(true);
-			result.setMessage("上传文件成功");
-			result.setMimeType(mimeType);
-			// 获取服务地址和端口
-			String url = filePath.replaceFirst(this.savePath, "");
-			result.setSrc(fileHost + url);
-			result.setSize(fileBuff.length);
-			result.setExtension(extension);
-			result.setId(this.sequenceService.nextId());
-
-			UploadFileInfo fileInfo = new UploadFileInfo();
-			BeanUtils.copyProperties(result, fileInfo);
-			fileInfo.setCreatedTime(DateUtil.current());
-			this.save(fileInfo);
-		} catch (UploadException e) {
-			result.setMessage(e.getMessage());
-		} catch (Exception e) {
-			log.error("upload file error", e);
-			result.setMessage("服务异常,请稍后再试");
-		}
-		return result;
-	}
+    @Value("${uploader.max-size}")
+    private long maxSize;
+
+    @Value("${uploader.allow-file-types}")
+    private String[] allowExtensions;
+
+    @Value("${uploader.save-path}")
+    private String savePath;
+
+    @Value("${uploader.file-host}")
+    private String fileHost;
+
+    @Autowired
+    private SequenceService sequenceService;
+
+    @Override
+    public UploadResult handle(String originalFilename, byte[] fileBuff) {
+        UploadResult result = new UploadResult();
+        result.setSuccess(false);
+        result.setOriginalFileName(originalFilename);
+        try {
+            // 验证文件件大小
+            if (fileBuff.length > maxSize * 1024) {
+                throw new UploadException("上传文件大小不能超过" + (maxSize / 1024) + "M");
+            }
+
+            MagicMatch magicMatch = Magic.getMagicMatch(fileBuff);
+
+            String extension = magicMatch.getExtension();
+            String mimeType = magicMatch.getMimeType();
+
+            // 验证文件类型
+            if (extension == null) {
+                throw new UploadException("无的文件扩展名,请重新上传");
+            }
+
+            extension = extension.toLowerCase();
+            List<String> listAllowExtensions = Arrays.asList(allowExtensions);
+            if (!listAllowExtensions.contains(extension)) {
+                throw new UploadException(String.format("只能上传%s类型的文件", String.join(",", allowExtensions)));
+            }
+
+            String filePath = String.format("%s/%s", savePath, DateUtil.format("yyyy/MM/dd"));
+            File fileDir = new File(filePath);
+            if (!fileDir.exists()) {
+                boolean mkdirResult = fileDir.mkdirs();
+                if (!mkdirResult) {
+                    log.warn("mkdir save file path error {}", filePath);
+                    throw new UploadException("创建上传目录失败");
+                }
+            }
+            filePath = String.format("%s/%s.%s", filePath, DigestUtils.md5Hex(fileBuff), extension);
+            File file = new File(filePath);
+
+
+            try {
+                ByteArrayInputStream in = new ByteArrayInputStream(fileBuff);
+                BufferedImage bi = ImageIO.read(in);
+                if (bi.getHeight() > 1000 || bi.getWidth() > 1000) {
+                    Thumbnails.of(bi).size(1000, 1000).toFile(file);
+                } else {
+                    Thumbnails.of(bi).size(bi.getWidth(), bi.getHeight()).toFile(file);
+                }
+            } catch (IOException e) {
+                log.warn("upload is not image file", e);
+                throw new UploadException("只能上传图片文件");
+            }
+
+            result.setSuccess(true);
+            result.setMessage("上传文件成功");
+            result.setMimeType(mimeType);
+            // 获取服务地址和端口
+            String url = filePath.replaceFirst(this.savePath, "");
+            result.setSrc(fileHost + url);
+            result.setSize(fileBuff.length);
+            result.setExtension(extension);
+            result.setId(this.sequenceService.nextId());
+
+            UploadFileInfo fileInfo = new UploadFileInfo();
+            BeanUtils.copyProperties(result, fileInfo);
+            fileInfo.setCreatedTime(DateUtil.current());
+            this.save(fileInfo);
+        } catch (UploadException e) {
+            result.setMessage(e.getMessage());
+        } catch (Exception e) {
+            log.error("upload file error", e);
+            result.setMessage("服务异常,请稍后再试");
+        }
+        return result;
+    }
 }

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
src/main/resources/public/index.html


+ 0 - 0
src/main/resources/public/static/css/app.03bde754.css → src/main/resources/public/static/css/app.f2efab09.css


+ 0 - 0
src/main/resources/public/static/css/chunk-1d9f9eae.4627e83e.css → src/main/resources/public/static/css/chunk-1d9f9eae.d33309cc.css


+ 0 - 0
src/main/resources/public/static/css/chunk-2914c052.4627e83e.css → src/main/resources/public/static/css/chunk-2914c052.d33309cc.css


+ 0 - 0
src/main/resources/public/static/css/chunk-41fc9b08.54c91be5.css → src/main/resources/public/static/css/chunk-41fc9b08.e5f0ac0b.css


+ 0 - 0
src/main/resources/public/static/css/chunk-78a3203a.f6ed7f52.css → src/main/resources/public/static/css/chunk-78a3203a.a26c90f5.css


+ 0 - 0
src/main/resources/public/static/css/chunk-7d2734ac.4627e83e.css → src/main/resources/public/static/css/chunk-7d2734ac.d33309cc.css


+ 0 - 0
src/main/resources/public/static/css/chunk-a8284054.43d8c414.css → src/main/resources/public/static/css/chunk-a8284054.544fa637.css


+ 0 - 0
src/main/resources/public/static/css/chunk-ad2707dc.4627e83e.css → src/main/resources/public/static/css/chunk-ad2707dc.d33309cc.css


+ 0 - 0
src/main/resources/public/static/js/app.d1987d2f.js → src/main/resources/public/static/js/app.1584cf64.js


+ 0 - 0
src/main/resources/public/static/js/chunk-0e6c0183.89b2ebbe.js → src/main/resources/public/static/js/chunk-0e6c0183.d4da2a86.js


+ 0 - 0
src/main/resources/public/static/js/chunk-1d9f9eae.dda289d8.js → src/main/resources/public/static/js/chunk-1d9f9eae.087e4c9f.js


+ 0 - 0
src/main/resources/public/static/js/chunk-1f91f110.08f7a8eb.js → src/main/resources/public/static/js/chunk-1f91f110.2e7c3c6a.js


+ 0 - 0
src/main/resources/public/static/js/chunk-2914c052.22761b46.js → src/main/resources/public/static/js/chunk-2914c052.102c2629.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
src/main/resources/public/static/js/chunk-2ecfd031.88a72abb.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
src/main/resources/public/static/js/chunk-2ecfd031.e4192ad3.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
src/main/resources/public/static/js/chunk-381877e5.141578ad.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
src/main/resources/public/static/js/chunk-41fc9b08.0c29ed9a.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
src/main/resources/public/static/js/chunk-41fc9b08.202375b2.js


+ 0 - 0
src/main/resources/public/static/js/chunk-4ce0a38e.367b52f6.js → src/main/resources/public/static/js/chunk-4ce0a38e.f46ad862.js


+ 0 - 0
src/main/resources/public/static/js/chunk-66422ce4.dd66caa3.js → src/main/resources/public/static/js/chunk-66422ce4.e8850385.js


+ 0 - 0
src/main/resources/public/static/js/chunk-67aa66b6.8a78ae3a.js → src/main/resources/public/static/js/chunk-67aa66b6.fb7dfabb.js


+ 0 - 0
src/main/resources/public/static/js/chunk-68cddace.335f4d88.js → src/main/resources/public/static/js/chunk-68cddace.723964a0.js


+ 0 - 0
src/main/resources/public/static/js/chunk-6bc75950.7f5be917.js → src/main/resources/public/static/js/chunk-6bc75950.f2682a2f.js


+ 0 - 0
src/main/resources/public/static/js/chunk-70d5bf9f.6540c046.js → src/main/resources/public/static/js/chunk-70d5bf9f.0ff8f9e1.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
src/main/resources/public/static/js/chunk-755fa2ec.18edb867.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
src/main/resources/public/static/js/chunk-755fa2ec.bdcd3fe6.js


+ 0 - 0
src/main/resources/public/static/js/chunk-78a3203a.e534e823.js → src/main/resources/public/static/js/chunk-78a3203a.795bdd7e.js


+ 0 - 0
src/main/resources/public/static/js/chunk-7959003c.128ddb8e.js → src/main/resources/public/static/js/chunk-7959003c.55b90961.js


+ 0 - 0
src/main/resources/public/static/js/chunk-7d2734ac.ac6e47f5.js → src/main/resources/public/static/js/chunk-7d2734ac.298c7581.js


+ 0 - 0
src/main/resources/public/static/js/chunk-7d56abd5.e4fdbdf8.js → src/main/resources/public/static/js/chunk-7d56abd5.749dc0c1.js


+ 0 - 0
src/main/resources/public/static/js/chunk-8b1a81cc.cd7e05f4.js → src/main/resources/public/static/js/chunk-8b1a81cc.00e1ed95.js


+ 0 - 0
src/main/resources/public/static/js/chunk-a8284054.b48c4914.js → src/main/resources/public/static/js/chunk-a8284054.39f34525.js


+ 0 - 0
src/main/resources/public/static/js/chunk-ad2707dc.b771df4a.js → src/main/resources/public/static/js/chunk-ad2707dc.3024ccdd.js


+ 0 - 0
src/main/resources/public/static/js/chunk-e36848bc.b90aebcc.js → src/main/resources/public/static/js/chunk-e36848bc.b9671c40.js


+ 0 - 0
src/main/resources/public/static/js/chunk-e5f2c62a.10bd50a6.js → src/main/resources/public/static/js/chunk-e5f2c62a.9007ae5b.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
src/main/resources/public/static/js/chunk-libs.e2c94e34.js


برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است