From b40ac12d6231f261581fb4281c905819530e934d Mon Sep 17 00:00:00 2001
From: whyclxw <http://whyclxw@118.89.139.230:10101/r/~whyclxw/IdeaTest.git>
Date: 星期四, 15 四月 2021 15:40:03 +0800
Subject: [PATCH] 提交

---
 SpringBootF_1.iml                                                       |   10 +-
 .idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_1_2.xml |   13 ++++
 src/main/java/com/example/lxw/service/User_infService.java              |   11 +++
 src/main/resources/mapper/User_infMapper.xml                            |   19 ++++++
 src/test/java/com/example/lxw/MpperTest.java                            |   12 +--
 pom.xml                                                                 |    6 +-
 target/classes/com/example/lxw/pojo/User_inf.class                      |    0 
 /dev/null                                                               |   13 ----
 target/test-classes/com/example/lxw/MpperTest.class                     |    0 
 .idea/vcs.xml                                                           |    6 ++
 src/main/java/com/example/lxw/mapper/User_InfMapper.java                |    2 
 .idea/libraries/Maven__org_mybatis_mybatis_3_5_1.xml                    |   13 ++++
 target/classes/application.yml                                          |    6 +-
 .idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_1.xml             |   13 ++++
 src/main/java/com/example/lxw/pojo/User_inf.java                        |   14 ++++
 .idea/libraries/Maven__com_baomidou_mybatis_plus_3_1_2.xml              |   13 ++++
 .idea/compiler.xml                                                      |    3 +
 src/main/java/com/example/lxw/controller/User_infController.java        |    8 ++
 src/main/resources/application.yml                                      |    6 +-
 19 files changed, 130 insertions(+), 38 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 7b4736c..2573357 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -7,16 +7,19 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
+        <module name="springboot-mybatisplus" />
         <module name="SpringBootF_1" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
+      <module name="springboot-mybatisplus" target="1.8" />
       <module name="SpringBootF_1" target="1.8" />
     </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
       <module name="SpringBootF_1" options="-parameters" />
+      <module name="springboot-mybatisplus" options="-parameters" />
     </option>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_1_2.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_1_2.xml
