Merge remote-tracking branch 'origin/master'

2025-09-28 18:23:29 +08:00
parent f3e072352b 516f4e94c9
commit c822d03e98
11 changed files with 58 additions and 105 deletions
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -7,7 +7,7 @@ ruoyi:
  # 版权年份
  copyrightYear: 2025
  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: /home/wangyu/uploadPath
+  profile: D:\temp
  # 获取ip地址开关
  addressEnabled: false
  # 验证码类型 math 数字计算 char 字符验证
--- a/ruoyi-admin/src/main/resources/libs/models/garbage/classes.txt
+++ b/ruoyi-admin/src/main/resources/libs/models/garbage/classes.txt
@@ -0,0 +1 @@
+trash
--- a/ruoyi-admin/src/main/resources/libs/models/garbage/garbage.onnx
+++ b/ruoyi-admin/src/main/resources/libs/models/garbage/garbage.onnx
--- a/ruoyi-admin/src/main/resources/libs/models/models.json
+++ b/ruoyi-admin/src/main/resources/libs/models/models.json
@@ -0,0 +1,5 @@
+[
+  {"name":"garbage","path":"libs/models/garbage","size":[640,640],"backend":"OpenCV"},
+  {"name":"smoke","path":"libs/models/smoke","size":[640,640],"backend":"OpenCV"}
+
+]
--- a/ruoyi-admin/src/main/resources/libs/models/smoke/smoke.onnx
+++ b/ruoyi-admin/src/main/resources/libs/models/smoke/smoke.onnx