test/nutzboot
1
0
Fork 0
mirror of https://gitee.com/nutz/nutzboot.git synced 2024-11-29 18:28:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
596 Commits 8 Branches 34 Tags 7 MiB
963d401d6e
Commit Graph

596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wendal Chen
d7ca8beedc remove: Freemarker中多余的import 2018-02-04 22:45:41 +08:00
Wendal Chen
ced7d42669 update: 更新README和ChangeLog, 把蛋蛋的freemarker加上 2018-02-04 22:14:34 +08:00
Wendal Chen
f41d015b2f
Merge pull request #118 from TopCoderMyDream/dev 
add: 加入nutzboot-starter-freemarker
 2018-02-04 22:12:30 +08:00
Wendal Chen
b86a83494d update: 更新README about #119 2018-02-04 22:11:12 +08:00
Wendal Chen
716ebda0c5 fix: issue #119 tomcat与shiro一起使用就报错 2018-02-04 22:10:15 +08:00
TopCoderMyDream
c6578875ca change:去掉FreeMarkerConfigurer里的多余变量 2018-02-04 16:56:15 +08:00
TopCoderMyDream
dd4a9e8f15 change:去掉nz.net.ultraq.thymeleaf的引用 2018-02-04 16:21:41 +08:00
TopCoderMyDream
fc6959e23b add: 加入nutzboot-starter-freemarker 2018-02-04 15:22:06 +08:00
Wendal Chen
817b85aea5 update: demo-cloud还是先用本地eureka服务吧 2018-02-03 22:36:45 +08:00
Wendal Chen
648d5864cc update: 清理J2cacheStarter的编译警告 2018-02-03 20:51:50 +08:00
Wendal Chen
3ba50fb161 Merge branch 'v2.1.1-dev' into dev 2018-02-03 20:50:27 +08:00
Wendal Chen
0e56de127d Merge branch 'v2.1.1-dev' into dev 
# Conflicts:
#	pom.xml
 2018-02-03 20:48:24 +08:00
Wendal Chen
7fc33c25da update: 添加公共服务地址 2018-02-03 10:59:39 +08:00
Wendal Chen
bedaa0fab0 ... 2018-02-02 12:59:51 +08:00
Wendal Chen
6ccfa31f43 add: beetl添加属性 beetl.RESOURCE.rootLocal 用于解决idea下模板更新的问题 
add: 完善beetl的PropDoc文档
 2018-01-31 21:57:36 +08:00
Wendal Chen
e03a9dc581 update: 指定circleci的deploy时使用的settings.xml 2018-01-30 21:23:37 +08:00
Wendal Chen
f7038623ba update: 尝试使用circleci进行deploy 2018-01-30 21:10:11 +08:00
Wendal Chen
4169516153 update: starter-beetl将GroupTemplate放入ioc容器,方便用户自定义和获取 2018-01-30 20:00:38 +08:00
Wendal Chen
366278b481
Merge pull request #117 from TopCoderMyDream/dev 
update:修改J2Chache从application.properties文件读配置,不从默认配置文件读
 2018-01-30 11:45:50 +08:00
TopCoderMyDream
256b3bff4e change:去除多余的导入的包 2018-01-30 10:57:07 +08:00
TopCoderMyDream
2a454cdca0 update:完成从conf中读取j2cache的配置,并完善PRE(好多的配置项) 2018-01-30 10:51:23 +08:00
Wendal Chen
e62aa436f6 update: hystrix的描述有误,因为它包含dashboard了啊,哈哈 2018-01-29 21:35:18 +08:00
Howe Chiang
15d5d41273
升级1.r.66-SNAPSHOT快照版 2018-01-29 18:35:03 +08:00
Wendal Chen
94e8e276f8 add: 把zjSniper加入到贡献者中 ^_^ 2018-01-29 17:20:45 +08:00
Wendal Chen
df1c232cef Merge branch 'dev' of gitee.com:nutz/nutzboot into dev 2018-01-29 17:13:10 +08:00
Wendal
da8fb94a94 !4 去掉TioStarter init函数中不必要的null判断 
Merge pull request !4 from zjSniper/dev
 2018-01-29 17:11:56 +08:00
