diff --git a/fw-oa/src/main/java/com/hzya/frame/seeyon/util/OARestUtil.java b/fw-oa/src/main/java/com/hzya/frame/seeyon/util/OARestUtil.java index 7d498d93..16558dc4 100644 --- a/fw-oa/src/main/java/com/hzya/frame/seeyon/util/OARestUtil.java +++ b/fw-oa/src/main/java/com/hzya/frame/seeyon/util/OARestUtil.java @@ -28,8 +28,8 @@ import java.util.List; @Component public class OARestUtil { @Autowired - private static ISysApplicationApiService sysApplicationApiService; - static Logger logger = LoggerFactory.getLogger(OARestUtil.class); + private ISysApplicationApiService sysApplicationApiService; + Logger logger = LoggerFactory.getLogger(OARestUtil.class); private OARestUtil() { } @@ -38,7 +38,7 @@ public class OARestUtil { /** * 附件上传 * @param file 附件对象 - * @param api_code 接口编码 + * @param api_code_upload 接口编码 * @return */ public JSONObject fileUpload(File file,String api_code_upload,String api_code_token) { @@ -162,7 +162,7 @@ public class OARestUtil { * @param sysApp 应用信息 * @return */ - public static String getToken(String login_name,SysApplicationApiEntity sysApp){ + public String getToken(String login_name,SysApplicationApiEntity sysApp){ if (null != sysApp){ HashMap hashMap = new HashMap<>(); String app_url = StrUtil.removeSuffix(sysApp.getAppUrl(), "/"); @@ -193,7 +193,7 @@ public class OARestUtil { } return null; } - private static SysApplicationApiEntity getByCode(String api_code){ + public SysApplicationApiEntity getByCode(String api_code){ if (StrUtil.isNotEmpty(api_code)){ SysApplicationApiEntity sysApp = new SysApplicationApiEntity(); sysApp.setApiCode(Long.valueOf(api_code));