ruoyi-admin/src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-ui/src/views/login.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-ui/src/views/register.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ruoyi-admin/src/main/resources/application.yml
@@ -5,7 +5,7 @@ # 版本 version: ${ruoyi-vue-plus.version} # 版权年份 copyrightYear: 2021 copyrightYear: 2022 # 实例演示开关 demoEnabled: true # 获取ip地址开关 ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
@@ -277,7 +277,7 @@ public void synchDb(String tableName) { GenTable table = baseMapper.selectGenTableByName(tableName); List<GenTableColumn> tableColumns = table.getColumns(); List<String> tableColumnNames = tableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList()); Map<String, GenTableColumn> tableColumnMap = tableColumns.stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity())); List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName); if (StringUtils.isEmpty(dbTableColumns)) { @@ -287,9 +287,17 @@ List<GenTableColumn> saveColumns = new ArrayList<>(); dbTableColumns.forEach(column -> { if (!tableColumnNames.contains(column.getColumnName())) { GenUtils.initColumnField(column, table); saveColumns.add(column); if (tableColumnMap.containsKey(column.getColumnName())) { GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName()); column.setColumnId(prevColumn.getColumnId()); if (column.isList()) { // 如果是列表,继续保留字典类型 column.setDictType(prevColumn.getDictType()); } genTableColumnMapper.updateGenTableColumn(column); } else { genTableColumnMapper.insertGenTableColumn(column); } }); if (CollUtil.isNotEmpty(saveColumns)) { ruoyi-ui/src/views/login.vue
@@ -56,7 +56,7 @@ </el-form> <!-- 底部 --> <div class="el-login-footer"> <span>Copyright © 2018-2021 ruoyi.vip All Rights Reserved.</span> <span>Copyright © 2018-2022 ruoyi.vip All Rights Reserved.</span> </div> </div> </template> ruoyi-ui/src/views/register.vue
@@ -61,7 +61,7 @@ </el-form> <!-- 底部 --> <div class="el-register-footer"> <span>Copyright © 2018-2021 ruoyi.vip All Rights Reserved.</span> <span>Copyright © 2018-2022 ruoyi.vip All Rights Reserved.</span> </div> </div> </template>