Merge branch 'dev' into 'master'

Dev

See merge request !5

src/main/java/com/nanyan/securitylink/common/Constant.java

@@ -5,6 +5,8 @@ public interface Constant {
     int picType = 1;
     int textType = 0;
     String ACCOUNT = "account";
+    String MODEL = "model";
+    String MODEL_KEY = "modelKey";
     int SUCCESS_STATUS = 200;
     String WEATHER_GROUP = "weatherType";
     String ADMIN_ROLE = "admin";

src/main/java/com/nanyan/securitylink/config/WebConfig.java

@@ -16,10 +16,12 @@ public class WebConfig extends WebMvcConfigurationSupport {
     private LoginInterceptor loginInterceptor;
     @Resource
     LogResponseTimeInterceptor logResponseTimeInterceptor;
+    @Resource
+    HeaderInterceptor headerInterceptor;
 
     @Override
     protected void addInterceptors(InterceptorRegistry registry) {
-//
+        registry.addInterceptor(headerInterceptor);
         registry.addInterceptor(loginInterceptor);
         registry.addInterceptor(logResponseTimeInterceptor);
         super.addInterceptors(registry);

src/main/java/com/nanyan/securitylink/controller/AIController.java

 package com.nanyan.securitylink.controller;
 
-import com.nanyan.securitylink.dto.TranslateDTO;
+import com.nanyan.securitylink.dto.AIRequestDTO;
 import com.nanyan.securitylink.service.AIService;
 import com.nanyan.securitylink.vo.AIResponse;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,11 +14,15 @@ public class AIController {
     @Autowired
     AIService aiService;
     @PostMapping("/translate")
-    public Response<AIResponse> translate(@RequestBody TranslateDTO translateDTO) {
-        return Response.SUCCESS(aiService.translate(translateDTO));
+    public Response<AIResponse> translate(@RequestBody AIRequestDTO AIRequestDTO) {
+        return Response.SUCCESS(aiService.translate(AIRequestDTO));
     }
-    @PostMapping("/tag")
-    public Response<AIResponse> newsTag(@RequestBody TranslateDTO translateDTO) {
-        return Response.SUCCESS(aiService.newsTags(translateDTO));
+    @PostMapping("/news/tag")
+    public Response<AIResponse> newsTag(@RequestBody AIRequestDTO AIRequestDTO) {
+        return Response.SUCCESS(aiService.newsTags(AIRequestDTO));
+    }
+    @PostMapping("/natural/disaster/tag")
+    public Response<AIResponse> naturalDisasterTag(@RequestBody AIRequestDTO AIRequestDTO) {
+        return Response.SUCCESS(aiService.naturalDisasterTag(AIRequestDTO));
     }
 }

src/main/java/com/nanyan/securitylink/dto/TranslateInputDTO.java → src/main/java/com/nanyan/securitylink/dto/AIInputDTO.java

@@ -3,7 +3,9 @@ package com.nanyan.securitylink.dto;
 import lombok.Data;
 
 @Data
-public class TranslateInputDTO {
+public class AIInputDTO {
     String record_json;
+    String msg_info;
+    String warn_info;
     String language;
 }

src/main/java/com/nanyan/securitylink/dto/TranslateDTO.java → src/main/java/com/nanyan/securitylink/dto/AIRequestDTO.java

@@ -3,8 +3,8 @@ package com.nanyan.securitylink.dto;
 import lombok.Data;
 
 @Data
-public class TranslateDTO {
-    TranslateInputDTO inputs;
+public class AIRequestDTO {
+    AIInputDTO inputs;
     String response_mode;
     String user;
 }

src/main/java/com/nanyan/securitylink/entity/UserHeader.java

 package com.nanyan.securitylink.entity;
 
-public class UserHeader {
-    String userId;
-    String accountName;
-    String role;
-    String token;
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
+import lombok.Data;
 
-    public String getAccountName() {
-        return accountName;
-    }
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    public String getRole() {
-        return role;
-    }
-
-    public void setRole(String role) {
-        this.role = role;
-    }
+@Data
+public class UserHeader {
+    String model;
+    String modelKey;
 }

src/main/java/com/nanyan/securitylink/interceptor/HeaderInterceptor.java

@@ -5,6 +5,7 @@ import com.nanyan.securitylink.common.MsgCode;
 import com.nanyan.securitylink.entity.UserHeader;
 import com.nanyan.securitylink.entity.UserThreadLocal;
 import com.nanyan.securitylink.execption.HeaderException;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 import org.springframework.web.servlet.HandlerInterceptor;
@@ -14,19 +15,21 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.Base64;
 
 
+@Slf4j
 @Component
 public class HeaderInterceptor implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
 
         try{
-            String accountName = getHeader(request, Constant.ACCOUNT);
+            String model = getHeader(request, Constant.MODEL);
+            String modelKey = getHeader(request, Constant.MODEL_KEY);
             UserHeader userHeader = new UserHeader();
-            userHeader.setAccountName(accountName);
+            userHeader.setModel(model);
+            userHeader.setModelKey(modelKey);
             UserThreadLocal.set(userHeader);
         }catch (Exception e){
-            e.printStackTrace();
-            throw new HeaderException(MsgCode.LOGIN_FAILED);
+            log.info("", e);
         }
         return true;
 
@@ -41,8 +44,6 @@ public class HeaderInterceptor implements HandlerInterceptor {
         if(StringUtils.isEmpty(value)){
             return "";
         }
-        byte[] decodedBytes = Base64.getDecoder().decode(value);
-        value = new String(decodedBytes);
         return value;
     }
 }

src/main/java/com/nanyan/securitylink/interceptor/LogResponseTimeInterceptor.java

@@ -31,10 +31,10 @@ public class LogResponseTimeInterceptor implements HandlerInterceptor {
 //        System.out.println("接口耗时：" + time + "ms");
         String requestURI = request.getRequestURI();
         UserHeader userHeader = UserThreadLocal.get();
-        String accountName = "";
+        String model = "";
         if(userHeader != null){
-            accountName = UserThreadLocal.get().getAccountName();
-            logger.info("account:{} 接口{}耗时{} ms", accountName,requestURI, time);
+            model = UserThreadLocal.get().getModel();
+            logger.info("model:{} 接口{}耗时{} ms", model,requestURI, time);
         }else {
             logger.info("接口{}耗时{} ms",requestURI, time);
         }

src/main/java/com/nanyan/securitylink/interceptor/LoginInterceptor.java

@@ -11,10 +11,7 @@ import java.io.IOException;
 @Component
 public class LoginInterceptor implements HandlerInterceptor {
     @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws IOException {
-        String uri = request.getRequestURI();
-
-        String token = request.getHeader("token");  // 从请求头中获取 token
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
         return true;
     }
 }

src/main/java/com/nanyan/securitylink/service/AIService.java

 package com.nanyan.securitylink.service;
 
-import com.nanyan.securitylink.dto.TranslateDTO;
+import com.nanyan.securitylink.dto.AIRequestDTO;
 import com.nanyan.securitylink.vo.AIResponse;
 
 public interface AIService {
-    AIResponse translate(TranslateDTO translateDTO);
-    AIResponse newsTags(TranslateDTO translateDTO);
+    AIResponse translate(AIRequestDTO AIRequestDTO);
+    AIResponse newsTags(AIRequestDTO AIRequestDTO);
+
+    AIResponse naturalDisasterTag(AIRequestDTO aiRequestDTO);
 }