Ver Fonte

2022-11-2 17:14 RMS报告管理系统提交 微调

沈永艺 há 2 anos atrás
pai
commit
da05f1f5b2

+ 0 - 41
RMS/src/main/java/cn/cslg/report/common/utils/ApiUtils.java

@@ -1,41 +0,0 @@
-package cn.cslg.report.common.utils;
-
-import com.alibaba.fastjson.JSONObject;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import java.io.IOException;
-import java.util.Objects;
-
-@Component
-public class ApiUtils {
-    @Value("${PCSUrl}")
-    private String url;
-    public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-
-    public String invokeApi(JSONObject params, String api, String type, String field) throws IOException {
-        RequestBody postParams = RequestBody.create(JSON, String.valueOf(params));
-        OkHttpClient okHttpClient = new OkHttpClient();
-        String resBody = null;
-        if (type.equals("post")) {
-            Request request = new Request.Builder()
-                    .url(url + api)
-                    .post(postParams)
-                    .build();
-            resBody = Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
-        } else if (type.equals("get")) {
-            Request request = new Request.Builder()
-                    .url(url + api)
-                    .get()
-                    .build();
-            resBody = Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
-        }
-
-        JSONObject jsonObject = JSONObject.parseObject(resBody, JSONObject.class);
-        return jsonObject.get(field).toString();
-    }
-}

+ 1 - 0
RMS/src/main/java/cn/cslg/report/common/utils/DataUtils.java

@@ -93,6 +93,7 @@ public class DataUtils {
      * @author 沈永艺
      * @description 处理权利要求
      */
+    // TODO: 2022/11/2 未完成
     public List<String> processRightToFeatures(List<String> rightList, String patentNo) {
         List<String> features = new ArrayList<>();
         if (patentNo != null) {

+ 2 - 1
RMS/src/main/java/cn/cslg/report/common/utils/SecurityUtils/LoginUtils.java

@@ -10,6 +10,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Objects;
 
 @Component
 public class LoginUtils {
@@ -19,7 +20,7 @@ public class LoginUtils {
     public static String getToken() {
         RequestAttributes ra = RequestContextHolder.getRequestAttributes();
         ServletRequestAttributes sra = (ServletRequestAttributes) ra;
-        HttpServletRequest httpRequest = sra.getRequest();
+        HttpServletRequest httpRequest = Objects.requireNonNull(sra).getRequest();
         String tem = httpRequest.getHeader("Cookie");
         List<String> lst = StringUtils.changeStringToString(tem, ";");
         final String[] token = {null};