Merge pull request 'v0.0.8' (#13) from dev into master

Reviewed-on: #13

.gitea/workflows/ci.yml

@@ -92,71 +92,20 @@ jobs:
           }
           EOF
           )
-          echo "Creating release with tag: $RELEASE_TAG"
+          response=$(curl -sS -X POST "$api_url" \
-          echo "API URL: $api_url"
-          echo "Target commit: $RELEASE_TARGET"
-
-          http_code=$(curl -sS -w "%{http_code}" -o /tmp/release_response.json -X POST "$api_url" \
             -H "Authorization: token $GITEA_TOKEN" \
             -H "Content-Type: application/json" \
             -d "$payload")
-
+          release_id=$(echo "$response" | grep -o '"id":[0-9]*' | head -n 1 | grep -o '[0-9]*')
-          response=$(cat /tmp/release_response.json)
+          if [ -z "$release_id" ] || echo "$response" | grep -q '"message"'; then
-          echo "HTTP Status: $http_code"
+            echo "Create release failed: $response"
-          echo "Response: $response"
-
-          if [ "$http_code" -ne 201 ]; then
-            echo "Failed to create release (HTTP $http_code)"
-            if echo "$response" | grep -q "already exists"; then
-              echo "Release with tag $RELEASE_TAG already exists"
-            fi
-            exit 1
-          fi
-
-          release_id=$(echo "$response" | grep -oP '"id":\K[0-9]+' | head -n 1 || true)
-          if [ -z "$release_id" ]; then
-            echo "Failed to extract release ID from response"
             exit 1
           fi
           echo "Release created: id=$release_id"
-
-          echo "Listing jar files in target directory:"
-          ls -lh target/*.jar || echo "No jar files found"
-
-          upload_count=0
           for asset_path in target/*.jar; do
-            if [ ! -f "$asset_path" ]; then
-              echo "Skipping non-existent file: $asset_path"
-              continue
-            fi
             asset_name=$(basename "$asset_path")
-            file_size=$(stat -c%s "$asset_path" 2>/dev/null || echo "unknown")
+            curl -sS -X POST "$api_url/$release_id/assets?name=$asset_name" \
-            echo "Uploading asset: $asset_name (size: $file_size bytes)"
-
-            upload_url="$api_url/$release_id/assets?name=$asset_name"
-            echo "Upload URL: $upload_url"
-
-            set +e
-            http_code=$(curl -sS -w "%{http_code}" -o /tmp/asset_response.json -X POST "$upload_url" \
               -H "Authorization: token $GITEA_TOKEN" \
               -H "Content-Type: application/octet-stream" \
-              --data-binary @"$asset_path" 2>/dev/null)
+              --data-binary @"$asset_path"
-            curl_exit=$?
-            set -e
-
-            if [ $curl_exit -ne 0 ]; then
-              echo "✗ Curl failed with exit code $curl_exit for $asset_name"
-              cat /tmp/asset_response.json 2>/dev/null || echo "No response file"
-              continue
-            fi
-
-            if [ "$http_code" = "201" ]; then
-              echo "✓ Successfully uploaded: $asset_name"
-              upload_count=$((upload_count + 1))
-            else
-              echo "✗ Failed to upload $asset_name (HTTP $http_code)"
-              cat /tmp/asset_response.json 2>/dev/null || echo "No response body"
-            fi
           done
-
-          echo "Upload complete: $upload_count file(s) uploaded"

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.imyeyu.network</groupId>
 	<artifactId>timi-network</artifactId>
-	<version>0.0.5</version>
+	<version>0.0.8</version>
 	<packaging>jar</packaging>
 
 	<properties>
@@ -92,7 +92,7 @@
 		<dependency>
 			<groupId>com.imyeyu.io</groupId>
 			<artifactId>timi-io</artifactId>
-			<version>0.0.2</version>
+			<version>0.0.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents.client5</groupId>
@@ -100,9 +100,9 @@
 			<version>5.6</version>
 		</dependency>
 		<dependency>
-			<groupId>tools.jackson.core</groupId>
+			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>3.1.0</version>
+			<version>2.21.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>

src/main/java/com/imyeyu/network/JacksonRequest.java

@@ -1,17 +1,20 @@
 package com.imyeyu.network;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JacksonException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.hc.client5.http.fluent.Request;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.HttpEntity;
-import tools.jackson.core.JacksonException;
-import tools.jackson.core.type.TypeReference;
-import tools.jackson.databind.JsonNode;
-import tools.jackson.databind.ObjectMapper;
-import tools.jackson.databind.node.ArrayNode;
-import tools.jackson.databind.node.ObjectNode;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
+import java.text.SimpleDateFormat;
 
 /**
  * 基于 Jackson 的请求封装。
@@ -23,6 +26,12 @@ public class JacksonRequest extends CommonRequest {
 
 	private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
+	static {
+		OBJECT_MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		OBJECT_MAPPER.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+		OBJECT_MAPPER.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+	}
+
 	private ObjectMapper objectMapper = null;
 
 	protected JacksonRequest(Request request) {

src/main/java/com/imyeyu/network/TimiRequest.java

@@ -1,10 +1,10 @@
 package com.imyeyu.network;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JavaType;
 import com.imyeyu.java.bean.timi.TimiResponse;
 import org.apache.hc.client5.http.fluent.Request;
 import org.apache.hc.core5.http.HttpEntity;
-import tools.jackson.core.type.TypeReference;
-import tools.jackson.databind.JavaType;
 
 import java.io.IOException;
 import java.lang.reflect.Type;