代码漏洞修复

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteConfigFallbackFactory.java

@@ -17,12 +17,12 @@ public class RemoteConfigFallbackFactory implements FallbackFactory<RemoteConfig
         return new RemoteConfigService() {
             @Override
             public R<SysConfig> findFirstByCode(String code, String source) {
-                return null;
+                return R.fail();
             }
 
             @Override
             public SysConfig findSysConfigByCode(String code, String source) {
-                return null;
+                return new SysConfig();
             }
         };
     }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteCoreEvaluatePlanFallbackFactory.java

@@ -21,7 +21,7 @@ public class RemoteCoreEvaluatePlanFallbackFactory implements FallbackFactory<Re
         return new RemoteCoreEvaluatePlanService() {
             @Override
             public AjaxResult generate(String cycle, String source) {
-                return null;
+                return AjaxResult.error();
             }
         };
     }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteDeviceFallbackFactory.java

@@ -23,7 +23,7 @@ public class RemoteDeviceFallbackFactory implements FallbackFactory<RemoteDevice
         return new RemoteDeviceService() {
             @Override
             public SysDevice getInfoById(Long id, String source) {
-                return null;
+                return new SysDevice();
             }
         };
     }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteDrillFallbackFactory.java

@@ -17,6 +17,6 @@ public class RemoteDrillFallbackFactory implements FallbackFactory<RemoteDrillFa
 
     @Override
     public RemoteDrillFallbackFactory create(Throwable cause) {
-        return null;
+        return new RemoteDrillFallbackFactory();
     }
 }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteEduTrainingFallbackFactory.java

@@ -1,11 +1,14 @@
 package com.xunmei.system.api.factory;
 
