升级druid 版本 支持初始化 索引执行

pull/3/head
rekoe 2016-05-08 07:20:30 +08:00
parent fcde3a5a93
commit 0e780b5dcb
3 changed files with 13 additions and 6 deletions

View File

@ -39,7 +39,7 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
<version>1.0.18</version>
<version>1.0.19</version>
<exclusions>
<exclusion>
<artifactId>jconsole</artifactId>
@ -59,12 +59,12 @@
<dependency>
<groupId>org.nutz</groupId>
<artifactId>nutz</artifactId>
<version>1.r.56-SNAPSHOT</version>
<version>1.r.56</version>
</dependency>
<dependency>
<groupId>org.nutz</groupId>
<artifactId>nutz-web</artifactId>
<version>1.b.49</version>
<version>1.b.52</version>
</dependency>
<dependency>
<groupId>com.restfb</groupId>

View File

@ -8,6 +8,7 @@ import org.nutz.mvc.annotation.Localization;
import org.nutz.mvc.annotation.Modules;
import org.nutz.mvc.annotation.SetupBy;
import org.nutz.mvc.annotation.Views;
import org.nutz.mvc.impl.NutActionChainMaker;
import org.nutz.mvc.ioc.provider.ComboIocProvider;
import org.nutz.plugins.view.freemarker.FreemarkerViewMaker;
@ -16,7 +17,7 @@ import org.nutz.plugins.view.freemarker.FreemarkerViewMaker;
@SetupBy(MvcSetup.class)
@Fail(">>:/admin/common/unauthorized.rk")
@Encoding(input = "UTF-8", output = "UTF-8")
@ChainBy(args = "com/rekoe/mvc/mvc-chains.js")
@ChainBy(type = NutActionChainMaker.class, args = { "com/rekoe/mvc/mvc-chains.js" })
@Views({ FreemarkerViewMaker.class })
@Localization(value = "msg/", defaultLocalizationKey = "zh-CN")
public class MainModule {

View File

@ -14,13 +14,19 @@ INSERT INTO system_user_role(USERID,ROLEID) VALUES
/* .system_role_permission */
INSERT INTO system_role_permission(ROLEID,PERMISSIONID) VALUES
(1,1)
/*
/* .add_indexs */
alter table pj_gr add constraint FK_Relationship_2 foreign key (pj) references pj (pj) on delete restrict on update restrict;
/* .add_indexs_pj_gr_auth */
alter table pj_gr_auth add constraint FK_Reference_6 foreign key (pj, gr) references pj_gr (pj, gr) on delete restrict on update restrict;
/* .add_indexs_pj_gr_usr */
alter table pj_gr_usr add constraint FK_Reference_10 foreign key (pj, gr) references pj_gr (pj, gr) on delete restrict on update restrict;
/* .add_indexs_pj_gr_usr_1 */
alter table pj_gr_usr add constraint FK_Reference_9 foreign key (usr) references usr (usr) on delete restrict on update restrict;
/* .add_indexs_pj_gr_usr_2 */
alter table pj_usr add constraint FK_Reference_5 foreign key (pj) references pj (pj) on delete restrict on update restrict;
/* .add_indexs_pj_gr_usr_3 */
alter table pj_usr add constraint FK_Reference_7 foreign key (usr) references usr (usr) on delete restrict on update restrict;
/* .add_indexs_pj_usr_auth_1 */
alter table pj_usr_auth add constraint FK_Reference_11 foreign key (pj) references pj (pj) on delete restrict on update restrict;
/* .add_indexs_pj_usr_auth_2 */
alter table pj_usr_auth add constraint FK_Reference_8 foreign key (usr) references usr (usr) on delete restrict on update restrict;
*/