new file mode 100644
index 0000000..55a50bc
--- /dev/null
+++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.baomidou:mybatis-plus:3.1.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/apache-maven-3.6.3/maven_jar/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/apache-maven-3.6.3/maven_jar/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/apache-maven-3.6.3/maven_jar/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_1_2.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_1_2.xml
new file mode 100644
index 0000000..12940f3
--- /dev/null
+++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.baomidou:mybatis-plus-boot-starter:3.1.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/apache-maven-3.6.3/maven_jar/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/apache-maven-3.6.3/maven_jar/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/apache-maven-3.6.3/maven_jar/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_3_5_1.xml b/.idea/libraries/Maven__org_mybatis_mybatis_3_5_1.xml
new file mode 100644
index 0000000..f28a7b2
--- /dev/null
+++ b/.idea/libraries/Maven__org_mybatis_mybatis_3_5_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mybatis:mybatis:3.5.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/apache-maven-3.6.3/maven_jar/org/mybatis/mybatis/3.5.1/mybatis-3.5.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/apache-maven-3.6.3/maven_jar/org/mybatis/mybatis/3.5.1/mybatis-3.5.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/apache-maven-3.6.3/maven_jar/org/mybatis/mybatis/3.5.1/mybatis-3.5.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_3_5_6.xml b/.idea/libraries/Maven__org_mybatis_mybatis_3_5_6.xml
deleted file mode 100644
index 4e56fc5..0000000
--- a/.idea/libraries/Maven__org_mybatis_mybatis_3_5_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mybatis:mybatis:3.5.6">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/../../maven/apache-maven-3.6.3/maven_jar/org/mybatis/mybatis/3.5.6/mybatis-3.5.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../maven/apache-maven-3.6.3/maven_jar/org/mybatis/mybatis/3.5.6/mybatis-3.5.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../maven/apache-maven-3.6.3/maven_jar/org/mybatis/mybatis/3.5.6/mybatis-3.5.6-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_1.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_1.xml
new file mode 100644
index 0000000..e103960
--- /dev/null
+++ b/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mybatis:mybatis-spring:2.0.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/apache-maven-3.6.3/maven_jar/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/apache-maven-3.6.3/maven_jar/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/apache-maven-3.6.3/maven_jar/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml
deleted file mode 100644
index 48887b3..0000000
--- a/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mybatis:mybatis-spring:2.0.6">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/../../maven/apache-maven-3.6.3/maven_jar/org/mybatis/mybatis-spring/2.0.6/mybatis-spring-2.0.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../maven/apache-maven-3.6.3/maven_jar/org/mybatis/mybatis-spring/2.0.6/mybatis-spring-2.0.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../maven/apache-maven-3.6.3/maven_jar/org/mybatis/mybatis-spring/2.0.6/mybatis-spring-2.0.6-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_4.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_4.xml
deleted file mode 100644
index ddf7377..0000000
--- a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.4">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/../../maven/apache-maven-3.6.3/maven_jar/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/2.1.4/mybatis-spring-boot-autoconfigure-2.1.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../maven/apache-maven-3.6.3/maven_jar/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/2.1.4/mybatis-spring-boot-autoconfigure-2.1.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../maven/apache-maven-3.6.3/maven_jar/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/2.1.4/mybatis-spring-boot-autoconfigure-2.1.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_4.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_4.xml
deleted file mode 100644
index f4689d3..0000000
--- a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.4">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/../../maven/apache-maven-3.6.3/maven_jar/org/mybatis/spring/boot/mybatis-spring-boot-starter/2.1.4/mybatis-spring-boot-starter-2.1.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../maven/apache-maven-3.6.3/maven_jar/org/mybatis/spring/boot/mybatis-spring-boot-starter/2.1.4/mybatis-spring-boot-starter-2.1.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../maven/apache-maven-3.6.3/maven_jar/org/mybatis/spring/boot/mybatis-spring-boot-starter/2.1.4/mybatis-spring-boot-starter-2.1.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/SpringBootF_1.iml b/SpringBootF_1.iml
index 611466c..fb4a352 100644
--- a/SpringBootF_1.iml
+++ b/SpringBootF_1.iml
@@ -28,7 +28,6 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:2.1.12.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.12.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.12.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.12.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
@@ -65,19 +64,20 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.13.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.13.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.13.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.4" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.12.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.12.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.13.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.13.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.4" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.6" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.19" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.1.2" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.1.2" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.1.2" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.10" level="project" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.12.RELEASE" level="project" />
diff --git a/pom.xml b/pom.xml
index cee49a4..d9986bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,9 +30,9 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>2.1.4</version>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.1.2</version>
         </dependency>
         <!--<dependency>
             <groupId>org.thymeleaf.extras</groupId>
diff --git a/src/main/java/com/example/lxw/controller/User_infController.java b/src/main/java/com/example/lxw/controller/User_infController.java
index 8c57c27..7e3cefc 100644
--- a/src/main/java/com/example/lxw/controller/User_infController.java
+++ b/src/main/java/com/example/lxw/controller/User_infController.java
@@ -24,8 +24,12 @@
     @ApiOperation(value = "鏌ヨ鎵�鏈夌殑鐢ㄦ埛")
     public ServiceModel selectList(){
         ServiceModel model=user_infService.selectList();
-        /*model.setData(1);
-        model.setData("鏌ヨ鎴愬姛");*/
+        return model;
+    }
+    @PutMapping("searchByBaojiUsr")
+    @ApiOperation(value = "鏌ヨ鎵�鏈夌敤鎴风殑鍖呮満缁勪俊鎭�")
+    public ServiceModel searchByBaojiUsr(){
+        ServiceModel model=user_infService.searchByBaojiUsr();
         return model;
     }
 
