Commit Graph

269 Commits

Author SHA1 Message Date
Wendal Chen
aa2103bd41 change: ureport默认不关联数据源 2017-12-26 21:54:32 +08:00
Wendal Chen
f4fd9376eb fix typo 2017-12-26 20:12:23 +08:00
Wendal Chen
88b718312e Merge branch 'dev' of github.com:nutzam/nutzboot into dev 2017-12-26 19:53:40 +08:00
Wendal Chen
b4d1268e83 fix: ureport需要从nutz ioc读取BuildinDatasource和ImageProvider的对象 2017-12-26 19:49:09 +08:00
Wendal Chen
e6cda11c8a
Merge pull request #78 from TopCoderMyDream/dev
add: 给shiro增加几个启动时的日志打印
2017-12-26 16:56:04 +08:00
蛋蛋
62a8f4a8de change:干掉group,修改putIfAbsent用法 2017-12-26 16:51:00 +08:00
蛋蛋
28a66f87fa change:加上group 2017-12-26 15:50:52 +08:00
蛋蛋
fffe9dd93c change:增加几个@PropDoc注解.(ノ ̄▽ ̄) 2017-12-26 15:24:49 +08:00
Wendal Chen
655040562d add: README添加"鱼夫" 2017-12-26 15:23:30 +08:00
Wendal Chen
e8a11a7c4c fix: U家三剑客与nutz mvc一起加载的时候报uxxx.props是抽象定义的异常 2017-12-26 11:41:43 +08:00
Wendal Chen
8c2cd44154 fix: 让undertow默认添加nutz-plugins-websocket,并添加测试类 2017-12-26 11:00:37 +08:00
Wendal Chen
79825b78fd change: ureport的demo演示如何获取ExportManager 2017-12-26 11:00:00 +08:00
haoqoo
5d69e97e3a
Merge pull request #77 from nutzam/better_feign_inject
add: 改造feign的实现
2017-12-25 21:58:17 +08:00
Wendal Chen
2aa6bb527c add: 改造feign的实现 2017-12-25 21:26:51 +08:00
JackQ
3739c8340a add:feign初步代码 2017-12-25 18:01:33 +08:00
Wendal Chen
adecb0a4fb fix: 按 @yannis 的pull request,修正README里面的拼写错误 2017-12-25 12:25:25 +08:00
Wendal Chen
ad1ab2062f update: Banner的版本号更新一下 2017-12-25 00:13:47 +08:00
Wendal Chen
e66a8d5151 move: 向v2.1前进 2017-12-24 22:25:11 +08:00
Wendal Chen
79a416fd24 update: 把ChangeLog更新一下 2017-12-24 22:15:58 +08:00
Wendal Chen
c31f9e7d14
Merge pull request #76 from nutzam/refactoring_web_filter_order
change: 移除web.filters.order,改成按接口获取Filter并按order排序
2017-12-24 10:22:41 +08:00
Wendal Chen
ee8ac295cf change: 移除web.filters.order,改成按接口获取Filter并按order排序 2017-12-23 21:05:18 +08:00
Wendal Chen
6183895c78 change: 忽略bin目录 2017-12-22 21:02:13 +08:00
Wendal Chen
b69ae44c74 remove: 清理dependency-reduced-pom.xml 2017-12-22 15:10:35 +08:00
Wendal Chen
49263f3126
Merge pull request #75 from nutzam/add_cxf_webservice
add: cxf webservice
2017-12-22 15:09:37 +08:00
Wendal Chen
330c3d545b add: CXF webservice服务 2017-12-22 10:30:01 +08:00
Wendal Chen
53d7131629 Merge branch 'dev' into add_cxf_webservice
# Conflicts:
#	nutzboot-starter-nutz-mvc/src/main/java/org/nutz/boot/starter/nutz/mvc/NutFilterStarter.java
#	pom.xml
2017-12-22 10:05:45 +08:00
Wendal Chen
5877ed280b fix: ChangeLog里面有个链接错了 2017-12-22 09:24:04 +08:00
Wendal Chen
e24913bea2
Merge pull request #72 from haoqoo/velocity-starter
update:velocity日志
2017-12-21 21:48:10 +08:00
JackQ
44de189b5e update:velocity代码重构 2017-12-21 17:58:21 +08:00
JackQ
e25d30a5fd update:velocity代码重构 2017-12-21 17:57:35 +08:00
JackQ
f9b9dfc136 update:velocity代码重构 2017-12-21 17:46:51 +08:00
Wendal Chen
355d35c863 update: 把各位贡献者的链接补全,更新ChangeLog 2017-12-21 17:21:25 +08:00
Wendal Chen
cd6249e722
Merge pull request #73 from qinerg/dev
add: 增加undertow对websocket的支持
2017-12-21 17:01:30 +08:00
qinerg
a26e6b2eb5 add: 增加undertow对websocket的支持 2017-12-21 16:51:21 +08:00
JackQ
39a1e2fda8 update:velocity 日志 2017-12-21 16:00:34 +08:00
JackQ
986faeff72 Revert "velocity 日志"
This reverts commit 1b2d9f0135ff918a4ac601c8d648ad3f612ee043.
2017-12-21 15:29:53 +08:00
Wendal Chen
f127a429fd remove: pom.xml移除nutzboot-starter-nutz 2017-12-21 11:32:29 +08:00
Wendal Chen
8e85461c62 fix: BeetlViewMakerStarter未能读取appliaction.properties里面的beetl配置信息 2017-12-21 10:32:09 +08:00
Wendal Chen
fd4d107953 update: U家三剑客的版本号升级一下 2017-12-20 22:43:27 +08:00
Wendal Chen
bf9729341c 移除尚未实现的那些starter引用 2017-12-20 17:25:36 +08:00
Wendal Chen
18063c0988 change: nutzmongo已改名为nutz-plugins-mongodb 2017-12-20 17:21:00 +08:00
Wendal Chen
17761c61fb fix: 用mvn version命令的时候发现parent.xml的小bug 2017-12-20 15:51:24 +08:00
Wendal Chen
e615ee19ac
Merge pull request #70 from haoqoo/dev
fixed issue #55 增强jetty配置
2017-12-20 14:37:02 +08:00
JackQ
2b004d1e1d issue_55 增强jetty配置 2017-12-20 14:16:26 +08:00
Wendal Chen
276cae664c fix: nutzboot-starter-nutz已经不存在了 2017-12-19 22:22:55 +08:00
Wendal Chen
071a542007 update: 把Vecloity计入已完成的进度中 2017-12-19 14:31:48 +08:00
Wendal Chen
2408ec63c6
Merge pull request #68 from haoqoo/dev
NB集成velocity
2017-12-19 14:28:35 +08:00
JackQ
3f92bfa706 集成velocity 2017-12-19 14:21:24 +08:00
Rekoe
32b85dedc0
Merge pull request #69 from nutzam/fix_issue_65
update: 增强NutMongoDbStarter
2017-12-19 13:46:40 +08:00
Wendal Chen
e18b9c7ef3 change: 更新undertow版本号 2017-12-19 13:37:06 +08:00