Merge pull request #16 from LucienShui/fix/http_client_charset

Fix charset in httpClient, rename inference's param name

Author: LucienShui

.gitignore

@@ -24,3 +24,4 @@ buildNumber.properties
 
 # application.yml
 src/main/resources/application.yml
+src/test/resources/application.yml

pom.xml

@@ -10,7 +10,7 @@
         <version>1.0.3-SNAPSHOT</version>
     </parent>
     <artifactId>pasteme-algorithm</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.5</version>
     <name>PasteMe Algorithm</name>
     <description>PasteMe Algorithm Collection</description>
 

…/algorithm/http/impl/HttpClientImpl.java …steme/algorithm/http/HttpClientImpl.javasrc/main/java/cn/pasteme/algorithm/http/impl/HttpClientImpl.java renamed to src/main/java/cn/pasteme/algorithm/http/HttpClientImpl.java src/main/java/cn/pasteme/algorithm/http/impl/HttpClientImpl.java renamed to src/main/java/cn/pasteme/algorithm/http/HttpClientImpl.java

@@ -1,4 +1,4 @@
-package cn.pasteme.algorithm.http.impl;
+package cn.pasteme.algorithm.http;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
@@ -46,7 +46,7 @@ public JSONObject post(String url, JSONObject json) throws IOException {
     @Override
     public JSONObject post(String url, String json) throws IOException {
         HttpPost request = new HttpPost(url);
-        StringEntity params = new StringEntity(json);
+        StringEntity params = new StringEntity(json, "UTF-8");
         request.addHeader("Content-Type", "application/json");
         request.setEntity(params);
         HttpResponse response = httpClient.execute(request);

src/main/java/cn/pasteme/algorithm/model/TextRiskClassification.java

@@ -13,9 +13,9 @@ public interface TextRiskClassification {
     /**
      * 调用模型
      *
-     * @param jsonString 模型参数
+     * @param content 文本内容
      * @return 模型的推理结果，0 代表 Normal，1 代表 Risk
      * @throws IOException HTTP 请求出错
      */
-    int inference(String jsonString) throws IOException;
+    int inference(String content) throws IOException;
 }

…del/impl/TextRiskClassificationImpl.java …hm/model/TextRiskClassificationImpl.javasrc/main/java/cn/pasteme/algorithm/model/impl/TextRiskClassificationImpl.java renamed to src/main/java/cn/pasteme/algorithm/model/TextRiskClassificationImpl.java src/main/java/cn/pasteme/algorithm/model/impl/TextRiskClassificationImpl.java renamed to src/main/java/cn/pasteme/algorithm/model/TextRiskClassificationImpl.java

@@ -1,8 +1,6 @@
-package cn.pasteme.algorithm.model.impl;
+package cn.pasteme.algorithm.model;
 
 import cn.pasteme.algorithm.http.HttpClient;
-import cn.pasteme.algorithm.http.impl.HttpClientImpl;
-import cn.pasteme.algorithm.model.TextRiskClassification;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

…orithm/http/impl/HttpClientImplTest.java …e/algorithm/http/HttpClientImplTest.javasrc/test/java/cn/pasteme/algorithm/http/impl/HttpClientImplTest.java renamed to src/test/java/cn/pasteme/algorithm/http/HttpClientImplTest.java src/test/java/cn/pasteme/algorithm/http/impl/HttpClientImplTest.java renamed to src/test/java/cn/pasteme/algorithm/http/HttpClientImplTest.java

@@ -1,10 +1,12 @@
-package cn.pasteme.algorithm.http.impl;
+package cn.pasteme.algorithm.http;
 
 import cn.pasteme.algorithm.http.HttpClient;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
@@ -13,9 +15,12 @@
 @RunWith(SpringRunner.class)
 public class HttpClientImplTest {
 
+    @Autowired
+    private HttpClient httpClient;
+
     @Test
+    @Ignore
     public void testPost() {
-        HttpClient httpClient = new HttpClientImpl();
         try {
             JSONObject jsonResponse = httpClient.post(
                     "http://predict.pasteme.lucien.ink/v1/models/PasteMeRIM:predict",

src/test/java/cn/pasteme/algorithm/model/TextRiskClassificationImplTest.java

@@ -0,0 +1,29 @@
+package cn.pasteme.algorithm.model;
+
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@Slf4j
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
+@RunWith(SpringRunner.class)
+public class TextRiskClassificationImplTest {
+
+    @Autowired
+    private TextRiskClassification textRiskClassification;
+
+    @Test
+    @Ignore
+    public void inference() {
+        String content = "你好，世界！";
+        try {
+            int result = textRiskClassification.inference(content);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}