From 0ba79f60e8f7785e5d3fa89999be283a6746a830 Mon Sep 17 00:00:00 2001
From: Wang Chen Chen <932560435@qq.com>
Date: Tue, 27 Feb 2024 10:09:08 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8D=87=E7=BA=A7=20pom.xml=20=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../perms/service/impl/PmsUserServiceImpl.java |  3 ++-
 .../system/service/impl/FileDetailService.java | 18 +++++++++++++++++-
 server/plugins/mbp-tenant/pom.xml              |  2 +-
 server/pom.xml                                 |  8 ++++----
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/server/molly-pms/src/main/java/com/xaaef/molly/perms/service/impl/PmsUserServiceImpl.java b/server/molly-pms/src/main/java/com/xaaef/molly/perms/service/impl/PmsUserServiceImpl.java
index 415afaa..9254ed7 100644
--- a/server/molly-pms/src/main/java/com/xaaef/molly/perms/service/impl/PmsUserServiceImpl.java
+++ b/server/molly-pms/src/main/java/com/xaaef/molly/perms/service/impl/PmsUserServiceImpl.java
@@ -15,6 +15,7 @@ import com.xaaef.molly.auth.service.UserLoginService;
 import com.xaaef.molly.common.enums.AdminFlag;
 import com.xaaef.molly.common.enums.StatusEnum;
 import com.xaaef.molly.common.enums.UserType;
+import com.xaaef.molly.common.util.IdUtils;
 import com.xaaef.molly.internal.api.ApiCmsProjectService;
 import com.xaaef.molly.internal.api.ApiSysConfigService;
 import com.xaaef.molly.internal.api.ApiSysMenuService;
@@ -155,7 +156,7 @@ public class PmsUserServiceImpl extends BaseServiceImpl<PmsUserMapper, PmsUser>
         if (entity.getStatus() == null) {
             entity.setStatus(StatusEnum.NORMAL.getCode());
         }
-
+        entity.setUserId(IdUtils.getStandaloneId());
         var ok = super.save(entity);
 
         if (entity.getRoles() != null) {
diff --git a/server/molly-sys/src/main/java/com/xaaef/molly/system/service/impl/FileDetailService.java b/server/molly-sys/src/main/java/com/xaaef/molly/system/service/impl/FileDetailService.java
index 2559ddb..817d62b 100644
--- a/server/molly-sys/src/main/java/com/xaaef/molly/system/service/impl/FileDetailService.java
+++ b/server/molly-sys/src/main/java/com/xaaef/molly/system/service/impl/FileDetailService.java
@@ -12,6 +12,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.x.file.storage.core.FileInfo;
 import org.dromara.x.file.storage.core.recorder.FileRecorder;
+import org.dromara.x.file.storage.core.upload.FilePartInfo;
 import org.springframework.stereotype.Service;
 
 /**
@@ -29,7 +30,6 @@ import org.springframework.stereotype.Service;
 @AllArgsConstructor
 public class FileDetailService extends ServiceImpl<SysFileDetailMapper, SysFileDetail> implements FileRecorder {
 
-
     @Override
     public boolean save(FileInfo info) {
         var detail = BeanUtil.copyProperties(info, SysFileDetail.class, "attr");
@@ -44,6 +44,15 @@ public class FileDetailService extends ServiceImpl<SysFileDetailMapper, SysFileD
         return b;
     }
 
+    @Override
+    public void update(FileInfo info) {
+        var detail = BeanUtil.copyProperties(info, SysFileDetail.class, "attr");
+        //这是手动获 取附加属性字典 并转成 json 字符串，方便存储在数据库中
+        if (info.getAttr() != null) {
+            detail.setAttr(JsonUtils.toJson(info.getAttr()));
+        }
+        super.updateById(detail);
+    }
 
     @Override
     public FileInfo getByUrl(String url) {
@@ -71,5 +80,12 @@ public class FileDetailService extends ServiceImpl<SysFileDetailMapper, SysFileD
         );
     }
 
+    @Override
+    public void saveFilePart(FilePartInfo filePartInfo) {
+    }
+
+    @Override
+    public void deleteFilePartByUploadId(String uploadId) {
+    }
 
 }
diff --git a/server/plugins/mbp-tenant/pom.xml b/server/plugins/mbp-tenant/pom.xml
index 56346d1..ae9d569 100644
--- a/server/plugins/mbp-tenant/pom.xml
+++ b/server/plugins/mbp-tenant/pom.xml
@@ -18,7 +18,7 @@
 
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
             <version>${mybatis-plus.version}</version>
         </dependency>
 
diff --git a/server/pom.xml b/server/pom.xml
index 6248198..1755a4a 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -39,23 +39,23 @@
         <!-- 优化的雪花算法（雪花漂移），它生成的ID更短、速度更快 -->
         <idgenerator.version>1.0.6</idgenerator.version>
         <!-- x-file-storage文件上传 文档地址 https://x-file-storage.xuyanwu.cn -->
-        <storage.version>2.0.0</storage.version>
+        <storage.version>2.1.0</storage.version>
         <!-- 七牛云文件上传 -->
         <qiniu-storage.version>7.15.0</qiniu-storage.version>
         <!-- 阿里云文件上传 -->
         <aliyun-storage.version>3.17.4</aliyun-storage.version>
         <!-- 服务器运行状态查询， 如: CPU、磁盘、内存 -->
-        <oshi.version>6.4.11</oshi.version>
+        <oshi.version>6.4.13</oshi.version>
         <!-- Excel文件操作 -->
         <apache-poi.version>5.2.5</apache-poi.version>
         <!-- 小而美的工具库 -->
-        <hutool.version>5.8.25</hutool.version>
+        <hutool.version>5.8.26</hutool.version>
         <!-- 简单、方便的OpenAPI接口文档 -->
         <knife4j.version>4.5.0</knife4j.version>
         <!-- MyBatis 的增强工具，基友搭配，效率翻倍 -->
         <mybatis-plus.version>3.5.5</mybatis-plus.version>
         <!-- JavaEE 颠覆者 -->
-        <spring-boot.version>3.1.7</spring-boot.version>
+        <spring-boot.version>3.2.3</spring-boot.version>
     </properties>