代码漏洞修复

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysUser.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.xunmei.common.core.web.domain.BaseEntity;
@@ -14,9 +16,11 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户管理对象 sys_user
@@ -28,9 +32,8 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("sys_user")
-@ApiModel(value = "SysUser对象", description = "【请填写功能名称】")
-public class SysUser extends BaseEntity {
-    private static final long serialVersionUID = 1L;
+@ApiModel(value = "SysUser对象", description = "[用户管理]")
+public class SysUser{
 
     /**
      * $column.columnComment
@@ -102,6 +105,10 @@ public class SysUser extends BaseEntity {
     @ApiModelProperty(value = "密码")
     private String password;
 
+
+
+
+
     /**
      * 盐值
      */
@@ -260,6 +267,68 @@ public class SysUser extends BaseEntity {
     private String orgShortName;
     @TableField(exist = false)
     private List<Long> parentOrgIds;
+
+
+
+    /**
+     * 搜索值
+     */
+    @JsonIgnore
+    @TableField(exist = false)
+    private String searchValue;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "页数")
+    private Long pageNum;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "每页大小")
+    private Long pageSize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "是否下穿查询")
+    private Boolean checkSub = false;
+
+    /**
+     * 创建者
+     */
+    @TableField(value = "create_by")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(value = "update_by")
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+
+    /**
+     * 请求参数
+     */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @TableField(exist = false)
+    private Map<String, Object> params;
+
+
+
+
+
+
+
+
     public boolean isAdmin() {
         return isAdmin(this.getId());
     }

soc-auth/src/main/java/com/xunmei/auth/service/FJNXLoginService.java

@@ -20,36 +20,6 @@ import java.util.HashMap;
 import java.util.List;
 
 
-/**
- * #统一运营门户登录信息
- * fjnx:
- * #  统一运营门户ip
- *   host: 192.111.60.143
- * #  统一运营门户端口
- *   port: 9191
- * #  统一运营门户定义的系统编码
- *   systemCode: 61303
- * #  密管系统ip
- *   passIp: 192.111.7.75
- * #  密管系统端口
- *   passPort: 40105
- * #  密管系统对应标识
- *   appCode: MSP
- * #  密管系统 秘钥
- *   secretName: msp.uop-SM4.zek
- * # 使用token获取用户信息，get方式
- *   webInfoUrl: http://{0}:{1}/yusp-group/api/session?systemCode={2}
- * #  用户登录接口 方式post
- *   userLoginUrl: http://{0}:{1}/yusp-group/api/login?systemCode={2}
- * # 移动运营门户参数
- * fjnxApp:
- * #  移动运营平台地址
- *   host: 192.111.37.181
- * #根据token获取移动运营平台账号信息 post方式
- *   accountUrl: https://{0}/uaa/api/v1.0/user/account?access_token={1}
- * #  根据账号获取人员信息 post方式
- *   userInfoUrl: https://{0}/sap/api/v1.0/user/user/find/{1}?access_token={2}
- */
 @Component
 public class FJNXLoginService{
     /**

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/constant/Constants.java

@@ -1,5 +1,8 @@
 package com.xunmei.common.core.constant;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 通用常量信息
  *
@@ -119,18 +122,21 @@ public class Constants {
     /**
      * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加）
      */
-    public static final String[] JOB_WHITELIST_STR = {"com.xunmei"};
+    public static final List<String> JOB_WHITELIST_STR = new ArrayList(){{add("com.xunmei");}};
 
     /**
      * 定时任务违规的字符
      */
-    public static final String[] JOB_ERROR_STR = {"java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
-            "org.springframework", "org.apache", "com.xunmei.common.core.utils.file"};
-
+    public static final List<String> JOB_ERROR_STR = new ArrayList(){{
+        add("java.net.URL");
+        add("javax.naming.InitialContext");
+        add("org.yaml.snakeyaml");
+        add("org.springframework");
+        add("org.apache");add("com.xunmei.common.core.utils.file");
+    }};
 
     public static final Long TOP_ORG_PARENT_ID = -1L;
 
-
     /**
      * 移动端端登录
      */

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/constant/GenConstants.java

@@ -1,5 +1,8 @@
 package com.xunmei.common.core.constant;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 代码生成通用常量
  * 
@@ -32,34 +35,87 @@ public class GenConstants
     public static final String PARENT_MENU_NAME = "parentMenuName";
 
     /** 数据库字符串类型 */
-    public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2" };
+    public static final List<String> COLUMNTYPE_STR = new ArrayList(){{
+        add("char");
+        add("varchar");
+        add("nvarchar");
+        add("varchar2");
+    }};
 
     /** 数据库文本类型 */
-    public static final String[] COLUMNTYPE_TEXT = { "tinytext", "text", "mediumtext", "longtext" };
+    public static final List<String> COLUMNTYPE_TEXT = new ArrayList(){{
+        add("tinytext");
+        add("text");
+        add("mediumtext");
+        add("longtext");
+    }};
 
     /** 数据库时间类型 */
-    public static final String[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp" };
+    public static final List<String> COLUMNTYPE_TIME = new ArrayList(){{
+        add("datetime");
+        add("time");
+        add("date");
+        add("timestamp");
+    }};
 
     /** 数据库数字类型 */
-    public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
-            "bigint", "float", "double", "decimal" };
 
+    public static final List<String> COLUMNTYPE_NUMBER = new ArrayList(){{
+        add("tinyint");
+        add("smallint");
+        add("mediumint");
+        add("int");
+        add("number");
+        add("integer");
+        add("bigint");
+        add("float");
+        add("double");
+        add("decimal");
+    }};
     /** 页面不需要编辑字段 */
-    public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" };
+    public static final List<String> COLUMNNAME_NOT_EDIT = new ArrayList(){{
+        add("id");
+        add("create_by");
+        add("create_time");
+        add("del_flag");
+    }};
 
     /** 页面不需要显示的列表字段 */
-    public static final String[] COLUMNNAME_NOT_LIST = { "id", "create_by", "create_time", "del_flag", "update_by",
-            "update_time" };
-
+    public static final List<String> COLUMNNAME_NOT_LIST = new ArrayList(){{
+        add("id");
+        add("create_by");
+        add("create_time");
+        add("del_flag");
+        add("update_by");
+        add("update_time");
+    }};
     /** 页面不需要查询字段 */
-    public static final String[] COLUMNNAME_NOT_QUERY = { "id", "create_by", "create_time", "del_flag", "update_by",
-            "update_time", "remark" };
+    public static final List<String> COLUMNNAME_NOT_QUERY = new ArrayList(){{
+        add("id");
+        add("create_by");
+        add("create_time");
+        add("del_flag");
+        add("update_by");
+        add("update_time");
+        add("remark");
+    }};
 
     /** Entity基类字段 */
-    public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime", "remark" };
+    public static final List<String> BASE_ENTITY = new ArrayList(){{
+        add("createBy");
+        add("createTime");
+        add("updateBy");
+        add("updateTime");
+        add("remark");
+    }};
 
     /** Tree基类字段 */
-    public static final String[] TREE_ENTITY = { "parentName", "parentId", "orderNum", "ancestors" };
+    public static final List<String> TREE_ENTITY = new ArrayList(){{
+        add("parentName");
+        add("parentId");
+        add("orderNum");
+        add("ancestors");
+    }};
 
     /** 文本框 */
     public static final String HTML_INPUT = "input";

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

@@ -123,7 +123,7 @@ public class FileUtils
             return false;
         }
         // 判断是否在允许下载的文件规则内
