Chunk |
---|
Conflicting content |
---|
public void init(NutConfig config) { Ioc ioc = config.getIoc(); Dao dao = ioc.get(Dao.class); <<<<<<< HEAD dao.create(AcquisitionTemp.class, false); dao.create(CrawlerRule.class, false); ======= Daos.createTablesInPackage(dao, CmsAcquisition.class.getPackage().getName(), false); >>>>>>> dfce92644d6a3b314a9f5f94181854d8b856c708 // 若必要的数据表不存在,则初始化数据库 if (0 == dao.count(User.class)) { FileSqlManager fm = new FileSqlManager("init_system_h2.sql"); |
Solution content |
---|
public void init(NutConfig config) { Ioc ioc = config.getIoc(); Dao dao = ioc.get(Dao.class); dao.create(AcquisitionTemp.class, false); dao.create(CrawlerRule.class, false); // 若必要的数据表不存在,则初始化数据库 if (!dao.exists(User.class)) { dao.create(User.class, true); dao.create(Role.class, true); dao.create(Permission.class, true); dao.create(Setting.class, true); dao.create(Article.class, true); dao.create(ArticleCategory.class, true); dao.create(PermissionCategory.class, true); FileSqlManager fm = new FileSqlManager("init_system_h2.sql"); |
File |
---|
MvcSetup.java |
Developer's decision |
---|
Manual |
Kind of conflict |
---|
Method invocation |