Merge branch 'master' of github.com:henryyan/kft-activiti-demo

* 'master' of github.com:henryyan/kft-activiti-demo: 修复h2版本不对的问题优化方法注释
henryyan · May 8, 2014 · 5511d61 · 5511d61
2 parents 33907c8 + fc82d69
commit 5511d61
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/me/kafeitu/demo/activiti/web/form/dynamic/DynamicFormController.java b/src/main/java/me/kafeitu/demo/activiti/web/form/dynamic/DynamicFormController.java
@@ -111,7 +111,7 @@ public ModelAndView processDefinitionList(Model model, @RequestParam(value = "pr
     }
 
     /**
-     * 读取启动流程的表单字段
+     * 初始化启动流程，读取启动流程的表单字段来渲染start form
      */
     @RequestMapping(value = "get-form/start/{processDefinitionId}")
     @ResponseBody
@@ -172,7 +172,7 @@ public Map<String, Object> findTaskForm(@PathVariable("taskId") String taskId) t
     }
 
     /**
-     * 提交task的并保存form
+     * 办理任务，提交task的并保存form
      */
     @RequestMapping(value = "task/complete/{taskId}")
     @SuppressWarnings("unchecked")
@@ -212,7 +212,7 @@ public String completeTask(@PathVariable("taskId") String taskId, @RequestParam(
     }
 
     /**
-     * 读取启动流程的表单字段
+     * 提交启动流程
      */
     @RequestMapping(value = "start-process/{processDefinitionId}")
     @SuppressWarnings("unchecked")

diff --git a/src/main/java/me/kafeitu/demo/activiti/web/form/formkey/FormKeyController.java b/src/main/java/me/kafeitu/demo/activiti/web/form/formkey/FormKeyController.java
@@ -92,7 +92,7 @@ public ModelAndView processDefinitionList(Model model, HttpServletRequest reques
     }
 
     /**
-     * 读取启动流程的表单内容
+     * 初始化启动流程，读取启动流程的表单内容来渲染start form
      */
     @RequestMapping(value = "get-form/start/{processDefinitionId}")
     @ResponseBody
@@ -115,7 +115,7 @@ public Object findTaskForm(@PathVariable("taskId") String taskId) throws Excepti
     }
 
     /**
-     * 提交task的并保存form
+     * 办理任务，提交task的并保存form
      */
     @RequestMapping(value = "task/complete/{taskId}")
     @SuppressWarnings("unchecked")

diff --git a/support/h2/pom.xml b/support/h2/pom.xml
@@ -12,7 +12,7 @@
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
-			<version>1.3.167</version>
+			<version>1.3.173</version>
 			<scope>runtime</scope>
 		</dependency>
 	</dependencies>