-        return ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource));
+        return ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION.toArray(new String[0]), FileTypeUtils.getFileType(resource));
     }
 
     /**

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

@@ -1,5 +1,8 @@
 package com.xunmei.common.core.utils.file;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 媒体类型工具类
  * 
@@ -17,26 +20,67 @@ public class MimeTypeUtils
 
     public static final String IMAGE_GIF = "image/gif";
 
-    public static final String[] IMAGE_EXTENSION = { "bmp", "gif", "jpg", "jpeg", "png" };
+    public static final List<String> IMAGE_EXTENSION = new ArrayList(){{
+        add("bmp");
+        add("gif");
+        add("jpg");
+        add("jpeg");
+        add("png");
+    }};
+
+    public static final List<String> FLASH_EXTENSION = new ArrayList(){{
+        add("swf");
+        add("flv");
+    }};
 
-    public static final String[] FLASH_EXTENSION = { "swf", "flv" };
+    public static final List<String> MEDIA_EXTENSION = new ArrayList(){{
+        add("swf");
+        add("flv");
+        add("mp3");
+        add("wav");
+        add("wma");
+        add("wmv");
+        add("mid");
+        add("avi");
+        add("mpg");
+        add("asf");
+        add("rm");
+        add("rmvb");
+    }};
 
-    public static final String[] MEDIA_EXTENSION = { "swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg",
-            "asf", "rm", "rmvb" };
 
-    public static final String[] VIDEO_EXTENSION = { "mp4", "avi", "rmvb" };
+    public static final List<String> VIDEO_EXTENSION = new ArrayList(){{
+        add("mp4");
+        add("avi");
+        add("rmvb");
+    }};
 
-    public static final String[] DEFAULT_ALLOWED_EXTENSION = {
-            // 图片
-            "bmp", "gif", "jpg", "jpeg", "png",
-            // word excel powerpoint
-            "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt","et","zip",
-            // 压缩文件
-            "rar", "zip", "gz", "bz2","7z",
-            // 视频格式
-            "mp4", "avi", "rmvb",
-            // pdf
-            "pdf" };
+    public static final List<String> DEFAULT_ALLOWED_EXTENSION = new ArrayList(){{
+        add("bmp");
+        add("gif");
+        add("jpg");
+        add("jpeg");
+        add("png");
+        add("doc");
+        add("docx");
+        add("xls");
+        add("xlsx");
+        add("ppt");
+        add("pptx");
+        add("html");
+        add("htm");
+        add("txt");
+        add("et");
+        add("zip");
+        add("rar");
+        add("gz");
+        add("bz2");
+        add("7z");
+        add("mp4");
+        add("avi");
+        add("rmvb");
+        add("pdf");
+    }};
 
     public static String getExtension(String prefix)
     {

soc-common/soc-common-log/src/main/java/com/xunmei/common/log/aspect/LogAspect.java

@@ -27,7 +27,9 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -41,8 +43,12 @@ public class LogAspect {
     /**
      * 排除敏感属性字段
      */
-    public static final String[] EXCLUDE_PROPERTIES = {"password", "oldPassword", "newPassword", "confirmPassword"};
-
+    public static final List<String> EXCLUDE_PROPERTIES = new ArrayList(){{
+        add("password");
+        add("oldPassword");
+        add("newPassword");
+        add("confirmPassword");
+    }};
     /**
      * 计算操作消耗时间
      */
@@ -187,7 +193,7 @@ public class LogAspect {
      * 忽略敏感属性
      */
     public PropertyPreExcludeFilter excludePropertyPreFilter(String[] excludeParamNames) {
-        return new PropertyPreExcludeFilter().addExcludes(ArrayUtils.addAll(EXCLUDE_PROPERTIES, excludeParamNames));
+        return new PropertyPreExcludeFilter().addExcludes(ArrayUtils.addAll(EXCLUDE_PROPERTIES.toArray(new String[0]), excludeParamNames));
     }
 
     /**

soc-common/soc-common-redis/src/main/java/com/xunmei/common/redis/config/RedisConfiguration.java

@@ -91,51 +91,6 @@ public class RedisConfiguration {
         return new PlusSpringCacheManager();
     }
 
-    /**
-     * redis集群配置 yml
-     *
-     * --- # redis 集群配置(单机与集群只能开启一个另一个需要注释掉)
-     * spring:
-     *   redis:
-     *     cluster:
-     *       nodes:
-     *         - 192.168.0.100:6379
-     *         - 192.168.0.101:6379
-     *         - 192.168.0.102:6379
-     *     # 密码
-     *     password:
-     *     # 连接超时时间
-     *     timeout: 10s
-     *     # 是否开启ssl
-     *     ssl: false
-     *
-     * redisson:
-     *   # 线程池数量
-     *   threads: 16
-     *   # Netty线程池数量
-     *   nettyThreads: 32
-     *   # 集群配置
-     *   clusterServersConfig:
-     *     # 客户端名称
-     *     clientName: ${xunmei.name}
-     *     # master最小空闲连接数
-     *     masterConnectionMinimumIdleSize: 32
-     *     # master连接池大小
-     *     masterConnectionPoolSize: 64
-     *     # slave最小空闲连接数
-     *     slaveConnectionMinimumIdleSize: 32
-     *     # slave连接池大小
-     *     slaveConnectionPoolSize: 64
-     *     # 连接空闲超时，单位：毫秒
-     *     idleConnectionTimeout: 10000
-     *     # 命令等待超时，单位：毫秒
-     *     timeout: 3000
-     *     # 发布和订阅连接池大小
-     *     subscriptionConnectionPoolSize: 50
-     *     # 读取模式
-     *     readMode: "SLAVE"
-     *     # 订阅模式
-     *     subscriptionMode: "MASTER"
-     */
+
 
 }

