合并分支 'master' 到 'dev_fzm'

feat: 新增 JTS Jackson 序列化配置、开发环境依赖配置更新

查看合并请求 chemical-kesai/kshg-api!9

app/build.gradle

@@ -44,4 +44,7 @@ dependencies {
 	// JTS 几何对象操作库
 	implementation "org.locationtech.jts:jts-core:${jtsVersion}"
 
+	// https://mvnrepository.com/artifact/com.graphhopper.external/jackson-datatype-jts
+	implementation 'com.graphhopper.external:jackson-datatype-jts:1.0-2.7'
+
 }

app/src/main/java/com/yiring/app/config/JtsModuleConfig.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.config;
+
+import com.bedatadriven.jackson.datatype.jts.JtsModule;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author Jim
+ * @version 0.1
+ * 2022/4/8 11:18
+ */
+
+@Configuration
+public class JtsModuleConfig {
+
+    @Bean
+    public JtsModule jtsModule() {
+        return new JtsModule();
+    }
+}

app/src/main/java/com/yiring/app/domain/location/LocationLog.java

@@ -67,17 +67,18 @@ public class LocationLog implements Serializable {
     BigDecimal altitude;
 
     @Comment("坐标点信息")
+    @Column(columnDefinition = "POINT")
     Point point;
 
     @Comment("信标集合")
     @Builder.Default
-    @OneToMany
+    @ManyToMany
     @ToString.Exclude
     Set<LocationBeacon> beacons = new HashSet<>(0);
 
     @Comment("围栏集合")
     @Builder.Default
-    @OneToMany
+    @ManyToMany
     @ToString.Exclude
     Set<LocationFence> fences = new HashSet<>(0);
 

app/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ env:
 spring:
   datasource:
     url: jdbc:postgresql://${env.host}:5432/kshg_app
-    username: postgres
+    username: admin
     password: 123456
   jpa:
     database-platform: com.yiring.app.config.dialect.PostgresDialect
@@ -19,8 +19,13 @@ spring:
   redis:
     database: 5
     host: ${env.host}
+  rabbitmq:
+    host: ${env.host}
+    port: 5672
+    username: admin
     password: 123456
 
+
 # knife4j
 knife4j:
   enable: true

app/src/main/resources/application.yml

@@ -8,7 +8,7 @@ spring:
     name: "kshg-api"
   profiles:
     include: auth
-    active: mock
+    active: dev
 
 # DEBUG
 debug: false