diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index 5c523d0..fa121cc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -3,7 +3,6 @@ package com.ruoyi; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup; -import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.scheduling.annotation.EnableScheduling; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/config/I18nConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/config/I18nConfig.java index c434bd0..4890689 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/config/I18nConfig.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/config/I18nConfig.java @@ -1,10 +1,7 @@ package com.ruoyi.web.config; -import com.ruoyi.dk.service.HomeSettingService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; +import org.springframework.stereotype.Component; import org.springframework.web.servlet.LocaleResolver; import javax.servlet.http.HttpServletRequest; @@ -18,11 +15,11 @@ import java.util.Locale; * @version 1.0.0 * @since 2023/06/15 09:41 **/ -@Configuration +//@Component public class I18nConfig implements LocaleResolver { - @Autowired - private HomeSettingService homeSettingService; +// @Autowired +// private HomeSettingService homeSettingService; /** * 根据请求中的Accept-Language头部解析出语言设置。 diff --git a/ruoyi-component/ruoyi-component-mail/src/main/java/com/ruoyi/component/mail/config/MailConfig.java b/ruoyi-component/ruoyi-component-mail/src/main/java/com/ruoyi/component/mail/config/MailConfig.java index 4c0a121..6272190 100644 --- a/ruoyi-component/ruoyi-component-mail/src/main/java/com/ruoyi/component/mail/config/MailConfig.java +++ b/ruoyi-component/ruoyi-component-mail/src/main/java/com/ruoyi/component/mail/config/MailConfig.java @@ -2,6 +2,7 @@ package com.ruoyi.component.mail.config; import cn.hutool.extra.mail.MailAccount; import com.ruoyi.component.mail.config.properties.MailProperties; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -12,6 +13,7 @@ import org.springframework.context.annotation.Configuration; * * @author Michelle.Chung */ +@AutoConfiguration @EnableConfigurationProperties(MailProperties.class) public class MailConfig { diff --git a/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/I18nConfig.java b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/I18nConfig.java index c191dbb..14ee113 100644 --- a/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/I18nConfig.java +++ b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/I18nConfig.java @@ -1,6 +1,8 @@ package com.ruoyi.component.web.config; import cn.hutool.core.util.StrUtil; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.web.servlet.LocaleResolver; @@ -13,7 +15,7 @@ import java.util.Locale; * * @author Lion Li */ -//@AutoConfiguration(before = WebMvcAutoConfiguration.class) +@AutoConfiguration(before = WebMvcAutoConfiguration.class) public class I18nConfig { @Bean diff --git a/ruoyi-component/ruoyi-component-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-component/ruoyi-component-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 6f48ffa..a4a99ac 100644 --- a/ruoyi-component/ruoyi-component-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/ruoyi-component/ruoyi-component-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,4 +1,5 @@ com.ruoyi.component.web.config.CaptchaConfig com.ruoyi.component.web.config.FilterConfig +com.ruoyi.component.web.config.I18nConfig com.ruoyi.component.web.config.ResourcesConfig com.ruoyi.component.web.config.UndertowConfig diff --git a/ruoyi-dk/src/main/resources/mapper/BorrowMapper.xml b/ruoyi-dk/src/main/resources/mapper/dk/BorrowMapper.xml similarity index 100% rename from ruoyi-dk/src/main/resources/mapper/BorrowMapper.xml rename to ruoyi-dk/src/main/resources/mapper/dk/BorrowMapper.xml diff --git a/ruoyi-dk/src/main/resources/mapper/CustomerMapper.xml b/ruoyi-dk/src/main/resources/mapper/dk/CustomerMapper.xml similarity index 100% rename from ruoyi-dk/src/main/resources/mapper/CustomerMapper.xml rename to ruoyi-dk/src/main/resources/mapper/dk/CustomerMapper.xml