zhangjie
50912b2a6d change:去掉TioStarter init函数中不必要的null判断。 ps:appContext.getBeans不会反回null(测试提交下^_^) 2018-01-29 14:37:11 +08:00
Wendal Chen
46497719e1 change: DataSourceStarter.createSlaveDataSource方法添加prefix参数 #116 2018-01-28 17:53:40 +08:00
Wendal Chen
90152b1a47 fix: demo-maker有js错误 2018-01-28 14:50:59 +08:00
TopCoderMyDream
3cd01690b4 update:修改J2Chache从application.properties文件读配置,修改一下demo演示,上次有写错 2018-01-28 10:07:35 +08:00
Wendal Chen
4ba38a2f57 fix: slave数据源也需要close的 
fix: slave数据源就没有创建对
 2018-01-28 09:58:43 +08:00
Wendal Chen
4fee84eee3 release: v2.1.1 2018-01-26 14:24:04 +08:00
Wendal Chen
f501220b4a update: 更新ChangeLog和demo-maker,为发布做准备 2018-01-26 14:03:15 +08:00
Wendal Chen
180b1adbc4 add: tomcat设置maxPostSize, 默认值设置为64mb, tomcat官方默认值是2mb,太小了 2018-01-26 12:33:17 +08:00
Wendal Chen
662a796a50 add: 添加CircleCI构建状态的badge 2018-01-26 12:08:05 +08:00
Wendal Chen
ac5956bfe1 add: files for circleci 2018-01-26 11:45:05 +08:00
Wendal Chen
a1abfe9b88
Merge pull request #114 from nutzam/add_nutz_dao_support_slave 
add: NutDaoStarter添加slave数据源的支持
 2018-01-25 12:30:46 +08:00
Wendal Chen
df74253306 change: 将获取slave数据库的逻辑迁移到DataSourceStarter,这样beetlsql也能使用slave数据源了 2018-01-25 12:07:00 +08:00
Wendal Chen
604d69c8aa Merge remote-tracking branch 'origin/dev' into add_nutz_dao_support_slave 2018-01-25 11:43:11 +08:00
Wendal Chen
e64e8d328e add: NutDaoStarter添加slave数据源的支持 2018-01-25 11:40:09 +08:00
Wendal Chen
346113db28 change: 不再提示server.port与jetty.port/undertow.port/tomcat.port 2018-01-24 22:48:35 +08:00
Wendal Chen
7dfe5b51be Merge branch 'dev' of gitee.com:nutz/nutzboot into dev 2018-01-24 22:46:23 +08:00
Wendal
e01f2cf9fd !3 第三方非8080端口服务，无法正确获取端口 
Merge pull request !3 from 黄道坤/dev
 2018-01-24 22:45:58 +08:00
黄道坤
c20ca3cd56 更新 AppContext.java 2018-01-24 22:41:05 +08:00
Wendal Chen
2733fc3a22
Update QuartzStarter.java 2018-01-24 20:07:57 +08:00
黄道坤
095e841895 更新 AppContext.java 2018-01-24 14:44:39 +08:00
Wendal Chen
fd2837e78b update: 把howe的urls项目作为demo添加到README.md 2018-01-24 10:22:39 +08:00
Wendal Chen
5c58b643da
Merge pull request #113 from nutzam/add_quartz_demo 
add: 补齐starter-quartz的demo
 2018-01-23 23:06:55 +08:00
Wendal Chen
ccd423f9da
Merge branch 'dev' into add_quartz_demo 2018-01-23 23:06:46 +08:00
Wendal Chen
66e0783cfb add: 补齐starter-quartz的demo 2018-01-23 23:04:16 +08:00