+import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.system.api.RemoteEduTrainingService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+
 /**
  * 字典服务降级处理
  *
@@ -18,6 +21,21 @@ public class RemoteEduTrainingFallbackFactory implements FallbackFactory<RemoteE
 
     @Override
     public RemoteEduTrainingService create(Throwable cause) {
-        return null;
+        return new RemoteEduTrainingService() {
+            @Override
+            public AjaxResult buildEduTask(Integer cycle, Date date) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult updateEduTaskStatus() {
+                return null;
+            }
+
+            @Override
+            public AjaxResult rebuild(String event, String source) {
+                return null;
+            }
+        };
     }
 }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteFileFallbackFactory.java

@@ -37,23 +37,23 @@ public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileServ
             @Override
             public R<String> generateEduTrainingPdf(Map<String, Object> data) {
                 log.error("生成教育培训登记簿失败:{},参数:{}", throwable.getMessage(), JSON.toJSONString(data));
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<String> generateResumptionPdf(Map<String, Object> data) {
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<String> generateSafeCheckPdf(SafeCheckTaskRegisterBookVo data) {
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<String> generateDrillPdf(Map<String, Object> data) {
                 log.error("生成预案演练登记簿失败:{},参数:{}", throwable.getMessage(), JSON.toJSONString(data));
-                return null;
+                return R.fail();
             }
 
             @Override

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteJobFallbackFactory.java

@@ -21,12 +21,12 @@ public class RemoteJobFallbackFactory implements FallbackFactory<RemoteJobServic
 
             @Override
             public AjaxResult remoteAdd(SysJobDTO sysJobDTO, String source) {
-                return null;
+                return AjaxResult.error();
             }
 
             @Override
             public AjaxResult remoteRemove(Long[] jobIds, String source) {
-                return null;
+                return AjaxResult.error();
             }
         };
     }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteOrgFallbackFactory.java

@@ -41,7 +41,7 @@ public class RemoteOrgFallbackFactory implements FallbackFactory<RemoteOrgServic
 
             @Override
             public List<Long> selectCheckSubOrgIdList(Long orgId, String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
@@ -51,42 +51,42 @@ public class RemoteOrgFallbackFactory implements FallbackFactory<RemoteOrgServic
 
             @Override
             public List<SysOrg> selectSysOrgByParentId(Long id, String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
             public List<SysOrg> selectSysOrgByPathAndType(String path, Integer type, String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
             public List<SysOrg> selectSysOrgByParentIds( List<Long> parentIds,String source){
-                return  null;
+                return  new ArrayList<>();
             }
 
             @Override
             public R<List<SysOrg>> listByIds(List<Long> ids, String source) {
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<List<Long>> findListByOrgType(Integer execOrgType, String source) {
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<Boolean> batchSaveSyncOrg(List<SysOrg> orgList, String source) {
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<List<SysOrg>> listByTypes(OrgListByTypesConditionEto eto) {
-                return null;
+                return R.fail();
             }
 
             @Override
             public List<SysOrg> listByParentIdAndType(SysOrg sysOrg, String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
@@ -136,12 +136,12 @@ public class RemoteOrgFallbackFactory implements FallbackFactory<RemoteOrgServic
 
             @Override
             public List<Long> selectOrgTypeByIdList(List<Long> ids, String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
             public List<SysOrg> findAllOrg(String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
@@ -161,18 +161,18 @@ public class RemoteOrgFallbackFactory implements FallbackFactory<RemoteOrgServic
 
             @Override
             public List<SysOrg> findByOrgTypeAndParent(Integer orgType, String path, String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
             public R<List<SysOrgVO>> hangsheWholePathTree(Long orgId,@RequestHeader(SecurityConstants.FROM_SOURCE) String source) {
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<OrgTreeResp>  getOrgTreeResp(OrgTreeReq orgTreeReq) {
                 log.error("获取机构树失败:{}", throwable.getMessage());
-                return null;
+                return R.fail();
             }
 
             @Override
@@ -182,19 +182,19 @@ public class RemoteOrgFallbackFactory implements FallbackFactory<RemoteOrgServic
 
             @Override
             public List<SysOrg> findByOrgTypesAndParent(FindOrgTypes types, String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
 
 
             public List<SysOrg> selectOrgTreeListByCurOrgId(Long id, String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
             public List<SysOrg> selectOrgByPath(Long orgId) {
-                return null;
+                return new ArrayList<>();
             }
         };
     }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteProtectionFallbackFactory.java

@@ -24,7 +24,7 @@ public class RemoteProtectionFallbackFactory implements FallbackFactory<RemotePr
 
             @Override
             public AjaxResult addByDevice(ProtectionDTO editDto, String source) {
-                return null;
+                return AjaxResult.error();
             }
 
             @Override

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteResumptionTaskFallbackFactory.java

@@ -33,7 +33,7 @@ public class RemoteResumptionTaskFallbackFactory implements FallbackFactory<Remo
              */
             @Override
             public R<Boolean> dayTask() {
-                return null;
+                return R.fail();
             }
 
             /**
@@ -43,7 +43,7 @@ public class RemoteResumptionTaskFallbackFactory implements FallbackFactory<Remo
              */
             @Override
             public R<Boolean> weekTask() {
-                return null;
+                return R.fail();
             }
 
             /**
@@ -53,22 +53,22 @@ public class RemoteResumptionTaskFallbackFactory implements FallbackFactory<Remo
              */
             @Override
             public R<Boolean> monthTask() {
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<Boolean> updateTaskStatus() {
-                return null;
+                return R.fail();
             }
 
             @Override
             public AjaxResult rebuild(String event, String source) {
-                return null;
+                return AjaxResult.error();
             }
 
             @Override
             public AjaxResult buildPdf() {
-                return null;
+                return AjaxResult.error();
             }
 
 

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteRoleFallbackFactory.java

@@ -11,6 +11,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -34,7 +35,7 @@ public class RemoteRoleFallbackFactory implements FallbackFactory<RemoteRoleServ
 
             @Override
             public List<SysRole> getRoleByUserId(Long userId, String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
@@ -44,17 +45,17 @@ public class RemoteRoleFallbackFactory implements FallbackFactory<RemoteRoleServ
 
             @Override
             public List<IdNameVo> getNames(RoleConditionEto condition) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
             public List<SysUser> selectUserByRoleNameAndOrgId(String roleName, Long orgId, Integer isLock,String inner) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
             public List<Long> getUserRoleId(Long userId, String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteSafetyCheckTaskFallbackFactory.java

@@ -12,42 +12,42 @@ public class RemoteSafetyCheckTaskFallbackFactory implements FallbackFactory<Rem
         return new RemoteSafetyCheckService() {
             @Override
             public R<Boolean> dayTask() {
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<Boolean> weekTask() {
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<Boolean> monthTask() {
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<Boolean> quarterTask() {
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<Boolean> halfYearTask() {
-                return null;
+                return R.fail();
             }
 
             @Override
             public R<Boolean> yearTask() {
-                return null;
+                return R.fail();
             }
 
             @Override
             public AjaxResult rebuild(String event, String source) {
-                return null;
+                return AjaxResult.error();
             }
 
             @Override
             public R<Boolean> updateTaskStatus() {
-                return null;
+                return R.fail();
             }
         };
     }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteUserFallbackFactory.java

@@ -73,12 +73,12 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
 
             @Override
             public List<SysUser> userListByRoleAndOrg(SysPlanOrgDTO sysRoleOrgDTO, String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override
             public  List<IdNameVo> getRoleInfoOfUser(@PathVariable Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source){
-                return null;
+                return new ArrayList<>();
             }
         };
     }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteWeatherFallbackFactory.java

@@ -20,7 +20,7 @@ public class RemoteWeatherFallbackFactory implements FallbackFactory<RemoteWeath
         {
             @Override
             public AjaxResult getDataFromApi(String source) {
-                return null;
+                return AjaxResult.error();
             }
         };
     }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteWorkTimesFallbackFactory.java

@@ -10,6 +10,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -40,7 +41,7 @@ public class RemoteWorkTimesFallbackFactory implements FallbackFactory<RemoteWor
 
             @Override
             public List<String> findWorkTimeByDateRangeAndOrgId(Date startTime, Date endTime, Long orgId) {
-                return null;
+                return new ArrayList<>();
             }
             @Override
             public R<List<SysWorkTime>> findWorkTimeByRange(WorkTimeDto workTimeDto,String source) {
@@ -59,7 +60,7 @@ public class RemoteWorkTimesFallbackFactory implements FallbackFactory<RemoteWor
 
             @Override
             public List<SysWorkTime> getWorkTime(Map<String, Object> searchData, String source) {
-                return null;
+                return new ArrayList<>();
             }
 
             @Override

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/utils/file/ImageUtils.java

@@ -30,7 +30,7 @@ public class ImageUtils
         catch (Exception e)
         {
             log.error("图片加载异常 {}", e);
-            return null;
+            return new byte[0];
         }
         finally
         {
@@ -76,7 +76,7 @@ public class ImageUtils
         catch (Exception e)
         {
             log.error("访问文件异常 {}", e);
-            return null;
+            return new byte[0];
         }
         finally
         {

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/utils/ip/IpUtils.java

@@ -136,7 +136,7 @@ public class IpUtils
     {
         if (text.length() == 0)
         {
-            return null;
+            return new byte[0];
         }
 
         byte[] bytes = new byte[4];
@@ -151,7 +151,7 @@ public class IpUtils
                     l = Long.parseLong(elements[0]);
                     if ((l < 0L) || (l > 4294967295L))
                     {
-                        return null;
+                        return new byte[0];
                     }
                     bytes[0] = (byte) (int) (l >> 24 & 0xFF);
                     bytes[1] = (byte) (int) ((l & 0xFFFFFF) >> 16 & 0xFF);
@@ -162,13 +162,13 @@ public class IpUtils
                     l = Integer.parseInt(elements[0]);
                     if ((l < 0L) || (l > 255L))
                     {
-                        return null;
+                        return new byte[0];
                     }
                     bytes[0] = (byte) (int) (l & 0xFF);
                     l = Integer.parseInt(elements[1]);
                     if ((l < 0L) || (l > 16777215L))
                     {
-                        return null;
+                        return new byte[0];
                     }
                     bytes[1] = (byte) (int) (l >> 16 & 0xFF);
                     bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF);
@@ -180,14 +180,14 @@ public class IpUtils
                         l = Integer.parseInt(elements[i]);
                         if ((l < 0L) || (l > 255L))
                         {
-                            return null;
+                            return new byte[0];
                         }
                         bytes[i] = (byte) (int) (l & 0xFF);
                     }
                     l = Integer.parseInt(elements[2]);
                     if ((l < 0L) || (l > 65535L))
                     {
-                        return null;
+                        return new byte[0];
                     }
                     bytes[2] = (byte) (int) (l >> 8 & 0xFF);
                     bytes[3] = (byte) (int) (l & 0xFF);
@@ -198,18 +198,18 @@ public class IpUtils
                         l = Integer.parseInt(elements[i]);
                         if ((l < 0L) || (l > 255L))
                         {
-                            return null;
+                            return new byte[0];
                         }
                         bytes[i] = (byte) (int) (l & 0xFF);
                     }
                     break;
                 default:
-                    return null;
+                    return new byte[0];
             }
         }
         catch (NumberFormatException e)
         {
-            return null;
+            return new byte[0];
         }
         return bytes;
     }

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/utils/sign/Base64.java

@@ -163,7 +163,7 @@ public final class Base64
     {
         if (encoded == null)
         {
-            return null;
+            return new byte[0];
         }
 
         char[] base64Data = encoded.toCharArray();
@@ -172,7 +172,8 @@ public final class Base64
 
         if (len % FOURBYTE != 0)
         {
-            return null;// should be divisible by four
+            return new byte[0];
+            // should be divisible by four
         }
 
         int numberQuadruple = (len / FOURBYTE);
@@ -224,9 +225,10 @@ public final class Base64
         {// Check if they are PAD characters
             if (isPad(d3) && isPad(d4))
             {
-                if ((b2 & 0xf) != 0)// last 4 bits should be zero
+                if ((b2 & 0xf) != 0)
+                    // last 4 bits should be zero
                 {
-                    return null;
+                    return new byte[0];
                 }
                 byte[] tmp = new byte[i * 3 + 1];
                 System.arraycopy(decodedData, 0, tmp, 0, i * 3);
@@ -236,9 +238,10 @@ public final class Base64
             else if (!isPad(d3) && isPad(d4))
             {
                 b3 = base64Alphabet[d3];
-                if ((b3 & 0x3) != 0)// last 2 bits should be zero
+                if ((b3 & 0x3) != 0)
+                    // last 2 bits should be zero
                 {
-                    return null;
+                    return new byte[0];
                 }
                 byte[] tmp = new byte[i * 3 + 2];
                 System.arraycopy(decodedData, 0, tmp, 0, i * 3);
@@ -248,7 +251,7 @@ public final class Base64
             }
             else
             {
-                return null;
+                return new byte[0];
             }
         }
         else

soc-common/soc-common-security/src/main/java/com/xunmei/common/security/utils/DictUtils.java

@@ -7,6 +7,7 @@ import com.xunmei.common.redis.utils.RedisUtils;
 import com.xunmei.system.api.domain.SysDictData;
 import io.netty.util.internal.StringUtil;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -35,12 +36,10 @@ public class DictUtils {
      */
     public static List<SysDictData> getDictCache(String key) {
         List<SysDictData> arrayCache = RedisUtils.getCacheObject(getCacheKey(key));
-        //JSONArray arrayCache = SpringUtils.getBean(RedisService.class).getCacheObject(getCacheKey(key));
         if (StringUtils.isNotNull(arrayCache)) {
-//            return arrayCache.toList(SysDictData.class);
             return arrayCache;
         }
-        return null;
+        return new ArrayList<>();
     }
 
     /**
@@ -50,7 +49,6 @@ public class DictUtils {
      */
     public static void removeDictCache(String key) {
         RedisUtils.deleteObject(getCacheKey(key));
-//        SpringUtils.getBean(RedisService.class).deleteObject(getCacheKey(key));
     }
 
     /**
@@ -58,8 +56,6 @@ public class DictUtils {
      */
     public static void clearDictCache() {
         RedisUtils.deleteByPrefix(CacheConstants.SYS_DICT_KEY);
-//        Collection<String> keys = SpringUtils.getBean(RedisService.class).keys(CacheConstants.SYS_DICT_KEY + "*");
-//        SpringUtils.getBean(RedisService.class).deleteObject(keys);
     }
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluateTaskServiceImpl.java

@@ -104,49 +104,6 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
         return TableDataInfo.build(page);
     }
 
-    private Map beiyong(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO) {
-/*    Map map = new HashMap();
-    Page<Map> page;
-    //分页
-    if (evaluateTaskStatisticsDTO.getPageNum() != null && evaluateTaskStatisticsDTO.getPageSize() != null) {
-        page = new Page<>(evaluateTaskStatisticsDTO.getPageNum(), evaluateTaskStatisticsDTO.getPageSize());
-    } else {
-        page = new Page<>();
-    }
-    SysOrg sysOrg = remoteOrgService.selectSysOrgById(evaluateTaskStatisticsDTO.getOrgId(), SecurityConstants.INNER);
-    evaluateTaskStatisticsDTO.setOrgPath(sysOrg.getPath());
-    if (sysOrg.getType().equals(1)) {
-        evaluateTaskStatisticsDTO.setType(3);
-    } else {
-        evaluateTaskStatisticsDTO.setType(4);
-    }
-    evaluateTaskStatisticsDTO.setOrgId(null);
-    evaluateTaskStatisticsDTO.setOrgPath(null);
-  //  List<LinkedHashMap> rows = baseMapper.statisticsAll(evaluateTaskStatisticsDTO);
-    Integer average = 0;
-    Integer all = 0;
-    for (int i = 0; i < rows.size(); i++) {
-        Object id = rows.get(i).get("id");
-        rows.get(i).remove("id");
-        List<Map> contentByTaskId = baseMapper.getContentByTaskId((Long) id);
-        if (CollectionUtils.isNotEmpty(contentByTaskId)) {
-            int total = 0;
-            for (int l = 0; l < contentByTaskId.size(); l++) {
-                Double score = Double.valueOf(contentByTaskId.get(l).get("score").toString());
-                total += score;
-            }
-            rows.get(i).put("评价得分", total);
-            all += total;
-        }
-    }
-    map.put("list", rows);
-    if (rows.size() > 0) {
-        average = all / rows.size();
-    }
-    map.put("average", average);
-    return map;*/
-        return null;
-    }
 
     @Override
     public Map statistics(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/gx/service/ResumptionService.java

@@ -10,13 +10,6 @@ import java.util.Map;
 public interface ResumptionService {
 
 
-    /**
-     * 根据日期获取履职数据
-     * @param dto
-     * @return
-     */
-    Map<String, List<ResumptionTaskListVo>> getTaskList(ResumptionTaskNewDto dto);
-
 
     /**
      * 根据任务id，获取当前任务的具体详情

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/gx/service/ResumptionServiceImpl.java

@@ -61,22 +61,6 @@ public class ResumptionServiceImpl implements ResumptionService {
     @Autowired
     private AppPlanService appPlanService;
 
-    @Override
-    public Map<String, List<ResumptionTaskListVo>> getTaskList(ResumptionTaskNewDto dto) {
-
-        Date dateTime = dto.getDateTime();
-        if (dateTime == null) {
-            dateTime = new Date();
-            dto.setDateTime(dateTime);
-        }
-
-        /*
-         *根据机构id，角色权限，日期，获取对应的履职任务数据
-         */
-
-
-        return null;
-    }
 
     @Override
     public ResumptionTaskDetailVo getTask(ResumptionTaskDetailVo taskDetailVo) throws Exception {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -752,7 +752,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         List<Map<String, Object>> list = new ArrayList<>();
 
         if (info.getOrgType() == null && info.getOrgId() == null) {
-            return null;
+            return new ArrayList<>();
         }
         QueryWrapper<AppRule> qw = new QueryWrapper<>();
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/weather/utils/HttpUtils.java

@@ -118,7 +118,7 @@ public class HttpUtils {
             //返回受信任的x509证书数组
             @Override
             public X509Certificate[] getAcceptedIssuers() {
-                return null;
+                return new X509Certificate[0];
             }
         }};
         return trustManagers;

soc-modules/soc-modules-job/src/main/java/com/xunmei/job/util/JobInvokeUtil.java

@@ -6,6 +6,7 @@ import com.xunmei.job.domain.SysJob;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -109,7 +110,7 @@ public class JobInvokeUtil
         String methodStr = StringUtils.substringBetween(invokeTarget, "(", ")");
         if (StringUtils.isEmpty(methodStr))
         {
-            return null;
+            return new ArrayList<>();
         }
         String[] methodParams = methodStr.split(",(?=([^\"']*[\"'][^\"']*[\"'])*[^\"']*$)");
         List<Object[]> classs = new LinkedList<>();

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysOrgController.java

@@ -181,7 +181,7 @@ public class SysOrgController extends BaseController {
     public List<Long> getUpOrgs(@PathVariable("orgId") Long orgId) {
         SysOrg org=sysOrgMapper.selectById(orgId);
         if(ObjectUtil.isNull(org)){
-            return  null;
+            return  new ArrayList<>();
         }
         String path = org.getPath();
         if (ObjectUtil.isEmpty(path)) {

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysDictTypeServiceImpl.java

@@ -103,7 +103,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
             DictUtils.setDictCache(dictType, dictDatas);
             return dictDatas;
         }
-        return null;
+        return new ArrayList<>();
     }
 
     @Override