From 1e7618c135616bba3d54a3388658df12b5997950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=B4=AA=E9=BE=99?= <599179587@qq.com>
Date: Fri, 14 Jul 2017 17:51:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                           |  6 ++++++
 src/main/java/com/ifish/config/RootConfig.java    | 15 ++++++++++++++-
 src/main/java/com/ifish/controller/Index.java     | 15 +++++++++++++++
 src/main/java/com/ifish/controller/Login.java     | 13 +++++++++++++
 src/main/java/com/ifish/helper/FastDFSClient.java |  8 +-------
 src/main/resources/property.properties            |  4 ++--
 src/main/webapp/index.jsp                         |  6 +++++-
 7 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 35fb1e0..2fcab6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,6 +76,12 @@
             <version>0.9.1.2</version>
             <type>jar</type>
         </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.3.2</version>
+            <type>jar</type>
+        </dependency>
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-web-api</artifactId>
diff --git a/src/main/java/com/ifish/config/RootConfig.java b/src/main/java/com/ifish/config/RootConfig.java
index f2aaaa3..09ca7e6 100644
--- a/src/main/java/com/ifish/config/RootConfig.java
+++ b/src/main/java/com/ifish/config/RootConfig.java
@@ -5,11 +5,12 @@
  */
 package com.ifish.config;
 
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.FilterType;
-import org.springframework.context.annotation.Import;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
 /**
@@ -23,4 +24,16 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
             @Filter(type = FilterType.ANNOTATION, value = EnableWebMvc.class)})
 public class RootConfig {
 
+    /**
+     * 文件上传
+     *
+     * @return
+     */
+    @Bean
+    public CommonsMultipartResolver multipartResolver() {
+        CommonsMultipartResolver commonsMultipartResolver = new CommonsMultipartResolver();
+        commonsMultipartResolver.setMaxUploadSize(10485760);
+        return commonsMultipartResolver;
+    }
+
 }
diff --git a/src/main/java/com/ifish/controller/Index.java b/src/main/java/com/ifish/controller/Index.java
index 591d78c..384e23a 100644
--- a/src/main/java/com/ifish/controller/Index.java
+++ b/src/main/java/com/ifish/controller/Index.java
@@ -5,9 +5,13 @@
  */
 package com.ifish.controller;
 
+import com.ifish.helper.FastDFSClientI;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  *
@@ -20,4 +24,15 @@ public class Index {
     public String index() {
         return "index"; //返回的视图名为index（指向/WEB-INF/Views/index.jsp）
     }
+
+    @Autowired
+    private FastDFSClientI fastDFSClientI;
+
+    @RequestMapping(value = "/test", method = RequestMethod.POST)
+    @ResponseBody
+    public String test(MultipartFile file) {
+        String filstring = fastDFSClientI.uploadFileToFastDFS(file);
+        return "abc";
+
+    }
 }
diff --git a/src/main/java/com/ifish/controller/Login.java b/src/main/java/com/ifish/controller/Login.java
index 7a820b4..5c2940c 100644
--- a/src/main/java/com/ifish/controller/Login.java
+++ b/src/main/java/com/ifish/controller/Login.java
@@ -36,6 +36,13 @@ public class Login {
         return userHelperI.login(user);
     }
 
+    /**
+     * 发送手机验证码
+     *
+     * @param sendType
+     * @param phoneNumber
+     * @return
+     */
     @RequestMapping("/getSecurityCode.do")
     public Object getSecurityCode(String sendType, String phoneNumber) {
         try {
@@ -45,6 +52,12 @@ public class Login {
         return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
     }
 
+    /**
+     * 手机注册
+     *
+     * @param user
+     * @return
+     */
     @RequestMapping(value = "/registerByMobile", method = RequestMethod.GET)
     public Object registerByMobile(Tbl_User user) {
         return userHelperI.registerByMobile(user);
diff --git a/src/main/java/com/ifish/helper/FastDFSClient.java b/src/main/java/com/ifish/helper/FastDFSClient.java
index 04a5ea9..189a2df 100644
--- a/src/main/java/com/ifish/helper/FastDFSClient.java
+++ b/src/main/java/com/ifish/helper/FastDFSClient.java
@@ -131,13 +131,7 @@ public class FastDFSClient implements FastDFSClientI {
             } else {
                 return "";
             }
-            //本地返回测试环境fastfds,线上返回正式服务器部署的fastfds
-            if (IfishUtil.IsWinOrUnix()) {
-                return IfishFilePath.fastDFS_url_app + url;
-            } else {
-                return IfishFilePath.link_img_head + url;
-            }
-
+            return IfishFilePath.link_img_head + url;
         } catch (Exception e) {
             return "";
         }
diff --git a/src/main/resources/property.properties b/src/main/resources/property.properties
index 2c6c76c..936106f 100644
--- a/src/main/resources/property.properties
+++ b/src/main/resources/property.properties
@@ -27,9 +27,9 @@ fastDFS_url_app=http://app.ifish7.com/
 #\u672c\u5730
 #link_img_head=http://192.168.61.128:81/
 #\u6d4b\u8bd5\u73af\u5883
-#link_img_head=https://app.zhangxinyanv5.top/
+link_img_head=https://app.zhangxinyanv5.top/
 #\u6b63\u5f0f\u73af\u5883
-link_img_head=https://app.ifish7.com/
+#link_img_head=https://app.ifish7.com/
 #\u56fe\u7247\u683c\u5f0f\u9a8c\u8bc1
 check_style=GIF,PNG,BMP,JPG,JPEG
 #\u662f\u5426\u5f00\u53d1\u6a21\u5f0f\uff0cfalse\u5219\u4ee3\u8868\u8981\u53d1\u5e03\u5230\u6d4b\u8bd5\u6216\u8005\u6b63\u5f0f\u73af\u5883\uff0c\u4f1a\u8fdb\u884c\u5168\u5c40\u5934\u90e8\u9a8c\u8bc1\uff0ctrue\u4ee3\u8868\u5728\u672c\u5730\u8fdb\u884c\u4ee3\u7801\u7f16\u5199\uff0c\u4e0d\u4f1a\u8fdb\u884c\u9a8c\u8bc1
diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
index 3691071..822712e 100644
--- a/src/main/webapp/index.jsp
+++ b/src/main/webapp/index.jsp
@@ -1,6 +1,6 @@
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-   "http://www.w3.org/TR/html4/loose.dtd">
+    "http://www.w3.org/TR/html4/loose.dtd">
 
 <html>
     <head>
@@ -9,5 +9,9 @@
     </head>
     <body>
         <h1 style="text-align: center">访问正常!</h1>
+        <form action="/api/test" method="post" enctype="multipart/form-data">
+            <input type="file" name="file" >
+            <input type="submit" value="提交">
+        </form>
     </body>
 </html>