xiehuanqun пре 1 месец
родитељ
комит
dd958622d5

+ 1 - 1
.drone.yml

@@ -45,7 +45,7 @@ steps:
       - mkdir -p /app/build/target
       # 删除 libs 目录中所有的 JAR 文件
 #      - rm -rf /app/build/libs/* #(更新依赖需要打开)
-      - cp -r target/libs /app/build/libs #(有新依赖需要打开)
+#      - cp -r target/libs /app/build/libs #(有新依赖需要打开)
       # 将打包好的 Jar包 拷贝到指定目录
       - cp target/test.jar /app/build/target/test.jar
       # 将配置文件从最新的分支 拷贝到目标目录

+ 16 - 3
pom.xml

@@ -121,6 +121,19 @@
     </profiles>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+        </resources>
+
         <finalName>${finalName}</finalName>
         <plugins>
             <plugin>
@@ -162,7 +175,7 @@
                 </executions>
             </plugin>
             <!--将第三方依赖包拷贝到lib目录 (没有更新时注释)(第一次部署需要取消注释) -->
-            <plugin>
+            <!--<plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
@@ -174,11 +187,11 @@
                         </goals>
                         <configuration>
                             <outputDirectory>${project.build.directory}/libs</outputDirectory>
-                            <!--<outputDirectory>libs</outputDirectory>-->
+                            &lt;!&ndash;<outputDirectory>libs</outputDirectory>&ndash;&gt;
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin>-->
         </plugins>
     </build>
 

+ 2 - 0
src/main/java/com/example/TestApplication.java

@@ -1,9 +1,11 @@
 package com.example;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
+@MapperScan("com.example.test.mapper")
 public class TestApplication {
 
     public static void main(String[] args) {

+ 8 - 6
src/main/java/com/example/test/controller/HelloController.java → src/main/java/com/example/test/controller/UserController.java

@@ -1,6 +1,5 @@
 package com.example.test.controller;
 
-import cn.hutool.core.util.StrUtil;
 import com.example.test.entity.User;
 import com.example.test.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,15 +9,18 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 
 @RestController
-public class HelloController {
+public class UserController {
     @Autowired
     private UserService userService;
+
     @GetMapping("/")
     public List<User> hello() {
-        String name = "test";
-        if(StrUtil.isNotEmpty(name)){
-            System.out.println("name is not empty");
-        }
         return userService.list();
     }
+
+    @GetMapping("/user")
+    public List<User> getUser() {
+        System.out.println("查询成功!");
+        return userService.getUserByNickname("建");
+    }
 }

+ 0 - 9
src/main/java/com/example/test/dao/UserDao.java

@@ -1,9 +0,0 @@
-package com.example.test.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.example.test.entity.User;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface UserDao extends BaseMapper<User> {
-}

+ 11 - 0
src/main/java/com/example/test/mapper/UserMapper.java

@@ -0,0 +1,11 @@
+package com.example.test.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.test.entity.User;
+
+import java.util.List;
+
+public interface UserMapper extends BaseMapper<User> {
+    //自定义查询
+    List<User> selectUserByNickname(String nickname);
+}

+ 11 - 0
src/main/java/com/example/test/mapper/xml/UserMapper.xml

@@ -0,0 +1,11 @@
+<?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.test.mapper.UserMapper">
+
+    <select id="selectUserByNickname" resultType="com.example.test.entity.User">
+            SELECT *
+            FROM user
+            WHERE nickname LIKE CONCAT('%', #{nickname}, '%')
+    </select>
+
+</mapper>

+ 4 - 0
src/main/java/com/example/test/service/UserService.java

@@ -3,5 +3,9 @@ package com.example.test.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.example.test.entity.User;
 
+import java.util.List;
+
 public interface UserService extends IService<User> {
+    //自定义业务方法
+    List<User> getUserByNickname(String nickname);
 }

+ 8 - 2
src/main/java/com/example/test/service/impl/UserServiceImpl.java

@@ -1,11 +1,17 @@
 package com.example.test.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.example.test.dao.UserDao;
+import com.example.test.mapper.UserMapper;
 import com.example.test.entity.User;
 import com.example.test.service.UserService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
-public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserService {
+public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
+    @Override
+    public List<User> getUserByNickname(String nickname) {
+        return baseMapper.selectUserByNickname(nickname);
+    }
 }

+ 1 - 1
src/main/resources/application.yml

@@ -68,7 +68,7 @@ mybatis-plus:
   global-config:
     banner: off
   mapper-locations:
-    - classpath:com/example/mapper/*.xml
+    - classpath:com/example/test/mapper/xml/*.xml
     - classpath:mapper/**/*.xml
 
 # JVM