Merge remote-tracking branch 'origin/master'

src/main/java/com/qizhen/healsphere/web/KgController.java

@@ -58,7 +58,8 @@ public class KgController {
     }
 
     @ApiOperation(value = "查询节点", notes = "查询节点")
-    @PostMapping("/getNode")
+    @RequestMapping(value = "/getNode", method = RequestMethod.POST)
+    @ResponseBody
     public RespDTO<List<NodeDTO>> getNode(@RequestBody @Valid KgQuery kgQuery) {
         return RespDTO.onSuc(kgFacade.getNode(kgQuery));
     }

src/main/resources/application-local.yml

@@ -1,8 +1,3 @@
-server:
-  port: 8080
-  max-http-header-size: 10MB
-
-
 swagger:
   enable: true
 
@@ -26,4 +21,8 @@ spring:
 
 springfox:
   documentation:
-    enabled: true
+    enabled: true
+
+server:
+  port: 8086
+  max-http-header-size: 10MB

src/main/resources/application-test.yml

@@ -1,23 +1,11 @@
 spring:
   datasource:
-#    dynamic:
-#      primary: neo4j
-#      # 数据库配置
-#      datasource:
-#        neo4j:
-#          driver-class-name: org.neo4j.jdbc.Driver
-#          url: jdbc:neo4j:http://173.18.12.194:7474
-#          username: neo4j
-#          password: 12345678
-#        mysql:
-#          driver-class-name: com.mysql.cj.jdbc.Driver
-#          url: jdbc:mysql://173.18.12.194:3306/sys-ltkg?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-#          username: root
-#          password: dsYun8!@#
-    driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://173.18.12.194:3306/sys-ltkg?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-    username: root
-    password: dsYun8!@#
+    hikari:
+      driver-class-name: com.mysql.jdbc.Driver
+      username: root
+      password: dsYun8!@#
+      jdbc-url: jdbc:mysql://173.18.12.194:3306/sys-ltkg?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+
   neo4j:
     uri: bolt://173.18.12.206:7687
     authentication:
@@ -27,37 +15,12 @@ spring:
 #mybatis
 mybatis:
   type-aliases-package: com.qizhen.healsphere.repository.mapper.entity
-  mapper-locations: classpath:mapper/*.xml
-
-#mybatis-plus
-mybatis-plus:
-  mapper-locations: classpath:/mapper/*Mapper.xml
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.qizhen.healsphererepository.mapper.entity
-  global-config:
-    #刷新mapper 调试神器
-    db-config:
-      #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-      id-type: id_worker
-      #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
-      #驼峰下划线转换
-      column-underline: true
-      #数据库大写下划线转换
-      #capital-mode: true
-      #刷新mapper 调试神器
-      refresh-mapper: true
-      #逻辑删除配置
-      logic-delete-value: 0
-      logic-not-delete-value: 1
-      #自定义填充策略接口实现
-      #meta-object-handler: com.baomidou.springboot.xxx
-      #自定义SQL注入器
-      #sql-injector: com.baomidou.springboot.xxx
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
+  mapper-locations: classpath:mapper/mysql/*.xml
 
 springfox:
   documentation:
-    enabled: true
+    enabled: true
+
+server:
+  port: 8080
+  max-http-header-size: 10MB

src/main/resources/application.yml

@@ -0,0 +1,5 @@
+spring:
+  profiles:
+    active: local
+#  application:
+#    name: healsphere

src/main/resources/bootstrap.yml

@@ -1,16 +0,0 @@
-spring:
-  profiles:
-    active: local
-  application:
-    name: healsphere
-#  mvc:
-#    pathmatch:
-#      matching-strategy: ant_path_matcher
-#  jackson:
-#    default-property-inclusion: non_null
-#    deserialization:
-#      ACCEPT_FLOAT_AS_INT: false
-server:
-  port: 8080
-  max-http-header-size: 10MB
-