From 8b23eeffd8ca2e4a4f61f7c8cdc43f06aeae4f41 Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Thu, 25 Jan 2024 16:18:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=B8=80=E4=B8=8B=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=87=E4=B8=80=E5=93=AA=E5=A4=A9=E5=8F=88=E8=B5=B7=E4=B8=8D?=
 =?UTF-8?q?=E8=B5=B7=E6=9D=A5=E4=BA=86=20~~~?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pom.xml                                        | 38 ++++++++--------------
 .../graphiteDigesterBg/diframe/DiActiveRecord.java | 10 +++++-
 .../diframe/DiApplicationContextProvider.java      | 20 ++++++++++++
 .../graphiteDigesterBg/diframe/api/DiApiUser.java  | 17 ++++++++--
 .../diframe/model/DiMdbUser.java                   |  5 +++
 .../graphiteDigesterBg/diframe/model/MdbUser.java  |  5 ---
 src/src/main/resources/application.yml             |  8 ++---
 src/src/main/resources/device.yml                  |  2 +-
 8 files changed, 68 insertions(+), 37 deletions(-)
 create mode 100644 src/src/main/java/com/my/graphiteDigesterBg/diframe/DiApplicationContextProvider.java
 create mode 100644 src/src/main/java/com/my/graphiteDigesterBg/diframe/model/DiMdbUser.java
 delete mode 100644 src/src/main/java/com/my/graphiteDigesterBg/diframe/model/MdbUser.java

diff --git a/src/pom.xml b/src/pom.xml
index 93797ca..9dab566 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -2,12 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.1</version>
-        <relativePath/> <!-- lookup parent from repository -->
-    </parent>
+
     <groupId>com.my</groupId>
     <artifactId>graphite_digester_bg</artifactId>
     <version>0.0.1-SNAPSHOT</version>
@@ -16,28 +11,29 @@
     <properties>
         <java.version>17</java.version>
     </properties>
+
+  <parent>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>3.1.5</version>
+    <relativePath/> <!-- lookup parent from repository -->
+  </parent>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>com.fazecast</groupId>
             <artifactId>jSerialComm</artifactId>
             <version>2.6.2</version>
         </dependency>
-        <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-            <version>1.33</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.yaml</groupId>-->
+<!--            <artifactId>snakeyaml</artifactId>-->
+<!--            <version>1.33</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
@@ -48,11 +44,6 @@
             <artifactId>mybatis-spring-boot-starter</artifactId>
             <version>3.0.2</version>
         </dependency>
-        <dependency>
-            <groupId>org.flywaydb</groupId>
-            <artifactId>flyway-core</artifactId>
-            <version>9.21.0</version>
-        </dependency>
     </dependencies>
 
     <build>
@@ -63,5 +54,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>
diff --git a/src/src/main/java/com/my/graphiteDigesterBg/diframe/DiActiveRecord.java b/src/src/main/java/com/my/graphiteDigesterBg/diframe/DiActiveRecord.java
index 2f0c1e4..612e674 100644
--- a/src/src/main/java/com/my/graphiteDigesterBg/diframe/DiActiveRecord.java
+++ b/src/src/main/java/com/my/graphiteDigesterBg/diframe/DiActiveRecord.java
@@ -1,4 +1,12 @@
 package com.my.graphiteDigesterBg.diframe;
+import com.my.graphiteDigesterBg.diframe.mapper.DiActiveRecordMapper;
 abstract public class DiActiveRecord {
-
+    // find by id
+    public static void findOne(Integer id) {
+        var context = DiApplicationContextProvider.getContext();
+        DiActiveRecordMapper mapper = context.getBean(DiActiveRecordMapper.class);
+        var row = mapper.findById("di_app_users", id);
+//        // @TODO : 这里要根据配置参数计算 ~~~
+        System.out.println("DiActiveRecord.findById");
+    }
 }
