From 2eecb9f913d03068dcef3c5b706a58f6ff14eece Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 11 Jul 2019 11:55:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6windows?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=9B=98=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/system/user/add.html      | 2 +-
 .../java/com/ruoyi/common/utils/file/FileUploadUtils.java  | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/user/add.html b/ruoyi-admin/src/main/resources/templates/system/user/add.html
index e3b36042..f5d1e2eb 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/add.html
@@ -53,7 +53,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label"><span style="color: red; ">*</span>登录账号：</label>
                         <div class="col-sm-8">
-                            <input name="loginName" placeholder="请输入登录账号" class="form-control required" type="text" maxlength="30" required>
+                            <input name="loginName" placeholder="请输入登录账号" class="form-control" type="text" maxlength="30" required>
                         </div>
                     </div>
                 </div>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
index 7ebfcf72..cf4de4fb 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
@@ -113,7 +113,12 @@ public class FileUploadUtils
 
         File desc = getAbsoluteFile(baseDir, fileName);
         file.transferTo(desc);
-        String pathFileName = StringUtils.substringAfterLast(baseDir, ":") + fileName;
+        String pathFileName = baseDir + fileName;
+        if (StringUtils.contains(baseDir, ":"))
+        {
+            // windows 去除盘符
+            pathFileName = StringUtils.substringAfterLast(baseDir, ":") + fileName;
+        }
         return pathFileName;
     }