Merge remote-tracking branch 'origin/master'

pom.xml

@@ -15,6 +15,7 @@
     <description>Demo project for Spring Boot</description>
     <properties>
         <java.version>1.8</java.version>
+        <maven.test.skip>true</maven.test.skip>
     </properties>
     <dependencies>
         <dependency>

src/main/java/com/zzsn/knowbase/controller/KnowledgeController.java

@@ -18,6 +18,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -108,6 +109,7 @@ public class KnowledgeController {
      * @param knowledge
      * @return
      */
+    //todo 添加文件
     @ApiOperation(value = "知识-添加", notes = "知识-添加")
     @PostMapping(value = "/uploadKnowledge")
     public Result<?> uploadKnowledge(HttpServletRequest request, Knowledge knowledge) {
@@ -134,7 +136,9 @@ public class KnowledgeController {
         for (KnowFile knowFileResult : resultList) {
             knowledge.setId(null);
             knowledge.setTitle(null);
-            knowledgeService.addKnowledge(knowFileResult, knowledge, userInfo);
+            Knowledge knowledgeNew = new Knowledge();
+            BeanUtils.copyProperties(knowledge, knowledgeNew);
+            knowledgeService.addKnowledge(knowFileResult, knowledgeNew, userInfo);
         }
     }
 
@@ -177,6 +181,7 @@ public class KnowledgeController {
      */
     @PostMapping(value = "/IntelligentQa")
     public Result<?> intelligentQa(@RequestBody IntelligentQaParam intelligentQaParam) throws IOException {
+        log.info(intelligentQaParam.toString());
         JSONObject params = new JSONObject();
         params.put("score_threshold", intelligentQaParam.getScoreThreshold());
         params.put("question", intelligentQaParam.getQuestion());

src/main/resources/application.yml

@@ -50,10 +50,10 @@ python:
 
 know:
   thirdpartyurl:
-#    checkuserurl: https://clb.ciglobal.cn/clb-api/sys/checkToken
-#    getusersurl: https://clb.ciglobal.cn/clb-api/sys/user/thirdparty
-    checkuserurl: http://192.168.0.124:9988/sys/checkToken
-    getusersurl: http://192.168.0.124:9988/sys/user/thirdparty
+    checkuserurl: https://clb.ciglobal.cn/clb-api/sys/checkToken
+    getusersurl: https://clb.ciglobal.cn/clb-api/sys/user/thirdparty
+#    checkuserurl: http://192.168.0.124:9988/sys/checkToken
+#    getusersurl: http://192.168.0.124:9988/sys/user/thirdparty
 
 document:
   server: