diff --git a/slife-sys/src/main/java/com/slife/service/impl/SysDictService.java b/slife-sys/src/main/java/com/slife/service/impl/SysDictService.java index ee541cb..d71296c 100644 --- a/slife-sys/src/main/java/com/slife/service/impl/SysDictService.java +++ b/slife-sys/src/main/java/com/slife/service/impl/SysDictService.java @@ -8,8 +8,6 @@ import com.slife.dao.SysDictDao; import com.slife.entity.SysDict; import com.slife.service.ISysDictService; import lombok.extern.slf4j.Slf4j; -import org.assertj.core.util.Lists; -import org.assertj.core.util.Strings; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; @@ -45,7 +43,7 @@ public class SysDictService extends BaseService implements * @param invalid */ @Override - @Transactional(readOnly = false, rollbackFor = Exception.class) + @Transactional(rollbackFor = Exception.class) public boolean update(Long id, String dicKey, String dicValue, String type, String desc, String sort, String invalid) { SysDict sysDict = getById(id); diff --git a/slife-sys/src/main/java/com/slife/service/impl/SysUserService.java b/slife-sys/src/main/java/com/slife/service/impl/SysUserService.java index 9869e92..1fbf146 100644 --- a/slife-sys/src/main/java/com/slife/service/impl/SysUserService.java +++ b/slife-sys/src/main/java/com/slife/service/impl/SysUserService.java @@ -26,7 +26,6 @@ import java.util.Map; @Service @Transactional(readOnly = true,rollbackFor = Exception.class) //@CacheConfig(cacheNames = "cache:") -/*public class SysUserService extends BaseService*/ public class SysUserService extends BaseService implements ISysUserService { diff --git a/slife-web/src/main/java/com/slife/WebApplication.java b/slife-web/src/main/java/com/slife/WebApplication.java index 8967761..ee86419 100644 --- a/slife-web/src/main/java/com/slife/WebApplication.java +++ b/slife-web/src/main/java/com/slife/WebApplication.java @@ -9,7 +9,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @SpringBootApplication @EnableTransactionManagement -@MapperScan("com.slife.dao")//@Mapper 在mapper 接口上加入也行 public class WebApplication { public static void main(String[] args) { diff --git a/slife-web/src/main/java/com/slife/config/plus/MybatisPlusConfig.java b/slife-web/src/main/java/com/slife/config/plus/MybatisPlusConfig.java index 2e5613b..bce3ddc 100644 --- a/slife-web/src/main/java/com/slife/config/plus/MybatisPlusConfig.java +++ b/slife-web/src/main/java/com/slife/config/plus/MybatisPlusConfig.java @@ -2,12 +2,14 @@ package com.slife.config.plus; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** * @author chen */ +@MapperScan(basePackages = "com.slife") @Configuration public class MybatisPlusConfig { diff --git a/slife-web/src/main/resources/application.yml b/slife-web/src/main/resources/application.yml index 954bafd..52278a2 100644 --- a/slife-web/src/main/resources/application.yml +++ b/slife-web/src/main/resources/application.yml @@ -22,7 +22,7 @@ spring: host: localhost port: 6379 timeout: 6000ms - password: 123456 +# password: 123456 lettuce: pool: max-active: 1000 @@ -50,12 +50,10 @@ mybatis-plus: mapper-locations: classpath:mapper/*.xml typeAliasesPackage: com.slife.entity global-config: - id-type: 2 - field-strategy: 2 - auto-set-db-type: true - db-column-underline: true - refresh-mapper: true - metaObjectHandler: com.slife.config.plus.SysMetaObjectHandler + db-config: + id-type: id_worker + field-strategy: default + db-type: mysql configuration: map-underscore-to-camel-case: true cache-enabled: false