Merge branch 'master' into prod

config/nginx.conf

@@ -0,0 +1,53 @@
+worker_processes  1;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+    sendfile        on;
+    keepalive_timeout  65;
+
+    server {
+        listen       80;
+        server_name  localhost;
+		charset utf-8;
+
+		location / {
+            root   /home/projects/kgraph-web;
+			try_files $uri $uri/ /index.html;
+            index  index.html index.htm;
+        }
+
+		location /prod-api/ {
+			proxy_set_header Host $http_host;
+			proxy_set_header X-Real-IP $remote_addr;
+			proxy_set_header REMOTE-HOST $remote_addr;
+			proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+			proxy_pass http://localhost:11082/;
+		}
+
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   html;
+        }
+        # 开启gzip压缩
+        gzip on;
+        # 不压缩临界值，大于1K的才压缩，一般不用改
+        gzip_min_length 1k;
+        # 压缩缓冲区
+        gzip_buffers 16 64K;
+        # 压缩版本（默认1.1，前端如果是squid2.5请使用1.0）
+        gzip_http_version 1.1;
+        # 压缩级别，1-10，数字越大压缩的越好，时间也越长
+        gzip_comp_level 5;
+        # 进行压缩的文件类型
+        gzip_types text/plain application/x-javascript text/css application/xml application/javascript;
+        # 跟Squid等缓存服务有关，on的话会在Header里增加"Vary: Accept-Encoding"
+        gzip_vary on;
+        # IE6对Gzip不怎么友好，不给它Gzip了
+        gzip_disable "MSIE [1-6]\.";
+    }
+}

kgraph-admin/src/main/resources/application.yml

@@ -59,9 +59,9 @@ spring:
   servlet:
     multipart:
       # 单个文件大小
-      max-file-size:  10MB
+      max-file-size:  10000MB
       # 设置总上传的文件大小
-      max-request-size:  20MB
+      max-request-size:  20000MB
   # 服务模块
   devtools:
     restart:

kgraph-common/src/main/java/com/kgraph/common/utils/file/FileUploadUtils.java

@@ -26,7 +26,7 @@ public class FileUploadUtils
     /**
      * 默认大小 50M
      */
-    public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
+    public static final long DEFAULT_MAX_SIZE = 1024 * 1024 * 1024;
 
     /**
      * 默认的文件名最大长度 100

kgraph-graph/src/main/java/com/kgraph/graph/neo4j/controller/KgController.java

@@ -77,6 +77,13 @@ public class KgController extends BaseController {
         return AjaxResult.success(graphVO);
     }
 
+    @GetMapping("/getRelationByLikeName")
+    public AjaxResult getRelationByLikeName(String name) {
+        // TODO length 的最大最小值，从数据字典获取
+        GraphVO graphVO = Neo4j2VOUtils.relation2GraphVO(kgService.getRelationByLikeName(name));
+        return AjaxResult.success(graphVO);
+    }
+
     @GetMapping("/getShortestRelationByName")
     public AjaxResult getShortestRelationByName(String firstName, String secondName) {
         GraphVO graphVO = Neo4j2VOUtils.relation2GraphVO(kgService.getShortestRelationByName(firstName, secondName));

kgraph-graph/src/main/java/com/kgraph/graph/neo4j/mapper/RelationRepository.java

@@ -24,7 +24,7 @@ public interface RelationRepository extends Neo4jRepository<Neo4jRelation, Long>
     List<Neo4jRelation> getRelationByNameLength4(@Param("firstName") String firstName, @Param("secondName") String secondName);
     @Query("match data=(e1:Entity{name: $firstName})-[*..5]-(e2:Entity{name: $secondName}) return data")
     List<Neo4jRelation> getRelationByNameLength5(@Param("firstName") String firstName, @Param("secondName") String secondName);
-    @Query("match data=(e1:Entity{name: $firstName})-[*..5]-(e2:Entity{name: $secondName})  where ALL( n1 in nodes(data) where size([n2 in nodes(data) where id(n1) = id(n2)])=1 ) return data")
+    @Query("match data=(e1:Entity{name: $firstName})-[*]-(e2:Entity{name: $secondName})  where ALL( n1 in nodes(data) where size([n2 in nodes(data) where id(n1) = id(n2)])=1 ) return data")
     List<Neo4jRelation> getAllRelationByName(@Param("firstName") String firstName, @Param("secondName") String secondName);
 
     @Query("match data=allshortestpaths((e1:Entity{name: $firstName})-[*]-(e2:Entity{name: $secondName})) return data")
@@ -38,4 +38,7 @@ public interface RelationRepository extends Neo4jRepository<Neo4jRelation, Long>
 
     @Query(value = "match data=(e1:Entity)-[r:Relation{name:$0.name}]->(e2:Entity) return data", countQuery = "match data=(e1:Entity)-[r:Relation{name:$0.name}]->(e2:Entity) return count(data)")
     Page<Neo4jRelation> getPageListByName(RelationDTO dto, PageRequest page);
+
+    @Query("match data=(e1:Entity)-[r:Relation]-(e2:Entity) where e1.name =~ $name and e2.name =~ $name return data")
+    List<Neo4jRelation> getRelationByLikeName(@Param("name") String name);
 }

kgraph-graph/src/main/java/com/kgraph/graph/neo4j/seavice/IKgService.java

@@ -20,4 +20,6 @@ public interface IKgService {
     String question(String question);
 
     String analysis(String question);
+
+    List<Neo4jRelation> getRelationByLikeName(String name);
 }

kgraph-graph/src/main/java/com/kgraph/graph/neo4j/seavice/impl/KgServiceImpl.java

@@ -200,4 +200,9 @@ public class KgServiceImpl implements IKgService {
 
     }
 
+    @Override
+    public List<Neo4jRelation> getRelationByLikeName(String name) {
+        return relationRepository.getRelationByLikeName(".*" + name + ".*");
+    }
+
 }