feat: 合并 basic-api 最新代码

app/build.gradle

@@ -24,6 +24,7 @@ dependencies {
 
 	implementation project(":basic-common:core")
 	implementation project(":basic-common:util")
+
 	implementation project(":app-push")
 
 	// Optional: Redis

app/src/main/java/com/yiring/app/Application.java

 /* (C) 2021 YiRing, Inc. */
 package com.yiring.app;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
-@MapperScan(basePackages = Application.BASE_PACKAGES + ".app.mapper")
 @EnableJpaRepositories(basePackages = Application.BASE_PACKAGES)
 @EntityScan(
     basePackageClasses = { Application.class, Jsr310JpaConverters.class },

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

@@ -94,7 +94,7 @@ public class GlobalExceptionHandler {
      * 失败状态异常
      */
     @ExceptionHandler(value = FailStatusException.class)
-    public Result<String> customCodeExceptionHandler(FailStatusException e) {
+    public Result<String> failStatusExceptionHandler(FailStatusException e) {
         return Result.no(e.getStatus());
     }
 

app/src/main/java/com/yiring/app/rabbitmq/zy/ZyRabbitmqReceiver.java

@@ -63,23 +63,14 @@ public class ZyRabbitmqReceiver {
             String method = info.getString("method");
             switch (method) {
                 // 实时定位
-                case "position":
-                    processPositionMessage(data);
-                    break;
+                case "position" -> processPositionMessage(data);
                 // 设备低电量
-                case "lowPower":
-                    processLowPowerMessage(data);
-                    break;
+                case "lowPower" -> processLowPowerMessage(data);
                 // 设备状态变更
-                case "deviceStatus":
-                    processDeviceStatusMessage(data);
-                    break;
+                case "deviceStatus" -> processDeviceStatusMessage(data);
                 // 按键报警
-                case "keyWarning":
-                    processKeyWarningMessage(data);
-                    break;
-                default:
-                    log.warn("Unknown Message Type: {}", info);
+                case "keyWarning" -> processKeyWarningMessage(data);
+                default -> log.warn("Unknown Message Type: {}", info);
             }
         } catch (Exception e) {
             log.error(e.getMessage(), e);

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

@@ -16,6 +16,7 @@ spring:
     properties:
       hibernate:
         format_sql: true
+        types.print.banner: false
   h2:
     console:
       enabled: true

app/src/main/resources/application.yml

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