diff --git a/src/main/java/com/example/lxw/mapper/User_InfMapper.java b/src/main/java/com/example/lxw/mapper/User_InfMapper.java
index 47084c6..a7b4695 100644
--- a/src/main/java/com/example/lxw/mapper/User_InfMapper.java
+++ b/src/main/java/com/example/lxw/mapper/User_InfMapper.java
@@ -18,5 +18,5 @@
      * 杩斿洖鎵�鏈夌殑鐢ㄦ埛
      * @return
      */
-//    public List<User_inf> searchAll();
+    public List<User_inf> searchByBaojiUsr();
 }
diff --git a/src/main/java/com/example/lxw/pojo/User_inf.java b/src/main/java/com/example/lxw/pojo/User_inf.java
index ce399d3..32a650d 100644
--- a/src/main/java/com/example/lxw/pojo/User_inf.java
+++ b/src/main/java/com/example/lxw/pojo/User_inf.java
@@ -1,10 +1,14 @@
 package com.example.lxw.pojo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
+
+import java.io.Serializable;
 
 /**
  * @author lxw
@@ -15,7 +19,8 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @TableName(schema = "db_user",value = "tb_user_inf")
-public class User_inf {
+public class User_inf implements Serializable {
+    @TableId(value = "uId")
     private long uId;
     private String uSnId;
     private String uName;
@@ -39,7 +44,14 @@
     private String upassword;
     private String uPubKeyX;
     private String uPubKeyY;
+    @TableField(value = "uKey_ID")
     private String uKeyId;
+    @TableField(value = "face_id")
     private long faceId;
     private String license;
+    @TableField(exist = false)
+    private String note;
+    @TableField(exist = false)
+    private UserBattgroupBaojigroupUsr baojigroupUsr;
+
 }
diff --git a/src/main/java/com/example/lxw/service/User_infService.java b/src/main/java/com/example/lxw/service/User_infService.java
index d9d77bd..50d547b 100644
--- a/src/main/java/com/example/lxw/service/User_infService.java
+++ b/src/main/java/com/example/lxw/service/User_infService.java
@@ -30,4 +30,15 @@
         model.setData(list);
         return model;
     }
+    /**
+     * 鏌ヨ鎵�鏈夌敤鎴风殑鍖呮満缁勪俊鎭�
+     * */
+    public  ServiceModel searchByBaojiUsr(){
+        List<User_inf> list=user_infMapper.searchByBaojiUsr();
+        ServiceModel model=new ServiceModel();
+        model.setCode(1);
+        model.setData(list);
+        return model;
+    }
+
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 993bd63..2463cd3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -33,16 +33,16 @@
       #涓婚敭绫诲瀷  0:"鏁版嵁搴揑D鑷", 1:"鐢ㄦ埛杈撳叆ID",2:"鍏ㄥ眬鍞竴ID (鏁板瓧绫诲瀷鍞竴ID)", 3:"鍏ㄥ眬鍞竴ID UUID";
       id-type: AUTO
       #椹煎嘲涓嬪垝绾胯浆鎹�
-      table-underline: true
+      table-underline: false
       #鏁版嵁搴撳ぇ鍐欎笅鍒掔嚎杞崲
-      capital-mode: true
+      capital-mode: false
       #mp2.3+ 鍏ㄥ眬琛ㄥ墠缂� tb_
       table-prefix: tb_
       #鍒锋柊mapper 璋冭瘯绁炲櫒
   # refresh-mapper: true
   configuration:
     #閰嶇疆杩斿洖鏁版嵁搴�(column涓嬪垝绾垮懡鍚�&&杩斿洖java瀹炰綋鏄┘宄板懡鍚�)锛岃嚜鍔ㄥ尮閰嶆棤闇�as锛堟病寮�鍚繖涓紝SQL闇�瑕佸啓as锛� select user_id as userId锛�
