Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/nckd/fi/all/common/utils/FileOutputStreamExample.java

src/main/java/nckd/fi/all/common/utils/ApiHttpUtils.java

@@ -2,6 +2,7 @@ package nckd.fi.all.common.utils;
 
 
 import com.alibaba.fastjson.JSON;
+import kd.bos.script.annotations.KSObject;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
@@ -9,7 +10,7 @@ import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
-
+@KSObject
 public class ApiHttpUtils {
 
     public static String Posthttp(String url, String Params) throws Exception {

src/main/java/nckd/fi/all/common/utils/CodecUtil.java

@@ -3,6 +3,7 @@ package nckd.fi.all.common.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import kd.bos.script.annotations.KSObject;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,6 +20,7 @@ import java.nio.charset.StandardCharsets;
  * @author bi lei
  * @date 2020/12/18 10:35
  */
+@KSObject
 public class CodecUtil {
     private static final Logger logger = LoggerFactory.getLogger(CodecUtil.class);
     private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;