soc-common/soc-common-security/src/main/java/com/xunmei/common/security/config/WebMvcConfig.java

@@ -14,6 +14,7 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
@@ -26,7 +27,12 @@ public class WebMvcConfig implements WebMvcConfigurer, ApplicationContextAware {
     /**
      * 不需要拦截地址
      */
-    public static final String[] excludeUrls = {"/login", "/logout", "/refresh", "/code/**"};
+    public static final List<String> excludeUrls = new ArrayList(){{
+        add("/login");
+        add("/logout");
+        add("/refresh");
+        add("/code/**");
+    }};
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/utils/FileUploadUtils.java

@@ -53,7 +53,7 @@ public class FileUploadUtils
     {
         try
         {
-            return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+            return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION.toArray(new String[0]));
         }
         catch (FileException fe)
         {
@@ -69,7 +69,7 @@ public class FileUploadUtils
     {
         try
         {
-            String upload = upload(baseDir + File.separator + busType, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+            String upload = upload(baseDir + File.separator + busType, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION.toArray(new String[0]));
             return File.separator + busType + upload;
         }
         catch (FileException fe)
@@ -192,22 +192,22 @@ public class FileUploadUtils
         String extension = FileTypeUtils.getExtension(file);
         if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension))
         {
-            if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION)
+            if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION.toArray(new String[0]))
             {
                 throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension,
                         fileName);
             }
-            else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION)
+            else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION.toArray(new String[0]))
             {
                 throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension,
                         fileName);
             }
-            else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION)
+            else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION.toArray(new String[0]))
             {
                 throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension,
                         fileName);
             }
-            else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION)
+            else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION.toArray(new String[0]))
             {
                 throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension,
                         fileName);

soc-modules/soc-modules-gen/src/main/java/com/xunmei/gen/domain/GenTable.java

@@ -373,8 +373,8 @@ public class GenTable extends BaseEntity
         if (isTree(tplCategory))
         {
             return StringUtils.equalsAnyIgnoreCase(javaField,
-                    ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
+                    ArrayUtils.addAll(GenConstants.TREE_ENTITY.toArray(new String[0]), GenConstants.BASE_ENTITY.toArray(new String[0])));
         }
-        return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
+        return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY.toArray(new String[0]));
     }
 }

soc-modules/soc-modules-gen/src/main/java/com/xunmei/gen/util/GenUtils.java

@@ -45,19 +45,19 @@ public class GenUtils
         column.setJavaType(GenConstants.TYPE_STRING);
         column.setQueryType(GenConstants.QUERY_EQ);
 
-        if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType))
+        if (arraysContains(GenConstants.COLUMNTYPE_STR.toArray(new String[0]), dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT.toArray(new String[0]), dataType))
         {
             // 字符串长度超过500设置为文本域
             Integer columnLength = getColumnLength(column.getColumnType());
-            String htmlType = columnLength >= 500 || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType) ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT;
+            String htmlType = columnLength >= 500 || arraysContains(GenConstants.COLUMNTYPE_TEXT.toArray(new String[0]), dataType) ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT;
             column.setHtmlType(htmlType);
         }