diff --git a/src/src/main/java/com/my/graphiteDigesterBg/diframe/DiApplicationContextProvider.java b/src/src/main/java/com/my/graphiteDigesterBg/diframe/DiApplicationContextProvider.java
new file mode 100644
index 0000000..02bc8a9
--- /dev/null
+++ b/src/src/main/java/com/my/graphiteDigesterBg/diframe/DiApplicationContextProvider.java
@@ -0,0 +1,20 @@
+package com.my.graphiteDigesterBg.diframe;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+@Component
+public class DiApplicationContextProvider implements ApplicationContextAware {
+    // context instance
+    private static ApplicationContext applicationContext;
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        DiApplicationContextProvider.applicationContext = applicationContext;
+    }
+
+    // get context
+    public static ApplicationContext getContext() {
+        return DiApplicationContextProvider.applicationContext;
+    }
+}
diff --git a/src/src/main/java/com/my/graphiteDigesterBg/diframe/api/DiApiUser.java b/src/src/main/java/com/my/graphiteDigesterBg/diframe/api/DiApiUser.java
index 21992ca..5ec660d 100644
--- a/src/src/main/java/com/my/graphiteDigesterBg/diframe/api/DiApiUser.java
+++ b/src/src/main/java/com/my/graphiteDigesterBg/diframe/api/DiApiUser.java
@@ -1,5 +1,18 @@
 package com.my.graphiteDigesterBg.diframe.api;
-public class DiApiUser {
-    public void login() {}
+import com.my.graphiteDigesterBg.diframe.DiApiControllerBase;
+import com.my.graphiteDigesterBg.diframe.DiApiResponse;
+import com.my.graphiteDigesterBg.diframe.model.DiMdbUser;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+@Controller
+public class DiApiUser extends DiApiControllerBase {
+    @ResponseBody
+    @RequestMapping("/api/user/login")
+    public DiApiResponse login() {
+        DiMdbUser.findOne(1);
+        return this.success();
+    }
+
     public void logout() {}
 }
diff --git a/src/src/main/java/com/my/graphiteDigesterBg/diframe/model/DiMdbUser.java b/src/src/main/java/com/my/graphiteDigesterBg/diframe/model/DiMdbUser.java
new file mode 100644
index 0000000..b1c4d0a
--- /dev/null
+++ b/src/src/main/java/com/my/graphiteDigesterBg/diframe/model/DiMdbUser.java
@@ -0,0 +1,5 @@
+package com.my.graphiteDigesterBg.diframe.model;
+import com.my.graphiteDigesterBg.diframe.DiActiveRecord;
+public class DiMdbUser extends DiActiveRecord {
+
+}
diff --git a/src/src/main/java/com/my/graphiteDigesterBg/diframe/model/MdbUser.java b/src/src/main/java/com/my/graphiteDigesterBg/diframe/model/MdbUser.java
deleted file mode 100644
index f8a551b..0000000
--- a/src/src/main/java/com/my/graphiteDigesterBg/diframe/model/MdbUser.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.my.graphiteDigesterBg.diframe.model;
-import com.my.graphiteDigesterBg.diframe.DiActiveRecord;
-public class MdbUser extends DiActiveRecord {
-
-}
diff --git a/src/src/main/resources/application.yml b/src/src/main/resources/application.yml
index c7e5aad..d0910e1 100644
--- a/src/src/main/resources/application.yml
+++ b/src/src/main/resources/application.yml
@@ -1,14 +1,14 @@
 spring:
   datasource:
     url: jdbc:sqlite:D:/device.db
-    username:
-    password:
-    driver-class-name: org.sqlite.JDBC # sqlite驱动
+    username: 1
+    password: 1
+    driver-class-name: org.sqlite.JDBC
 
 device :
   connection :
     class : com.my.graphiteDigesterBg.diframe.connection.DiConSerialPort
-    path : COM7
+    path : COM11
     baudRate : 921600
     frameTimeout : 1000
     mode : binary # text | hex | binary
\ No newline at end of file
diff --git a/src/src/main/resources/device.yml b/src/src/main/resources/device.yml
index 236ecd7..2bb7baa 100644
--- a/src/src/main/resources/device.yml
+++ b/src/src/main/resources/device.yml
@@ -1,6 +1,6 @@
 connection :
   class : com.my.graphiteDigesterBg.diframe.connection.DiConSerialPort
-  path : COM7
+  path : COM11
   baudRate : 921600
   frameTimeout : 100
   callTimeout : 5000