Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump spring-web from 4.3.21.RELEASE to 6.0.0 #36

Open
wants to merge 387 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
387 commits
Select commit Hold shift + click to select a range
d47001b
Merge branch 'develop'
netbuffer Jun 26, 2016
7a856dc
test
netbuffer Jun 27, 2016
4c40830
RedirectAttributes
netbuffer Jun 29, 2016
42d2c89
use mybatis selectKey
Jul 1, 2016
210d3ab
update druid version
netbuffer Jul 1, 2016
82dd892
Merge branch 'develop'
netbuffer Jul 1, 2016
e7765bd
test Array
Jul 2, 2016
f5d0656
test
netbuffer Jul 3, 2016
4da48ce
Merge branch 'develop' of [email protected]:netbuffer/ssmbootstrap_table…
netbuffer Jul 3, 2016
1971337
spring ApplicationEvent
Jul 4, 2016
3e35b36
test
Jul 4, 2016
d265d61
update
netbuffer Jul 4, 2016
622c75e
Merge branch 'develop'
netbuffer Jul 4, 2016
09f72d1
prevent duplicate submission
Jul 5, 2016
58230bc
test
netbuffer Jul 5, 2016
c96955a
update
netbuffer Jul 5, 2016
65ab0db
ehcache
Jul 6, 2016
b780909
update
Jul 6, 2016
c3ba26f
Merge branch 'develop'
Jul 6, 2016
a3fa944
ResponseStatus
Jul 6, 2016
244cd86
token
Jul 6, 2016
5bc103a
ajax request
Jul 6, 2016
c3ea94e
token tip
Jul 6, 2016
b4d45f8
ehcache
Jul 6, 2016
085e81d
ehcache test
netbuffer Jul 6, 2016
c4838e4
Jul 7, 2016
36aabf0
Merge branch 'develop' of https://github.com/netbuffer/ssmbootstrap_t…
Jul 7, 2016
d9f4a97
cache
Jul 7, 2016
9ff163d
cache test
Jul 7, 2016
f326df2
test cache
netbuffer Jul 7, 2016
5536c7f
update
Jul 8, 2016
a3821fc
test
Jul 8, 2016
6eeef63
test transaction
Jul 8, 2016
adb46fc
spring profile
netbuffer Jul 9, 2016
9910344
test @transactional
netbuffer Jul 9, 2016
e64775e
metrics-spring
netbuffer Jul 10, 2016
a76a629
metrics-servlet
Jul 12, 2016
72ec330
update
Jul 12, 2016
706eb55
update
netbuffer Jul 12, 2016
e3de39e
Merge branch 'develop'
netbuffer Jul 12, 2016
d1cae2e
update readme
netbuffer Jul 12, 2016
0694588
Merge branch 'develop'
netbuffer Jul 12, 2016
4800c8e
add jsonpfilter
Jul 13, 2016
9b2fa4a
Merge branch 'develop'
Jul 13, 2016
e73b19f
fix
Jul 13, 2016
c074773
Merge branch 'develop'
Jul 13, 2016
e0666bf
update
Jul 13, 2016
f3fedcd
Merge branch 'develop'
netbuffer Jul 13, 2016
a8bb16a
test
Jul 15, 2016
54bf4c0
cookie httponly
Jul 16, 2016
d5c16fa
test
Jul 16, 2016
4d4803e
del cookie
netbuffer Jul 17, 2016
5e932af
test del jsessionid
netbuffer Jul 17, 2016
9b2e131
Merge branch 'develop'
netbuffer Jul 17, 2016
a51fc53
test springmvc async
Jul 19, 2016
3afa748
Merge branch 'develop' of https://github.com/netbuffer/ssmbootstrap_t…
Jul 19, 2016
4b867c8
async test
netbuffer Jul 19, 2016
eba4eb9
test
netbuffer Jul 19, 2016
2b73d4b
test
Jul 20, 2016
a3aac0f
update
netbuffer Jul 20, 2016
f735aa7
test maven plugin
Jul 21, 2016
adc9061
update
netbuffer Jul 21, 2016
6305be1
update
Jul 22, 2016
f997670
synchronize
Jul 23, 2016
64cca56
ueditor
Jul 25, 2016
8edfc09
Merge branch 'develop'
Jul 25, 2016
6cedc7e
update readme
Jul 26, 2016
5093bd4
Merge branch 'develop'
Jul 26, 2016
135a6f7
remember uri
Jul 26, 2016
68e130e
update
Jul 26, 2016
9790772
test
Jul 27, 2016
9ba7d51
test
Jul 28, 2016
4f00d41
test download
Jul 30, 2016
67fdc39
update
netbuffer Jul 30, 2016
ef6d03c
test
Aug 1, 2016
fc95883
springfox
Aug 2, 2016
25f5568
test
Aug 2, 2016
338e1ca
update readme
netbuffer Aug 2, 2016
d35a470
Merge branch 'develop'
netbuffer Aug 2, 2016
6da61f2
spring-websocket
Aug 3, 2016
ca4f344
test websocket sockjs
Aug 4, 2016
6c57d5c
Merge branch 'develop'
Aug 4, 2016
70a768c
cors-filter
Aug 4, 2016
6602f6b
update
Aug 5, 2016
8213710
Merge branch 'develop'
Aug 5, 2016
3946161
ant-path
Aug 5, 2016
3855210
zxing test
netbuffer Aug 7, 2016
036365f
Merge branch 'develop'
netbuffer Aug 7, 2016
1181bd9
zxing config
netbuffer Aug 8, 2016
16ca1fc
test httpservletrequestwrapper
netbuffer Aug 9, 2016
e405469
remove osc-maven
Aug 11, 2016
469e6a9
field array
netbuffer Aug 11, 2016
76efcbe
Merge branch 'develop'
netbuffer Aug 11, 2016
4694ef7
loginfilter use antpathmatch
netbuffer Aug 11, 2016
85e67bb
Merge branch 'develop'
netbuffer Aug 12, 2016
d679fa6
test beancopy
netbuffer Aug 12, 2016
daab915
testThumbnailator
netbuffer Aug 13, 2016
1f9b4ff
jquery ajax upload
netbuffer Aug 14, 2016
b205fe9
jq ajax upload test
netbuffer Aug 15, 2016
79ab7d6
jquery ajax uploads
netbuffer Aug 17, 2016
b600146
test multiupload
netbuffer Aug 18, 2016
e6519c7
mockito/jwebunit
netbuffer Aug 19, 2016
2c27a83
exclusion servlet dependence
netbuffer Aug 21, 2016
73bfad3
test
netbuffer Aug 21, 2016
087da8c
Merge branch 'develop'
netbuffer Aug 21, 2016
1d000a2
test pdfview
netbuffer Aug 22, 2016
90ed1d3
springmvc pdfview
netbuffer Aug 23, 2016
a31c2a8
test excel view
netbuffer Aug 23, 2016
95d7668
fix pdf cell chinese
netbuffer Aug 23, 2016
946c0d5
excel-view/mybatis sql split
netbuffer Aug 24, 2016
4c58399
fix excel view
netbuffer Aug 25, 2016
a9574e4
test synchronize
netbuffer Aug 25, 2016
186962e
fix excel export
netbuffer Aug 25, 2016
c1bfd58
mysql table lock
netbuffer Aug 25, 2016
c39d5af
Merge branch 'develop'
netbuffer Aug 25, 2016
0b1401a
fix
netbuffer Aug 25, 2016
27a2f21
Merge branch 'develop'
netbuffer Aug 25, 2016
205990c
update
netbuffer Aug 26, 2016
c31d095
Merge branch 'develop'
netbuffer Aug 26, 2016
e3f11de
update
netbuffer Aug 27, 2016
f8ad7d8
jdk ReentrantLock
netbuffer Aug 27, 2016
ff4a82d
add bootbox.js
netbuffer Aug 28, 2016
03576ce
add gitignore
netbuffer Aug 30, 2016
b77a56c
update gitignore
netbuffer Aug 31, 2016
46a20fe
Merge branch 'develop'
netbuffer Sep 4, 2016
bd65568
test ua
netbuffer Sep 5, 2016
cbd02df
test enum
netbuffer Sep 12, 2016
cc16c4d
lock table
netbuffer Sep 14, 2016
bda4260
update spring config
netbuffer Sep 18, 2016
96802be
Merge branch 'develop'
netbuffer Sep 18, 2016
2a506b4
qr color
netbuffer Sep 19, 2016
e1b32bd
watermark
netbuffer Sep 19, 2016
245e352
del
netbuffer Sep 19, 2016
e0b6267
add jsoup
netbuffer Sep 19, 2016
c71860e
update
netbuffer Sep 19, 2016
a2f4af3
fixed login
netbuffer Sep 20, 2016
3612454
test bootstrap-fileinput/@ModelAttribute
netbuffer Oct 11, 2016
886a651
Merge branch 'develop'
netbuffer Oct 11, 2016
52e2902
update
netbuffer Oct 11, 2016
993fab0
update
netbuffer Oct 12, 2016
559c8a4
Merge branch 'develop'
netbuffer Oct 12, 2016
ae01403
fix swagger-ui.html
netbuffer Oct 12, 2016
40fab2e
Merge branch 'develop'
netbuffer Oct 12, 2016
63514de
Merge branch 'master' of [email protected]:netbuffer/ssmbootstrap_table.git
netbuffer Oct 12, 2016
1953223
update
netbuffer Oct 14, 2016
7632d86
Merge branch 'develop'
netbuffer Oct 14, 2016
6d4292d
update readme
netbuffer Oct 18, 2016
10a32bd
Merge branch 'develop'
netbuffer Oct 18, 2016
52f5958
add enum
netbuffer Nov 5, 2016
0c046ce
test
netbuffer Nov 9, 2016
482fcda
add jQuery-Validation-Engine
netbuffer Nov 10, 2016
83e6258
Merge branch 'develop'
netbuffer Nov 10, 2016
9f8725b
Merge branch 'master' of
netbuffer Nov 10, 2016
b7c30b7
update
netbuffer Nov 10, 2016
614bf1b
update
netbuffer Nov 10, 2016
58f4b70
test DelegatingFilterProxy
netbuffer Nov 10, 2016
f186db0
Merge branch 'develop'
netbuffer Nov 10, 2016
e63b4e3
update
netbuffer Nov 14, 2016
1c267a0
test
netbuffer Nov 15, 2016
57e617e
Merge branch 'develop' of [email protected]:netbuffer/ssmbootstrap_table…
netbuffer Nov 15, 2016
c28619c
update readme
netbuffer Dec 1, 2016
65df1b7
update
netbuffer Dec 2, 2016
8421bd5
Merge branch 'develop'
netbuffer Dec 2, 2016
85c6ca0
adapter idea ide
netbuffer Dec 2, 2016
a0f8227
update remark
netbuffer Dec 2, 2016
e35bb19
Merge branch 'develop'
netbuffer Dec 2, 2016
18dc448
update
netbuffer Dec 2, 2016
46ece92
Merge branch 'develop'
netbuffer Dec 2, 2016
29d8745
Merge branch 'develop' of [email protected]:netbuffer/ssmbootstrap_table…
netbuffer Dec 2, 2016
d5bd427
update
netbuffer Dec 2, 2016
4a82ecf
update readme
netbuffer Dec 2, 2016
f298b39
test
netbuffer Dec 2, 2016
6da3494
Merge branch 'develop'
netbuffer Dec 2, 2016
3a24a4f
update
netbuffer Dec 4, 2016
28abc9d
Merge branch 'develop'
netbuffer Dec 4, 2016
3077b16
fix
netbuffer Dec 12, 2016
2fcc1f8
receive json str/json object
netbuffer Dec 12, 2016
977efb1
test controller aspect
netbuffer Dec 12, 2016
690bf5c
Merge branch 'develop' of [email protected]:netbuffer/ssmbootstrap_table…
netbuffer Dec 13, 2016
2040a6d
Merge branch 'develop'
netbuffer Dec 13, 2016
b598c53
fix
netbuffer Dec 14, 2016
3d9fc5f
update
netbuffer Jan 7, 2017
1d408dc
Merge remote-tracking branch 'origin/develop' into develop
netbuffer Jan 7, 2017
59ac2f4
Merge branch 'develop'
netbuffer Jan 7, 2017
4dcce56
test
netbuffer Jan 9, 2017
92ff184
Merge branch 'develop'
netbuffer Jan 9, 2017
cbda794
Merge remote-tracking branch 'origin/master'
netbuffer Jan 9, 2017
f41ecb5
update
netbuffer Jan 10, 2017
6f46244
update
netbuffer Jan 10, 2017
6a160e1
test @Async
netbuffer Jan 11, 2017
ca458ed
update
netbuffer Jan 11, 2017
9125cd7
update
netbuffer Jan 11, 2017
9d079e4
Merge remote-tracking branch 'origin/develop'
netbuffer Feb 15, 2017
bfd387e
update spring.profiles
netbuffer Feb 23, 2017
8b6813b
Merge remote-tracking branch 'remotes/origin/develop'
netbuffer Feb 23, 2017
c4b98b6
update logback config
netbuffer Mar 6, 2017
0d9f302
update
netbuffer Mar 6, 2017
30b6d6e
Merge branch 'develop'
netbuffer Mar 24, 2017
beb20de
update
netbuffer Apr 20, 2017
0cd3e99
update readme
netbuffer May 7, 2017
f2c59a7
Merge remote-tracking branch 'remotes/origin/develop'
netbuffer May 7, 2017
0512e96
ehcache get/put cache
netbuffer May 16, 2017
29b07c3
event
netbuffer May 17, 2017
ae3b830
update readme
netbuffer Jun 4, 2017
1d2decf
Merge remote-tracking branch 'remotes/origin/develop'
netbuffer Jun 4, 2017
77814e0
update readme
netbuffer Aug 26, 2017
da4430d
Merge remote-tracking branch 'remotes/origin/develop'
netbuffer Aug 26, 2017
5c3936b
remove useless code
netbuffer Aug 27, 2017
7089422
Merge remote-tracking branch 'origin/develop'
netbuffer Aug 27, 2017
df1c66c
fix ajaxfileupload
netbuffer Sep 2, 2017
f415fe6
remove cxf && update spring version
netbuffer Sep 2, 2017
7bc4e6c
Merge remote-tracking branch 'remotes/origin/develop'
netbuffer Sep 2, 2017
dd154b8
update readme
netbuffer Sep 3, 2017
04b7c0d
rename package
netbuffer Oct 26, 2017
3fccb2c
update LoginFilter
netbuffer Oct 26, 2017
40ad97b
update get static var
netbuffer Oct 26, 2017
cd910a0
Merge remote-tracking branch 'remotes/origin/develop'
netbuffer Oct 26, 2017
1dbbaa8
remove cxf.version
netbuffer Oct 26, 2017
44d1e33
fix login twice
netbuffer Oct 26, 2017
cbbd2cf
Merge remote-tracking branch 'origin/develop'
netbuffer Oct 26, 2017
474bc99
Merge remote-tracking branch 'origin/master'
netbuffer Oct 26, 2017
5ad643d
add project encoding
netbuffer Nov 22, 2017
09907aa
fastjson write null
netbuffer Nov 27, 2017
4b6ac3e
test DeferredResult
netbuffer Nov 27, 2017
cf4a114
Merge remote-tracking branch 'origin/develop'
netbuffer Nov 27, 2017
068cbcf
Merge remote-tracking branch 'origin/master'
netbuffer Nov 27, 2017
f2c6cc2
update
netbuffer Nov 29, 2017
2ceb447
Merge remote-tracking branch 'origin/develop'
netbuffer Nov 29, 2017
66d0c2f
Merge remote-tracking branch 'origin/master'
netbuffer Nov 29, 2017
4affb6b
jsp tag
netbuffer Dec 7, 2017
8dd4642
Merge remote-tracking branch 'origin/develop'
netbuffer Dec 7, 2017
9e0b6be
fix LoginEvent twice
netbuffer Dec 8, 2017
5890063
remove redundant
netbuffer Dec 8, 2017
0ff5739
Merge remote-tracking branch 'origin/develop'
netbuffer Dec 8, 2017
ef6dd27
color set
netbuffer Feb 10, 2018
5e81dbd
add static files
netbuffer Feb 10, 2018
d0e1d53
Merge remote-tracking branch 'origin/develop'
netbuffer Feb 10, 2018
f8f9f09
test ImageIO
netbuffer Mar 6, 2018
c0bbc5e
update git address
netbuffer Apr 3, 2018
6341fb7
Merge remote-tracking branch 'origin/develop' into develop
netbuffer Apr 3, 2018
57bb24d
Merge remote-tracking branch 'origin/develop'
netbuffer Apr 3, 2018
83e33eb
update
netbuffer Aug 10, 2018
038d156
update dependency version
netbuffer Dec 18, 2018
1284c3d
Merge remote-tracking branch 'origin/develop'
netbuffer Dec 18, 2018
5d9134f
add Stargazers over time
netbuffer Aug 27, 2019
01cc03e
update
netbuffer Aug 18, 2020
d0df8e5
Merge remote-tracking branch 'origin/develop' into master
netbuffer Aug 18, 2020
1531240
update
netbuffer Aug 18, 2020
73fffb5
Merge remote-tracking branch 'origin/develop' into master
netbuffer Aug 18, 2020
e9ad266
Bump spring-web from 4.3.21.RELEASE to 6.0.0
dependabot[bot] Dec 10, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
RedirectAttributes
  • Loading branch information