-        else if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType))
+        else if (arraysContains(GenConstants.COLUMNTYPE_TIME.toArray(new String[0]), dataType))
         {
             column.setJavaType(GenConstants.TYPE_DATE);
             column.setHtmlType(GenConstants.HTML_DATETIME);
         }
-        else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType))
+        else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER.toArray(new String[0]), dataType))
         {
             column.setHtmlType(GenConstants.HTML_INPUT);
 
@@ -83,17 +83,17 @@ public class GenUtils
         column.setIsInsert(GenConstants.REQUIRE);
 
         // 编辑字段
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName) && !column.isPk())
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT.toArray(new String[0]), columnName) && !column.isPk())
         {
             column.setIsEdit(GenConstants.REQUIRE);
         }
         // 列表字段
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName) && !column.isPk())
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST.toArray(new String[0]), columnName) && !column.isPk())
         {
             column.setIsList(GenConstants.REQUIRE);
         }
         // 查询字段
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk())
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY.toArray(new String[0]), columnName) && !column.isPk())
         {
             column.setIsQuery(GenConstants.REQUIRE);
         }

soc-modules/soc-modules-job/src/main/java/com/xunmei/job/controller/SysJobController.java

@@ -99,7 +99,7 @@ public class SysJobController extends BaseController
         {
             return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'http(s)'调用");
         }
-        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR))
+        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR.toArray(new String[0])))
         {
             return error("新增任务'" + job.getJobName() + "'失败，目标字符串存在违规");
         }
@@ -135,7 +135,7 @@ public class SysJobController extends BaseController
         {
             return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'http(s)'调用");
         }
-        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR))
+        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR.toArray(new String[0])))
         {
             return error("修改任务'" + job.getJobName() + "'失败，目标字符串存在违规");
         }

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

@@ -122,9 +122,9 @@ public class ScheduleUtils
         int count = StringUtils.countMatches(packageName, ".");
         if (count > 1)
         {
-            return StringUtils.containsAnyIgnoreCase(invokeTarget, Constants.JOB_WHITELIST_STR);
+            return StringUtils.containsAnyIgnoreCase(invokeTarget, Constants.JOB_WHITELIST_STR.toArray(new String[0]));
         }
         Object obj = SpringUtils.getBean(StringUtils.split(invokeTarget, ".")[0]);
-        return StringUtils.containsAnyIgnoreCase(obj.getClass().getPackage().getName(), Constants.JOB_WHITELIST_STR);
+        return StringUtils.containsAnyIgnoreCase(obj.getClass().getPackage().getName(), Constants.JOB_WHITELIST_STR.toArray(new String[0]));
     }
 }

soc-modules/soc-modules-sync/src/main/java/com/xunmei/sync/controller/FjnxSyncController.java

@@ -72,17 +72,6 @@ class FjnxSyncController {
         }
     }
 
-    @GetMapping("/organduser")
-    @ResponseBody
-    AjaxResult SyncOrgAndUser(final MultipartFile file) throws IOException {
-
-        try {
-            ifjnxSyncService.SyncOrgAndUserInfo();
-            return AjaxResult.success("同步成功");
-        } catch (Exception e) {
-            return AjaxResult.error("机构人员同步失败" + e.getMessage());
-        }
-    }
 
 //    @GetMapping("/refresh/orgbusinesspath")
 //    @ResponseBody

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

@@ -131,9 +131,9 @@ public class SysProfileController extends BaseController
         {
             LoginUser loginUser = SecurityUtils.getLoginUser();
             String extension = FileTypeUtils.getExtension(file);
-            if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION))
+            if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION.toArray(new String[0])))
             {
-                return error("文件格式不正确，请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "格式");
+                return error("文件格式不正确，请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION.toArray(new String[0])) + "格式");
             }
             R<SysFile> fileResult = remoteFileService.upload(file);
             if (StringUtils.isNull(fileResult) || StringUtils.isNull(fileResult.getData()))