jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

Browse Source 
 Conflicts:
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/system/user/profile/userAvatar.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
This commit is contained in:
疯狂的狮子li
2020-06-29 09:08:18 +08:00
parent 2e95557840 794d6f17db
commit f0bee6af63
8 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java
View File

@ -14,7 +14,7 @@ public class RuoYiApplication
{
public static void main(String[] args)
{
// System.setProperty("spring.devtools.restart.enabled", "false");
System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(RuoYiApplication.class, args);
System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ");
}

12
ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
View File

@ -144,9 +144,9 @@ public class GenTableServiceImpl implements IGenTableService
public void importGenTable(List<GenTable> tableList)
{
String operName = SecurityUtils.getUsername();
for (GenTable table : tableList)
try
{
try
for (GenTable table : tableList)
{
String tableName = table.getTableName();
GenUtils.initTable(table, operName);
@ -162,10 +162,10 @@ public class GenTableServiceImpl implements IGenTableService
}
}
}
catch (Exception e)
{
log.error("表名 " + table.getTableName() + " 导入失败：", e);
}
}
catch (Exception e)
{
throw new CustomException("导入失败：" + e.getMessage());
}
}

1
ruoyi/src/main/resources/META-INF/spring-devtools.properties Normal file
View File

@ -0,0 +1 @@
restart.include.json=/com.alibaba.fastjson.*.jar