Merge remote-tracking branch 'origin/master'

src/main/java/com/qizhen/healsphere/service/impl/KgServiceImpl.java

@@ -42,9 +42,9 @@ public class KgServiceImpl implements KgService {
     public List<GraphDTO> getGraph(KgQuery kgQuery){
         Map<String,Object> map = new HashMap<>();
         map.put("inputStr",kgQuery.getInputStr());
-        String cypherQuery = "MATCH (n:" + kgQuery.getLabelName() + ")-[r]->(m)\n" +
+        String cypherQuery = "MATCH (n:`" + kgQuery.getLabelName() + "`)-[r]->(m)\n" +
                 "            where n.name = $inputStr and (n.is_deleted = 'N' or NOT exists(n.is_deleted))\n" +
-                "            OPTIONAL MATCH p=(m)-[]->(o) where head(Labels(m)) in [\"疾病\",\"症状\",\"药品\",\"手术和操作\",\"实验室检查\",\"辅助检查\"]\n" +
+                "            OPTIONAL MATCH p=(m)-[]->(o)\n" +
                 "            RETURN n,Type (r) as rType, m, count(p) as pCount\n" +
                 "            ORDER BY rType";
 

src/main/resources/application-local.yml

@@ -4,10 +4,10 @@ swagger:
 spring:
   datasource:
     hikari:
-      jdbc-url: jdbc:postgresql://172.16.8.64:5432/postgres
+      jdbc-url: jdbc:postgresql://173.18.12.203:5432/postgres
       driver-class-name: org.postgresql.Driver
-      username: postgres
-      password: 12345678
+      username: knowledge
+      password: qwer1234.
 #      jdbc-url: jdbc:mysql://173.18.12.194:3306/sys-ltkg?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
 #      driver-class-name: com.mysql.cj.jdbc.Driver
 #      username: root

src/main/resources/application-test.yml

@@ -1,10 +1,10 @@
 spring:
   datasource:
     hikari:
-      jdbc-url: jdbc:postgresql://172.16.8.64:5432/postgres
+      jdbc-url: jdbc:postgresql://173.18.12.203:5432/postgres
       driver-class-name: org.postgresql.Driver
-      username: postgres
-      password: 12345678
+      username: knowledge
+      password: qwer1234.
 
   neo4j:
     uri: bolt://173.18.12.206:7687
@@ -22,5 +22,5 @@ springfox:
     enabled: true
 
 server:
-  port: 8080
+  port: 8086
   max-http-header-size: 10MB

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: test
+    active: local
   application:
     name: healsphere
   jackson: