Commit b28da06
committed
Server:取消注释Controller中走HTTP GET的open_get和open_head，测试过和走HTTP POST的get,head不冲突
1 parent 97fec93 commit b28da06
1 file changed
Lines changed: 33 additions & 31 deletions
Lines changed: 33 additions & 31 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -22,11 +22,13 @@ | |||
| 22 | 22 | import static zuo.biao.apijson.RequestMethod.POST_HEAD; | |
| 23 | 23 | import static zuo.biao.apijson.RequestMethod.PUT; | |
| 24 | 24 | ||
| 25 | + import java.net.URLDecoder; | ||
| 25 | 26 | import java.util.Random; | |
| 26 | 27 | import java.util.concurrent.TimeoutException; | |
| 27 | 28 | ||
| 28 | 29 | import javax.servlet.http.HttpSession; | |
| 29 | 30 | ||
| 31 | + import org.springframework.web.bind.annotation.PathVariable; | ||
| 30 | 32 | import org.springframework.web.bind.annotation.RequestBody; | |
| 31 | 33 | import org.springframework.web.bind.annotation.RequestMapping; | |
| 32 | 34 | import org.springframework.web.bind.annotation.RestController; | |
@@ -64,37 +66,37 @@ public class Controller { | |||
| 64 | 66 | ||
| 65 | 67 | //通用接口，非事务型操作 和 简单事务型操作 都可通过这些接口自动化实现<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< | |
| 66 | 68 | ||
| 67 | - // /**获取 | ||
| 68 | - // * @param request 只用String，避免encode后未decode | ||
| 69 | - // * @param session | ||
| 70 | - // * @return | ||
| 71 | - // * @see {@link RequestMethod#GET} | ||
| 72 | - // */ | ||
| 73 | - // @RequestMapping("get/{request}") | ||
| 74 | - // public String open_get(@PathVariable String request, HttpSession session) { | ||
| 75 | - // try { | ||
| 76 | - // request = URLDecoder.decode(request, StringUtil.UTF_8); | ||
| 77 | - // } catch (Exception e) { | ||
| 78 | - // // Parser会报错 | ||
| 79 | - // } | ||
| 80 | - // return get(request, session); | ||
| 81 | - // } | ||
| 82 | - // | ||
| 83 | - // /**计数 | ||
| 84 | - // * @param request 只用String，避免encode后未decode | ||
| 85 | - // * @param session | ||
| 86 | - // * @return | ||
| 87 | - // * @see {@link RequestMethod#HEAD} | ||
| 88 | - // */ | ||
| 89 | - // @RequestMapping("head/{request}") | ||
| 90 | - // public String open_head(@PathVariable String request, HttpSession session) { | ||
| 91 | - // try { | ||
| 92 | - // request = URLDecoder.decode(request, StringUtil.UTF_8); | ||
| 93 | - // } catch (Exception e) { | ||
| 94 | - // // Parser会报错 | ||
| 95 | - // } | ||
| 96 | - // return head(request, session); | ||
| 97 | - // } | ||
| 69 | + /**获取 | ||
| 70 | + * @param request 只用String，避免encode后未decode | ||
| 71 | + * @param session | ||
| 72 | + * @return | ||
| 73 | + * @see {@link RequestMethod#GET} | ||
| 74 | + */ | ||
| 75 | + @RequestMapping("get/{request}") | ||
| 76 | + public String open_get(@PathVariable String request, HttpSession session) { | ||
| 77 | + try { | ||
| 78 | + request = URLDecoder.decode(request, StringUtil.UTF_8); | ||
| 79 | + } catch (Exception e) { | ||
| 80 | + // Parser会报错 | ||
| 81 | + } | ||
| 82 | + return get(request, session); | ||
| 83 | + } | ||
| 84 | + | ||
| 85 | + /**计数 | ||
| 86 | + * @param request 只用String，避免encode后未decode | ||
| 87 | + * @param session | ||
| 88 | + * @return | ||
| 89 | + * @see {@link RequestMethod#HEAD} | ||
| 90 | + */ | ||
| 91 | + @RequestMapping("head/{request}") | ||
| 92 | + public String open_head(@PathVariable String request, HttpSession session) { | ||
| 93 | + try { | ||
| 94 | + request = URLDecoder.decode(request, StringUtil.UTF_8); | ||
| 95 | + } catch (Exception e) { | ||
| 96 | + // Parser会报错 | ||
| 97 | + } | ||
| 98 | + return head(request, session); | ||
| 99 | + } | ||
| 98 | 100 | ||
| 99 | 101 | /**获取 | |
| 100 | 102 | * @param request 只用String，避免encode后未decode | |
0 commit comments