Merge remote-tracking branch 'origin/dev' into dev

dev
luotaiqian 2026-07-03 11:25:09 +08:00
commit 56a4f00d4d
1 changed files with 29 additions and 29 deletions

View File

@ -1,29 +1,29 @@
package org.qinan.safetyeval.infrastructure.config;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.jjb.saas.framework.auth.properties.ServerProperties;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* MyBatis Plus
*
* @author safety-eval
*/
@Configuration
@MapperScan({"org.qinan.safetyeval.infrastructure.mapper"
, "org.qinan.safetyeval.infrastructure.persistence.mapper"})
@EnableConfigurationProperties(ServerProperties.class)
public class MybatisPlusConfig {
@Bean
public MybatisPlusInterceptor mybatisPlusInterceptor() {
MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
return interceptor;
}
}
//package org.qinan.safetyeval.infrastructure.config;
//
//import com.baomidou.mybatisplus.annotation.DbType;
//import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
//import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
//import com.jjb.saas.framework.auth.properties.ServerProperties;
//import org.mybatis.spring.annotation.MapperScan;
//import org.springframework.boot.context.properties.EnableConfigurationProperties;
//import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.Configuration;
//
///**
// * MyBatis Plus配置
// *
// * @author safety-eval
// */
//@Configuration
//@MapperScan({"org.qinan.safetyeval.infrastructure.mapper"
//, "org.qinan.safetyeval.infrastructure.persistence.mapper"})
//@EnableConfigurationProperties(ServerProperties.class)
//public class MybatisPlusConfig {
//
// @Bean
// public MybatisPlusInterceptor mybatisPlusInterceptor() {
// MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
// interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
// return interceptor;
// }
//}