-    map-underscore-to-camel-case: true
+    map-underscore-to-camel-case: false
     cache-enabled: false
     #mybatis鏃ュ織杈撳嚭
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
diff --git a/src/main/resources/mapper/User_infMapper.xml b/src/main/resources/mapper/User_infMapper.xml
new file mode 100644
index 0000000..c2651c3
--- /dev/null
+++ b/src/main/resources/mapper/User_infMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.lxw.mapper.User_InfMapper" >
+
+    <resultMap id="baojiUserMap" type="User_inf">
+        <result column="uSnId" property="uSnId" />
+        <result column="uName" property="uName" />
+        <association property="UserBattgroupBaojigroupUsr">
+            <result property="baojiGroupId" column="baojiGroupId"/>
+        </association>
+    </resultMap>
+
+    <select id="searchByBaojiUsr" resultMap="baojiUserMap">
+        SELECT tb_user_inf.*,tb_user_battgroup_baojigroup_usr.baoji_group_id
+        from tb_user_inf
+        LEFT JOIN tb_user_battgroup_baojigroup_usr ON tb_user_inf.uId=tb_user_battgroup_baojigroup_usr.uId
+        order by tb_user_inf.uid
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/src/test/java/com/example/lxw/MpperTest.java b/src/test/java/com/example/lxw/MpperTest.java
index a2f7248..e55c807 100644
--- a/src/test/java/com/example/lxw/MpperTest.java
+++ b/src/test/java/com/example/lxw/MpperTest.java
@@ -6,26 +6,24 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.SpringApplication;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
  * @author lxw
  * @create 2021-04-14 10:20
  */
-@SpringBootTest
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class MpperTest {
-    @Resource
-    private User_InfMapper mapper;
+   @Autowired
+    private User_InfMapper user_infMapper;
 
     @Test
     public void searchAll(){
-        List<User_inf> list= mapper.selectList(new QueryWrapper<>());
+        List<User_inf> list= user_infMapper.selectList(new QueryWrapper<>());
         list.forEach(uinf-> System.out.println(uinf.toString()));
     }
     @Test
diff --git a/target/classes/application.yml b/target/classes/application.yml
index 993bd63..2463cd3 100644
--- a/target/classes/application.yml
+++ b/target/classes/application.yml
@@ -33,16 +33,16 @@
       #涓婚敭绫诲瀷  0:"鏁版嵁搴揑D鑷", 1:"鐢ㄦ埛杈撳叆ID",2:"鍏ㄥ眬鍞竴ID (鏁板瓧绫诲瀷鍞竴ID)", 3:"鍏ㄥ眬鍞竴ID UUID";
       id-type: AUTO
       #椹煎嘲涓嬪垝绾胯浆鎹�
-      table-underline: true
+      table-underline: false
       #鏁版嵁搴撳ぇ鍐欎笅鍒掔嚎杞崲
-      capital-mode: true
+      capital-mode: false
       #mp2.3+ 鍏ㄥ眬琛ㄥ墠缂� tb_
       table-prefix: tb_
       #鍒锋柊mapper 璋冭瘯绁炲櫒
   # refresh-mapper: true
   configuration:
     #閰嶇疆杩斿洖鏁版嵁搴�(column涓嬪垝绾垮懡鍚�&&杩斿洖java瀹炰綋鏄┘宄板懡鍚�)锛岃嚜鍔ㄥ尮閰嶆棤闇�as锛堟病寮�鍚繖涓紝SQL闇�瑕佸啓as锛� select user_id as userId锛�
-    map-underscore-to-camel-case: true
+    map-underscore-to-camel-case: false
     cache-enabled: false
     #mybatis鏃ュ織杈撳嚭
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
diff --git a/target/classes/com/example/lxw/pojo/User_inf.class b/target/classes/com/example/lxw/pojo/User_inf.class
index 24f6977..b857c12 100644
--- a/target/classes/com/example/lxw/pojo/User_inf.class
+++ b/target/classes/com/example/lxw/pojo/User_inf.class
Binary files differ
diff --git a/target/test-classes/com/example/lxw/MpperTest.class b/target/test-classes/com/example/lxw/MpperTest.class
index 415da3a..f3169e2 100644
--- a/target/test-classes/com/example/lxw/MpperTest.class
+++ b/target/test-classes/com/example/lxw/MpperTest.class
Binary files differ

--
Gitblit v1.9.1