提供一个完整的hello world例子，可以简单预览Argo的基本特性

58code · 58code · commit 734c50aaa69c · 2013-03-15T07:40:32.000+08:00
diff --git a/README.md b/README.md
@@ -41,7 +41,20 @@ Argo不是一个通用的web框架，一个问题解决方案可能有很多，
 
 ## Hello World
 
-请参考例子 hello-world
+请参考例子 samples/hello-world
+
+```shell
+mvn tomcat7:run
+```
+
+或者
+```shell
+mvn jetty:run
+```
+
+然后浏览
+
+http://localhost/
 
 ## 进阶
 
diff --git a/core/src/main/java/com/bj58/argo/utils/PathUtils.java b/core/src/main/java/com/bj58/argo/utils/PathUtils.java
@@ -105,7 +105,7 @@ public static String simplyWithoutPrefix(String url) {
      */
     public static String simplyWithoutSuffix(String url) {
         StringBuilder simply = simplyStringBuilder(url);
-        if (simply.length() > 0 && '/' == simply.charAt(simply.length() - 1))
+        if (simply.length() > 1 && '/' == simply.charAt(simply.length() - 1))
         	simply.deleteCharAt(simply.length() - 1);
 
         return simply.toString();
diff --git a/core/src/test/java/com/bj58/argo/utils/PathUtilsTest.java b/core/src/test/java/com/bj58/argo/utils/PathUtilsTest.java
@@ -53,7 +53,7 @@ public void testCombine() {
     public void testSimplyWithoutPrefix() {
         String url = "/";
         Assert.assertEquals(PathUtils.simplyWithoutPrefix(url), "");
-        Assert.assertEquals(PathUtils.simplyWithoutSuffix(url), "");
+        Assert.assertEquals(PathUtils.simplyWithoutSuffix(url), "/");
 
         url = "/opt";
         Assert.assertEquals(PathUtils.simplyWithoutPrefix(url), "opt");
diff --git a/samples/hello-world/src/main/java/com/bj58/argo/controllers/HomeController.java b/samples/hello-world/src/main/java/com/bj58/argo/controllers/HomeController.java
@@ -6,17 +6,17 @@
 import com.bj58.argo.annotations.POST;
 import com.bj58.argo.annotations.Path;
 import com.bj58.argo.client.ClientContext;
+import com.bj58.argo.client.Upload;
 import com.bj58.argo.controller.AbstractController;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
-import com.sun.jndi.toolkit.url.Uri;
 
 // 类的命名受 GroupConvetionAnnotation.controllerPattern约束
 public class HomeController extends AbstractController {
 
-    @Path("/")
+    @Path("")
     public ActionResult home() {
-        Uri uri;
+        System.out.println(1);
         return view("index"); // velocity模板是 /src/main/java/resources/views/index.html
     }
 
@@ -50,4 +50,48 @@ public ActionResult postForm() {
         return view("post"); // resources/views/post.html velocity模板
 
     }
+
+    /**
+     *
+     * 处理文件上传
+     *
+     */
+    @Path("post-upload.html")
+    @POST  // 只处理post的请求
+    public ActionResult postUpload() {
+
+        BeatContext beat = beat();
+
+        ClientContext client = beat.getClient();
+
+        Preconditions.checkState(Strings.isNullOrEmpty(client.form("company")));
+        Preconditions.checkState(Strings.isNullOrEmpty(client.form("address")));
+        Preconditions.checkState(Strings.isNullOrEmpty(client.form("file")));
+
+        client.queryString("name");
+
+        Preconditions.checkState(Strings.isNullOrEmpty(client.queryString("name")));
+        Preconditions.checkState(Strings.isNullOrEmpty(client.queryString("phone")));
+        Preconditions.checkState(Strings.isNullOrEmpty(client.queryString("submit")));
+        Preconditions.checkState(Strings.isNullOrEmpty(client.queryString("file")));
+
+
+        Upload upload = client.getUpload("file");
+
+
+        beat.getModel()
+                .add("company", client.queryString("company"))
+                .add("address", client.queryString("address"))
+
+                .add("name", client.form("name"))
+                .add("phone", client.form("phone"))
+                .add("submit", client.form("submit"))
+
+                .add("upload", upload);
+
+
+
+        return view("post-upload"); // resources/views/post-upload.html velocity模板
+
+    }
 }
diff --git a/samples/hello-world/src/main/resources/views/index.html b/samples/hello-world/src/main/resources/views/index.html
@@ -8,7 +8,7 @@ <h2>Samples</h2>
     <li><a href="/hello/world">根据url获得参数的hello wolrd</a></li>
     <li><a href="1.html">静态文件显示</a></li>
     <li><a href="form.html">区分queryString和form参数</a></li>
-    <li>文件上传展示 todo</li>
+    <li><a href="upload-form.html">文件上传展示</a></li>
 </ul>
 </body>
-</html>
+</html>
diff --git a/samples/hello-world/src/main/resources/views/post-upload.html b/samples/hello-world/src/main/resources/views/post-upload.html
@@ -0,0 +1,32 @@
+<html>
+<head>
+    <title>form</title>
+</head>
+<body>
+<h2>form post</h2>
+
+<h3>upload file</h3>
+<ul>
+    <li>file name: $upload.fileName <i>注:调用 Upload.getFileName()实现,以下同理</i></li>
+    <li>file size: $upload.size</li>
+    <li>file contentType: $upload.contentType</li>
+</ul>
+
+<h3>queryString parameter</h3>
+<ul>
+    <li>company: $company</li>
+    <li>address: $address</li>
+</ul>
+<h3>form parameter</h3>
+<ul>
+    <li>name: $name</li>
+    <li>phone: $phone</li>
+    <li>submit: $submit</li>
+</ul>
+
+<p>
+
+处理的Action是 HomeController.postForm
+
+</body>
+</html>
diff --git a/samples/hello-world/src/main/webapp/upload-form.html b/samples/hello-world/src/main/webapp/upload-form.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title></title>
+</head>
+<body>
+
+
+<form method="post" enctype="multipart/form-data" action="post-upload.html?company=58.com&address=beijing">
+    <ul>
+        <li>name: <input type="text" name="name"/></li>
+        <li>phone: <input type="text" name="phone"/></li>
+        <li>file:<input type="file" name="file"></li>
+    </ul>
+
+    <input type="submit" name="submit" value="提交"/>
+
+</form>
+
+<p>
+
+    这是一个表单提交页面<br/>
+    <i>action="post-upload.html?company=58.com&address=beijing" </i><br/>
+    我们希望在post-upload.html(对应的Action是HomeController.postUpload())中能区分queryString和form的数据。
+
+
+
+</body>
+</html>
