Selaa lähdekoodia

定时任务屏蔽违规的字符

RuoYi 4 vuotta sitten
vanhempi
commit
d0a19e5b6f

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java

@@ -127,5 +127,5 @@ public class Constants
127
      * 定时任务违规的字符
127
      * 定时任务违规的字符
128
      */
128
      */
129
     public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
129
     public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
130
-            "org.springframework", "org.apache" };
130
+            "org.springframework", "org.apache", "com.ruoyi.common.core.utils.file" };
131
 }
131
 }

+ 9 - 5
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java

@@ -287,7 +287,7 @@ public class GenTableServiceImpl implements IGenTableService
287
     {
287
     {
288
         GenTable table = genTableMapper.selectGenTableByName(tableName);
288
         GenTable table = genTableMapper.selectGenTableByName(tableName);
289
         List<GenTableColumn> tableColumns = table.getColumns();
289
         List<GenTableColumn> tableColumns = table.getColumns();
290
-        Map<String, GenTableColumn> tableColumnMap = tableColumns.stream().collect(Collectors.toMap(GenTableColumn::getColumnName,  Function.identity()));
290
+        Map<String, GenTableColumn> tableColumnMap = tableColumns.stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity()));
291
 
291
 
292
         List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
292
         List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
293
         if (StringUtils.isEmpty(dbTableColumns))
293
         if (StringUtils.isEmpty(dbTableColumns))
@@ -302,12 +302,15 @@ public class GenTableServiceImpl implements IGenTableService
302
             {
302
             {
303
                 GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName());
303
                 GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName());
304
                 column.setColumnId(prevColumn.getColumnId());
304
                 column.setColumnId(prevColumn.getColumnId());
305
-                if (column.isList()) {
305
+                if (column.isList())
306
+                {
306
                     // 如果是列表,继续保留字典类型
307
                     // 如果是列表,继续保留字典类型
307
                     column.setDictType(prevColumn.getDictType());
308
                     column.setDictType(prevColumn.getDictType());
308
                 }
309
                 }
309
                 genTableColumnMapper.updateGenTableColumn(column);
310
                 genTableColumnMapper.updateGenTableColumn(column);
310
-            } else {
311
+            }
312
+            else
313
+            {
311
                 genTableColumnMapper.insertGenTableColumn(column);
314
                 genTableColumnMapper.insertGenTableColumn(column);
312
             }
315
             }
313
         });
316
         });
@@ -368,7 +371,7 @@ public class GenTableServiceImpl implements IGenTableService
368
                 zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table)));
371
                 zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table)));
369
                 IOUtils.write(sw.toString(), zip, Constants.UTF8);
372
                 IOUtils.write(sw.toString(), zip, Constants.UTF8);
370
                 IOUtils.closeQuietly(sw);
373
                 IOUtils.closeQuietly(sw);
371
-				zip.flush();
374
+                zip.flush();
372
                 zip.closeEntry();
375
                 zip.closeEntry();
373
             }
376
             }
374
             catch (IOException e)
377
             catch (IOException e)
@@ -451,6 +454,7 @@ public class GenTableServiceImpl implements IGenTableService
451
             }
454
             }
452
         }
455
         }
453
     }
456
     }
457
+
454
     /**
458
     /**
455
      * 设置主子表信息
459
      * 设置主子表信息
456
      * 
460
      * 
@@ -480,7 +484,7 @@ public class GenTableServiceImpl implements IGenTableService
480
             String treeName = paramsObj.getString(GenConstants.TREE_NAME);
484
             String treeName = paramsObj.getString(GenConstants.TREE_NAME);
481
             String parentMenuId = paramsObj.getString(GenConstants.PARENT_MENU_ID);
485
             String parentMenuId = paramsObj.getString(GenConstants.PARENT_MENU_ID);
482
             String parentMenuName = paramsObj.getString(GenConstants.PARENT_MENU_NAME);
486
             String parentMenuName = paramsObj.getString(GenConstants.PARENT_MENU_NAME);
483
-            
487
+
484
             genTable.setTreeCode(treeCode);
488
             genTable.setTreeCode(treeCode);
485
             genTable.setTreeParentCode(treeParentCode);
489
             genTable.setTreeParentCode(treeParentCode);
486
             genTable.setTreeName(treeName);
490
             genTable.setTreeName(treeName);

+ 1 - 1
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java

@@ -93,7 +93,7 @@ public class SysJobController extends BaseController
93
         }
93
         }
94
         else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
94
         else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
95
         {
95
         {
96
-            return error("新增任务'" + job.getJobName() + "'失败,目标字符串不允许'ldap'调用");
96
+            return error("新增任务'" + job.getJobName() + "'失败,目标字符串不允许'ldap(s)'调用");
97
         }
97
         }
98
         else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
98
         else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
99
         {
99
         {

+ 2 - 1
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java

@@ -141,7 +141,8 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
141
         SysDictData dictData = new SysDictData();
141
         SysDictData dictData = new SysDictData();
142
         dictData.setStatus("0");
142
         dictData.setStatus("0");
143
         Map<String, List<SysDictData>> dictDataMap = dictDataMapper.selectDictDataList(dictData).stream().collect(Collectors.groupingBy(SysDictData::getDictType));
143
         Map<String, List<SysDictData>> dictDataMap = dictDataMapper.selectDictDataList(dictData).stream().collect(Collectors.groupingBy(SysDictData::getDictType));
144
-        for (Map.Entry<String, List<SysDictData>> entry: dictDataMap.entrySet()) {
144
+        for (Map.Entry<String, List<SysDictData>> entry : dictDataMap.entrySet())
145
+        {
145
             DictUtils.setDictCache(entry.getKey(), entry.getValue().stream().sorted(Comparator.comparing(SysDictData::getDictSort)).collect(Collectors.toList()));
146
             DictUtils.setDictCache(entry.getKey(), entry.getValue().stream().sorted(Comparator.comparing(SysDictData::getDictSort)).collect(Collectors.toList()));
146
         }
147
         }
147
     }
148
     }