netbuffer committed Jun 29, 2016
commit 4c4083096e43c38cc15465586bfbb3ca38321689
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.SessionAttributes;
import org.springframework.web.servlet.i18n.CookieLocaleResolver;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;

import com.alibaba.fastjson.JSONObject;

Expand Down Expand Up @@ -57,7 +58,7 @@ public void setJdbcUrl(String url) {
return JDBCURL;
}

@RequestMapping(value = { "", "/{id}", "/index/{id}" })
@RequestMapping(value = {"/{id}", "/index/{id}" })
public String index(@PathVariable("id") int id, ModelMap m) {
logger.debug("template id:{}", id);
m.addAttribute("uri", id);
Expand Down Expand Up @@ -163,4 +164,24 @@ public JSONObject uri(HttpServletRequest request){
j.put("request.getServletContext().getRealPath(\"/\")", request.getServletContext().getRealPath("/"));
return j;
}

/**
* 重定向拼接参数跳转
* @return
*/
@RequestMapping(value={"/redirect"})
public String redirect(ModelMap m){
//spring自动做了参数拼接
logger.debug("redirect");
m.put("param", "this is parameter");
return "redirect:/test/1";
}

@RequestMapping(value={"/redirect2"})
public String redirect2(RedirectAttributes attributes){
logger.debug("redirect2");
attributes.addAttribute("param", "this is parameter");
return "redirect:/test/1";
}

}