diff --git a/ruoyi-api/ruoyi-api-system/src/main/resources/application.yml b/ruoyi-api/ruoyi-api-system/src/main/resources/application.yml deleted file mode 100644 index 68245e6b..00000000 --- a/ruoyi-api/ruoyi-api-system/src/main/resources/application.yml +++ /dev/null @@ -1,8 +0,0 @@ -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - druid: - username: root - password: root - url: jdbc:mysql://localhost:3306/ry-cloud?serverTimezone=Asia/Shanghai - driver-class-name: com.mysql.cj.jdbc.Driver \ No newline at end of file diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/config/WebSecurityConfig.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/config/WebSecurityConfig.java index a22e7bf7..2f59a631 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/config/WebSecurityConfig.java +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/config/WebSecurityConfig.java @@ -1,68 +1,71 @@ -package com.ruoyi.auth.config; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; -import org.springframework.core.annotation.Order; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.builders.WebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.security.crypto.password.PasswordEncoder; - -/** - * Security 安全认证相关配置 - * Oauth2依赖于Security 默认情况下WebSecurityConfig执行比ResourceServerConfig优先 - * - * @author ruoyi - */ -@Primary -@Order(90) -@Configuration -public class WebSecurityConfig extends WebSecurityConfigurerAdapter -{ - @Autowired - private UserDetailsService userDetailsService; - - @Bean - public PasswordEncoder passwordEncoder() - { - return new BCryptPasswordEncoder(); - } - - @Bean - @Override - public AuthenticationManager authenticationManagerBean() throws Exception - { - return super.authenticationManagerBean(); - } - - @Override - protected void configure(AuthenticationManagerBuilder auth) throws Exception - { - auth.userDetailsService(userDetailsService).passwordEncoder(passwordEncoder()); - } - - @Override - protected void configure(HttpSecurity http) throws Exception - { - http - .authorizeRequests() - .antMatchers( - "/actuator/**", - "/token/**").permitAll() - .anyRequest().authenticated() - .and().csrf().disable(); - } - - /*** 设置不拦截规则 */ - @Override - public void configure(WebSecurity web) - { - web.ignoring().antMatchers("/css/**", "/js/**", "/plugins/**", "/favicon.ico"); - } -} +package com.ruoyi.auth.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.core.annotation.Order; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.builders.WebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; + +/** + * Security 安全认证相关配置 + * Oauth2依赖于Security 默认情况下WebSecurityConfig执行比ResourceServerConfig优先 + * + * @author ruoyi + */ +@Primary +@Order(90) +@Configuration +public class WebSecurityConfig extends WebSecurityConfigurerAdapter +{ + @Autowired + private UserDetailsService userDetailsService; + + @Bean + public PasswordEncoder passwordEncoder() + { + return new BCryptPasswordEncoder(); + } + + @Bean + @Override + public AuthenticationManager authenticationManagerBean() throws Exception + { + return super.authenticationManagerBean(); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception + { + auth.userDetailsService(userDetailsService).passwordEncoder(passwordEncoder()); + } + + @Override + protected void configure(HttpSecurity http) throws Exception + { + http.httpBasic().disable(); + + http + .authorizeRequests() + .antMatchers( + "/actuator/**", + "/token/**").permitAll() + .anyRequest().authenticated() + .and().csrf().disable(); + + } + + /*** 设置不拦截规则 */ + @Override + public void configure(WebSecurity web) + { + web.ignoring().antMatchers("/css/**", "/js/**", "/plugins/**", "/favicon.ico"); + } +} diff --git a/ruoyi-auth/src/main/resources/application-dev.yml b/ruoyi-auth/src/main/resources/application-dev.yml deleted file mode 100644 index a3e7b727..00000000 --- a/ruoyi-auth/src/main/resources/application-dev.yml +++ /dev/null @@ -1 +0,0 @@ -debug: true \ No newline at end of file diff --git a/ruoyi-gateway/src/main/resources/application-dev.yml b/ruoyi-gateway/src/main/resources/application-dev.yml deleted file mode 100644 index bebe20c1..00000000 --- a/ruoyi-gateway/src/main/resources/application-dev.yml +++ /dev/null @@ -1,13 +0,0 @@ -spring: - cloud: - gateway: - routes: - - id: authRoute - uri: lb://ruoyi-auth - order: 10000 - predicates: - - Path=/auth/** - filters: - - StripPrefix=1 - -debug: true \ No newline at end of file diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index 7c10e2dc..c4279013 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -22,4 +22,12 @@ spring: file-extension: yml # 共享配置 shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - + gateway: + routes: + - id: authRoute + uri: lb://ruoyi-auth + order: 10000 + predicates: + - Path=/auth/** + filters: + - StripPrefix=1 \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/application.yml b/ruoyi-modules/ruoyi-job/src/main/resources/application.yml deleted file mode 100644 index e15c629c..00000000 --- a/ruoyi-modules/ruoyi-job/src/main/resources/application.yml +++ /dev/null @@ -1,13 +0,0 @@ -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - druid: - username: root - password: root - url: jdbc:mysql://localhost:3306/ry-cloud?serverTimezone=Asia/Shanghai - driver-class-name: com.mysql.cj.jdbc.Driver - application: - name: ruoyi-job -mybatis: - mapper-locations: classpath*:/**/*Mapper.xml - type-aliases-package: com.ruoyi.job.domain \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml index 480a180f..dbe88652 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml @@ -1,24 +1,28 @@ -# Tomcat -server: - port: 9203 - -# Spring -spring: - application: - # 应用名称 - name: ruoyi-job - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: 127.0.0.1:8848 - config: - # 配置中心地址 - server-addr: 127.0.0.1:8848 - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +# Tomcat +server: + port: 9203 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-job + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 127.0.0.1:8848 + config: + # 配置中心地址 + server-addr: 127.0.0.1:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + +mybatis: + mapper-locations: classpath*:/**/*Mapper.xml + type-aliases-package: com.ruoyi.job.domain \ No newline at end of file