diff --git a/common-config/pom.xml b/common-config/pom.xml
index c2f845ea6a4b9c55479834047e2752c979f61998..925b71a6265f1dda1a05ecbb9459ccc22a81001b 100644
--- a/common-config/pom.xml
+++ b/common-config/pom.xml
@@ -16,5 +16,10 @@
org.springframework.boot
spring-boot-starter-web
+
+ org.projectlombok
+ lombok
+ 1.18.4
+
\ No newline at end of file
diff --git a/common-config/src/main/resources/application.yml b/common-config/src/main/resources/application.yml
index 2c83e742f95905a937f835d447896cf36470cdee..651d4bdad7094d63b43edf0cecfccfbb74f2081c 100644
--- a/common-config/src/main/resources/application.yml
+++ b/common-config/src/main/resources/application.yml
@@ -22,7 +22,4 @@ spring:
enabled: true
main:
allow-bean-definition-overriding: true
- banner-mode: console
-#logging:
-# level:
-# org.springframework.web: trace # TRACE DEBUG INFO WARN ERROR FATAL OFF
\ No newline at end of file
+ banner-mode: console
\ No newline at end of file
diff --git a/common-config/src/main/resources/logback-spring.xml b/common-config/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e9f3901ddb6d28c5b26e723ed9068b81aa4d135d
--- /dev/null
+++ b/common-config/src/main/resources/logback-spring.xml
@@ -0,0 +1,75 @@
+
+
+
+
+
+ mms
+
+
+
+
+
+
+
+
+
+ %-4relative [%thread] %-5level %logger{35} - %msg %n
+
+
+
+
+
+
+
+
+
+
+
+ logFile.%d{yyyy-MM-dd}.log
+ 30
+
+
+ %-4relative [%thread] %-5level %logger{35} - %msg%n
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/common-config/src/main/resources/note.txt b/common-config/src/main/resources/note.txt
index 5ae22cce3922d2e8965e08e35fc47bd537ffa9db..707c628709b3191090f04c4a381b551e32f3c1a4 100644
--- a/common-config/src/main/resources/note.txt
+++ b/common-config/src/main/resources/note.txt
@@ -32,4 +32,15 @@
${spring-boot.formatted-version}：v2.2.10.RELEASE
${Ansi.NAME}/${AnsiColor.NAME}/${AnsiBackground.NAME}/${AnsiStyle.NAME}: AnsiPropertySource
${application.title}：jar解压后的目录(META-INF/MANIFEST.MF)文件中的Implementation-Title这个值
- 5、使用spring.main.banner-mode指定打印的位置,System.out(console)、log、off
\ No newline at end of file
+ 5、使用spring.main.banner-mode指定打印的位置,System.out(console)、log、off
+四、日志
+ 1、SpringBoot默认使用SL4J+Logback的方式记录日志
+ 2、SL4J全称是Simple Loging Facade For Java，是一个为java程序提供日志输出的统一接口，并不是一个具体的日志实现方案,
+ 它只是定义了一系列的接口，所以它单独是不能工作的，需要搭配具体的日志实现方案才能工作
+ 3、常见的实现方案:
+ sl4j-log4j12-x.x.x.jar是使用org.apache.log4j.Logger提供的实现
+ sl4j-jdk14-x.x.x.jar是使用java.util.logging提供的实现
+ sl4j-simple-x.x.x.jar是使用的System.err的实现
+ sl4-jcl-x.x.x.jar是使用的commons-logging提供的实现
+ logback-classic-x.x.x.jar是使用的logback的实现
+ 4、ERROR, WARN, INFO, DEBUG, or TRACE日志级别
\ No newline at end of file
diff --git a/integrate-mybatis/src/main/java/com/pannk/demo/controller/SysUserController.java b/integrate-mybatis/src/main/java/com/pannk/demo/controller/SysUserController.java
index 59d4be02280b06f2bc074e9b89918b0d277c0304..02fc4d793f39662007180b8cb862a11fdef06bc7 100644
--- a/integrate-mybatis/src/main/java/com/pannk/demo/controller/SysUserController.java
+++ b/integrate-mybatis/src/main/java/com/pannk/demo/controller/SysUserController.java
@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Map;
/**
* Created by wolf on 20-11-9.
@@ -27,6 +28,16 @@ public class SysUserController {
return Result.success(sysUserService.list());
}
+ @GetMapping("/listByName")
+ public Result listByName(String userName) {
+ return Result.success(sysUserService.listByName(userName));
+ }
+
+ @GetMapping("/listByCond")
+ public Result listByName(@RequestBody Map cond) {
+ return Result.success(sysUserService.listByCond(cond));
+ }
+
/**
* @param sysUserEntity
* @return
@@ -37,6 +48,8 @@ public class SysUserController {
return Result.success(sysUserEntity);
}
+
+
/**
* 更新
*
diff --git a/integrate-mybatis/src/main/java/com/pannk/demo/mapper/SysUserMapper.java b/integrate-mybatis/src/main/java/com/pannk/demo/mapper/SysUserMapper.java
index bfc5a3c521909b3dd171e91dae7b79af32f06d67..76756c5021cfae974b75c332daaaf19c01a9152c 100644
--- a/integrate-mybatis/src/main/java/com/pannk/demo/mapper/SysUserMapper.java
+++ b/integrate-mybatis/src/main/java/com/pannk/demo/mapper/SysUserMapper.java
@@ -1,10 +1,10 @@
package com.pannk.demo.mapper;
import com.pannk.demo.entity.SysUserEntity;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.*;
import java.util.List;
+import java.util.Map;
/**
* Created by wolf on 20-11-9.
@@ -50,7 +50,25 @@ public interface SysUserMapper {
/**
* 毗邻删除
+ *
* @param ids
*/
void batchDelete(List ids);
+
+ /**
+ * 以用户名查询
+ *
+ * @param userName
+ * @return
+ */
+ @Select("select * from sys_user where user_name=#{userName,jdbcType=VARCHAR}")
+ List selectByName(String userName);
+
+ /**
+ * 条件查询
+ *
+ * @param map
+ * @return
+ */
+ List selectByCond(Map map);
}
diff --git a/integrate-mybatis/src/main/java/com/pannk/demo/service/SysUserService.java b/integrate-mybatis/src/main/java/com/pannk/demo/service/SysUserService.java
index 16282229d934e21a395c0c5480fd5b71fcc53867..b5a433cfee468ab3949db84e27c3e3b646691743 100644
--- a/integrate-mybatis/src/main/java/com/pannk/demo/service/SysUserService.java
+++ b/integrate-mybatis/src/main/java/com/pannk/demo/service/SysUserService.java
@@ -4,6 +4,7 @@ import com.pannk.demo.controller.Page;
import com.pannk.demo.entity.SysUserEntity;
import java.util.List;
+import java.util.Map;
/**
* Created by wolf on 20-11-9.
@@ -50,7 +51,24 @@ public interface SysUserService {
/**
* 批量删除
+ *
* @param ids
*/
void batchDelete(List ids);
+
+ /**
+ * 查询用户
+ *
+ * @param userName
+ * @return
+ */
+ List listByName(String userName);
+
+ /**
+ * 条件查询
+ *
+ * @param cond
+ * @return
+ */
+ List listByCond(Map cond);
}
diff --git a/integrate-mybatis/src/main/java/com/pannk/demo/service/impl/SysUserServiceImpl.java b/integrate-mybatis/src/main/java/com/pannk/demo/service/impl/SysUserServiceImpl.java
index 573cc892b00a922c646ee22981c79ece29ec3da8..24983b3c1b41e680494cc92639b76f1d1936a282 100644
--- a/integrate-mybatis/src/main/java/com/pannk/demo/service/impl/SysUserServiceImpl.java
+++ b/integrate-mybatis/src/main/java/com/pannk/demo/service/impl/SysUserServiceImpl.java
@@ -9,6 +9,7 @@ import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* Created by wolf on 20-11-9.
@@ -46,8 +47,8 @@ public class SysUserServiceImpl implements SysUserService {
@Override
public Page page(Page page) {
- int limit =(page.getCurrPage()-1)*page.getPageSize()+1;
- List list = sysUserMapper.page(limit,page.getPageSize());
+ int limit = (page.getCurrPage() - 1) * page.getPageSize();
+ List list = sysUserMapper.page(limit, page.getPageSize());
int total = sysUserMapper.count();
page.setList(list);
page.setTotal(total);
@@ -58,4 +59,14 @@ public class SysUserServiceImpl implements SysUserService {
public void batchDelete(List ids) {
sysUserMapper.batchDelete(ids);
}
+
+ @Override
+ public List listByName(String userName) {
+ return sysUserMapper.selectByName(userName);
+ }
+
+ @Override
+ public List listByCond(Map cond) {
+ return sysUserMapper.selectByCond(cond);
+ }
}
diff --git a/integrate-mybatis/src/main/resources/mapper/SysUserMapper.xml b/integrate-mybatis/src/main/resources/mapper/SysUserMapper.xml
index f6d74d36efdbe8decd945cda7ed8dd5a7a1d46d1..f60e063ac1afc3246151c4cdcecdbb62f1f9e1ab 100644
--- a/integrate-mybatis/src/main/resources/mapper/SysUserMapper.xml
+++ b/integrate-mybatis/src/main/resources/mapper/SysUserMapper.xml
@@ -1,7 +1,15 @@
-
+
+
+
+
+
+
+
+
+
INSERT INTO sys_user (user_name,password,code,create_date,create_id)
VALUES
(
@@ -34,4 +42,15 @@
UPDATE sys_user SET user_name=#{userName,jdbcType=VARCHAR},password=#{password,jdbcType=VARCHAR}
WHERE id=#{id,jdbcType=NUMERIC}
+
\ No newline at end of file