diff --git a/src/main/java/com/chinaweal/youfool/prj/config/PrjDataSource.java b/src/main/java/com/chinaweal/youfool/prj/config/PrjDataSource.java index b7df0a3..c06ea6d 100644 --- a/src/main/java/com/chinaweal/youfool/prj/config/PrjDataSource.java +++ b/src/main/java/com/chinaweal/youfool/prj/config/PrjDataSource.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.config.GlobalConfig; import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; import com.chinaweal.youfool.framework.springboot.mybatis.plus.CommonMetaObjectHandler; import org.mybatis.spring.annotation.MapperScan; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; @@ -25,9 +24,9 @@ public class PrjDataSource { @Resource private CommonMetaObjectHandler commonMetaObjectHandler; - @Bean(name = "prjSqlSessionFactory") + @Bean(name = "sqlSessionFactory") @Primary - public MybatisSqlSessionFactoryBean sqlSessionFactory(@Qualifier("prjDS") DataSource dataSource) throws Exception { + public MybatisSqlSessionFactoryBean sqlSessionFactory(DataSource dataSource) throws Exception { MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean(); bean.setDataSource(dataSource); GlobalConfig globalConfig = new GlobalConfig(); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f39f023..9d21fb4 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -61,4 +61,8 @@ knife4j: # basic: # enable: true # username: admin -# password: 123456 \ No newline at end of file +# password: 123456 + +server: + servlet: + context-path: /prj