diff --git a/core/security/pom.xml b/core/security/pom.xml index 01a0a785..7ac6c96c 100644 --- a/core/security/pom.xml +++ b/core/security/pom.xml @@ -26,11 +26,11 @@ spring-boot-starter-security ${spring-boot.version} - - com.baomidou - mybatis-plus-boot-starter - 3.5.5 - + + + + + org.springframework.boot spring-boot-starter-data-redis diff --git a/tao-api/pom.xml b/tao-api/pom.xml index 8fded48d..4b8cca61 100644 --- a/tao-api/pom.xml +++ b/tao-api/pom.xml @@ -93,11 +93,36 @@ + + + + + + + + + + + + com.baomidou - mybatis-plus-boot-starter - 3.5.5 + mybatis-plus-spring-boot3-starter + + + org.mybatis + mybatis-spring + + + 3.5.4 + + + org.mybatis + mybatis-spring + 3.0.3 + + org.apache.commons commons-lang3 diff --git a/tao-api/src/main/java/com/qihang/tao/TaoApi.java b/tao-api/src/main/java/com/qihang/tao/TaoApi.java index 605a00ea..2163c831 100644 --- a/tao-api/src/main/java/com/qihang/tao/TaoApi.java +++ b/tao-api/src/main/java/com/qihang/tao/TaoApi.java @@ -13,9 +13,10 @@ import org.springframework.context.annotation.ComponentScan; * */ //@EnableWebSecurity -@MapperScan("com.qihang.tao.mapper") + @EnableDiscoveryClient @ComponentScan(basePackages={"com.qihang"}) +@MapperScan("com.qihang.tao.mapper") @SpringBootApplication public class TaoApi { diff --git a/tao-api/src/main/java/com/qihang/tao/config/DataSourceConfig.java b/tao-api/src/main/java/com/qihang/tao/config/DataSourceConfig.java index dc611e1a..32b80379 100644 --- a/tao-api/src/main/java/com/qihang/tao/config/DataSourceConfig.java +++ b/tao-api/src/main/java/com/qihang/tao/config/DataSourceConfig.java @@ -1,25 +1,25 @@ -package com.qihang.tao.config; - -import com.zaxxer.hikari.HikariDataSource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.env.Environment; - -import javax.sql.DataSource; -@Configuration -public class DataSourceConfig { - @Autowired - private Environment env; - - @Bean - public DataSource dataSource() { - HikariDataSource dataSource = new HikariDataSource(); - dataSource.setDriverClassName(env.getProperty("spring.datasource.driver-class-name")); - dataSource.setJdbcUrl(env.getProperty("spring.datasource.url")); - dataSource.setUsername(env.getProperty("spring.datasource.username")); - dataSource.setPassword(env.getProperty("spring.datasource.password")); - return dataSource; - } -} +//package com.qihang.tao.config; +// +//import com.zaxxer.hikari.HikariDataSource; +// +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +//import org.springframework.core.env.Environment; +// +//import javax.sql.DataSource; +//@Configuration +//public class DataSourceConfig { +// @Autowired +// private Environment env; +// +// @Bean +// public DataSource dataSource() { +// HikariDataSource dataSource = new HikariDataSource(); +// dataSource.setDriverClassName(env.getProperty("spring.datasource.driver-class-name")); +// dataSource.setJdbcUrl(env.getProperty("spring.datasource.url")); +// dataSource.setUsername(env.getProperty("spring.datasource.username")); +// dataSource.setPassword(env.getProperty("spring.datasource.password")); +// return dataSource; +// } +//} diff --git a/tao-api/src/main/java/com/qihang/tao/config/MyBatisConfig.java b/tao-api/src/main/java/com/qihang/tao/config/MyBatisConfig.java index 4f708ee5..f2ba63cf 100644 --- a/tao-api/src/main/java/com/qihang/tao/config/MyBatisConfig.java +++ b/tao-api/src/main/java/com/qihang/tao/config/MyBatisConfig.java @@ -1,33 +1,33 @@ -package com.qihang.tao.config; - -import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionFactoryBean; -import org.mybatis.spring.SqlSessionTemplate; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import javax.sql.DataSource; - -@Configuration -@MapperScan("com.qihang.tao.mapper") -public class MyBatisConfig { - - @Autowired - private DataSource dataSource; - - @Bean - public SqlSessionFactory sqlSessionFactory() throws Exception { - SqlSessionFactoryBean factoryBean = new SqlSessionFactoryBean(); - factoryBean.setDataSource(dataSource); - return factoryBean.getObject(); - } - - @Bean - public SqlSessionTemplate sqlSessionTemplate(SqlSessionFactory sqlSessionFactory) { - return new SqlSessionTemplate(sqlSessionFactory); - } - - -} +//package com.qihang.tao.config; +// +//import org.apache.ibatis.session.SqlSessionFactory; +//import org.mybatis.spring.SqlSessionFactoryBean; +//import org.mybatis.spring.SqlSessionTemplate; +//import org.mybatis.spring.annotation.MapperScan; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +// +//import javax.sql.DataSource; +// +//@Configuration +//@MapperScan("com.qihang.tao.mapper") +//public class MyBatisConfig { +// +// @Autowired +// private DataSource dataSource; +// +// @Bean +// public SqlSessionFactory sqlSessionFactory() throws Exception { +// SqlSessionFactoryBean factoryBean = new SqlSessionFactoryBean(); +// factoryBean.setDataSource(dataSource); +// return factoryBean.getObject(); +// } +// +// @Bean +// public SqlSessionTemplate sqlSessionTemplate(SqlSessionFactory sqlSessionFactory) { +// return new SqlSessionTemplate(sqlSessionFactory); +// } +// +// +//} diff --git a/tao-api/src/main/java/com/qihang/tao/config/MybatisPlusAutoConfiguration.java b/tao-api/src/main/java/com/qihang/tao/config/MybatisPlusAutoConfiguration.java new file mode 100644 index 00000000..0769c878 --- /dev/null +++ b/tao-api/src/main/java/com/qihang/tao/config/MybatisPlusAutoConfiguration.java @@ -0,0 +1,83 @@ +//package com.qihang.tao.config; +// +//import com.baomidou.mybatisplus.autoconfigure.SpringBootVFS; +//import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; +//import org.apache.ibatis.session.SqlSessionFactory; +//import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +//import org.springframework.context.annotation.Bean; +//import org.springframework.util.ObjectUtils; +//import org.springframework.util.StringUtils; +// +//import javax.sql.DataSource; +// +//public class MybatisPlusAutoConfiguration { +// @Bean +// @ConditionalOnMissingBean //spring容器中不存在SqlSessionFactory的bean对象才会运行该方法 +// public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception { +// MybatisSqlSessionFactoryBean factory = new MybatisSqlSessionFactoryBean(); +// factory.setDataSource(dataSource); +// factory.setVfs(SpringBootVFS.class); +// if (StringUtils.hasText(this.properties.getConfigLocation())) { +// factory.setConfigLocation(this.resourceLoader.getResource(this.properties.getConfigLocation())); +// } +// +// this.applyConfiguration(factory); +// if (this.properties.getConfigurationProperties() != null) { +// factory.setConfigurationProperties(this.properties.getConfigurationProperties()); +// } +// +// if (!ObjectUtils.isEmpty(this.interceptors)) { +// factory.setPlugins(this.interceptors); +// } +// +// if (this.databaseIdProvider != null) { +// factory.setDatabaseIdProvider(this.databaseIdProvider); +// } +// +// if (StringUtils.hasLength(this.properties.getTypeAliasesPackage())) { +// factory.setTypeAliasesPackage(this.properties.getTypeAliasesPackage()); +// } +// +// if (this.properties.getTypeAliasesSuperType() != null) { +// factory.setTypeAliasesSuperType(this.properties.getTypeAliasesSuperType()); +// } +// +// if (StringUtils.hasLength(this.properties.getTypeHandlersPackage())) { +// factory.setTypeHandlersPackage(this.properties.getTypeHandlersPackage()); +// } +// +// if (!ObjectUtils.isEmpty(this.typeHandlers)) { +// factory.setTypeHandlers(this.typeHandlers); +// } +// +// //是否配置了MapperLocations路径 +// if (!ObjectUtils.isEmpty(this.properties.resolveMapperLocations())) { +// factory.setMapperLocations(this.properties.resolveMapperLocations()); +// } +// +// Objects.requireNonNull(factory); +// this.getBeanThen(TransactionFactory.class, factory::setTransactionFactory); +// Class defaultLanguageDriver = this.properties.getDefaultScriptingLanguageDriver(); +// if (!ObjectUtils.isEmpty(this.languageDrivers)) { +// factory.setScriptingLanguageDrivers(this.languageDrivers); +// } +// +// Optional var10000 = Optional.ofNullable(defaultLanguageDriver); +// Objects.requireNonNull(factory); +// var10000.ifPresent(factory::setDefaultScriptingLanguageDriver); +// this.applySqlSessionFactoryBeanCustomizers(factory); +// GlobalConfig globalConfig = this.properties.getGlobalConfig(); +// Objects.requireNonNull(globalConfig); +// this.getBeanThen(MetaObjectHandler.class, globalConfig::setMetaObjectHandler); +// this.getBeansThen(IKeyGenerator.class, (i) -> { +// globalConfig.getDbConfig().setKeyGenerators(i); +// }); +// Objects.requireNonNull(globalConfig); +// this.getBeanThen(ISqlInjector.class, globalConfig::setSqlInjector); +// Objects.requireNonNull(globalConfig); +// this.getBeanThen(IdentifierGenerator.class, globalConfig::setIdentifierGenerator); +// factory.setGlobalConfig(globalConfig); +// return factory.getObject(); +// } +// +//} diff --git a/tao-api/src/main/java/com/qihang/tao/controller/HomeController.java b/tao-api/src/main/java/com/qihang/tao/controller/HomeController.java index c9a0b8f5..9e0d315e 100644 --- a/tao-api/src/main/java/com/qihang/tao/controller/HomeController.java +++ b/tao-api/src/main/java/com/qihang/tao/controller/HomeController.java @@ -1,5 +1,7 @@ package com.qihang.tao.controller; +import com.qihang.tao.domain.TaoGoods; +import com.qihang.tao.mapper.TaoGoodsMapper; import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -9,6 +11,8 @@ import org.springframework.web.bind.annotation.RestController; @RestController public class HomeController { + @Autowired + private TaoGoodsMapper goodsMapper; @GetMapping("/") public String home(){ return "{'code':0,'msg':'请通过api访问'}"; @@ -21,6 +25,9 @@ HomeController { public String get(HttpServletRequest request) { String token = request.getHeader("Authorization"); System.out.println("tao-api token:"+token); + + TaoGoods taoGoods = goodsMapper.selectById(1L); + return serverName; } diff --git a/tao-api/src/main/java/com/qihang/tao/mapper/TaoGoodsMapper.java b/tao-api/src/main/java/com/qihang/tao/mapper/TaoGoodsMapper.java index 3a70e437..10b3324b 100644 --- a/tao-api/src/main/java/com/qihang/tao/mapper/TaoGoodsMapper.java +++ b/tao-api/src/main/java/com/qihang/tao/mapper/TaoGoodsMapper.java @@ -2,6 +2,8 @@ package com.qihang.tao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qihang.tao.domain.TaoGoods; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface TaoGoodsMapper extends BaseMapper { } diff --git a/tao-api/src/main/resources/application.yaml b/tao-api/src/main/resources/application.yaml index 507ae295..79020f7c 100644 --- a/tao-api/src/main/resources/application.yaml +++ b/tao-api/src/main/resources/application.yaml @@ -27,6 +27,6 @@ server: mybatis-plus: mapper-locations: classpath*:mapper/**/*Mapper.xml - type-aliases-package: com.qihang.tao.domain;com.qihang.tao.mapper + type-aliases-package: com.qihang.tao.domain;com.qihang.security.entity; configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 开启sql日志 \ No newline at end of file