pull/1/head
administrator 5 years ago
parent ae1887486c
commit 404b98bfc5

@ -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

@ -1,68 +1,71 @@
package com.ruoyi.auth.config; package com.ruoyi.auth.config;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; 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.HttpSecurity;
import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.builders.WebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder;
/** /**
* Security * Security
* Oauth2Security WebSecurityConfigResourceServerConfig * Oauth2Security WebSecurityConfigResourceServerConfig
* *
* @author ruoyi * @author ruoyi
*/ */
@Primary @Primary
@Order(90) @Order(90)
@Configuration @Configuration
public class WebSecurityConfig extends WebSecurityConfigurerAdapter public class WebSecurityConfig extends WebSecurityConfigurerAdapter
{ {
@Autowired @Autowired
private UserDetailsService userDetailsService; private UserDetailsService userDetailsService;
@Bean @Bean
public PasswordEncoder passwordEncoder() public PasswordEncoder passwordEncoder()
{ {
return new BCryptPasswordEncoder(); return new BCryptPasswordEncoder();
} }
@Bean @Bean
@Override @Override
public AuthenticationManager authenticationManagerBean() throws Exception public AuthenticationManager authenticationManagerBean() throws Exception
{ {
return super.authenticationManagerBean(); return super.authenticationManagerBean();
} }
@Override @Override
protected void configure(AuthenticationManagerBuilder auth) throws Exception protected void configure(AuthenticationManagerBuilder auth) throws Exception
{ {
auth.userDetailsService(userDetailsService).passwordEncoder(passwordEncoder()); auth.userDetailsService(userDetailsService).passwordEncoder(passwordEncoder());
} }
@Override @Override
protected void configure(HttpSecurity http) throws Exception protected void configure(HttpSecurity http) throws Exception
{ {
http http.httpBasic().disable();
.authorizeRequests()
.antMatchers( http
"/actuator/**", .authorizeRequests()
"/token/**").permitAll() .antMatchers(
.anyRequest().authenticated() "/actuator/**",
.and().csrf().disable(); "/token/**").permitAll()
} .anyRequest().authenticated()
.and().csrf().disable();
/*** 设置不拦截规则 */
@Override }
public void configure(WebSecurity web)
{ /*** 设置不拦截规则 */
web.ignoring().antMatchers("/css/**", "/js/**", "/plugins/**", "/favicon.ico"); @Override
} public void configure(WebSecurity web)
} {
web.ignoring().antMatchers("/css/**", "/js/**", "/plugins/**", "/favicon.ico");
}
}

@ -1,13 +0,0 @@
spring:
cloud:
gateway:
routes:
- id: authRoute
uri: lb://ruoyi-auth
order: 10000
predicates:
- Path=/auth/**
filters:
- StripPrefix=1
debug: true

@ -22,4 +22,12 @@ spring:
file-extension: yml file-extension: yml
# 共享配置 # 共享配置
shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} 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

@ -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

@ -1,24 +1,28 @@
# Tomcat # Tomcat
server: server:
port: 9203 port: 9203
# Spring # Spring
spring: spring:
application: application:
# 应用名称 # 应用名称
name: ruoyi-job name: ruoyi-job
profiles: profiles:
# 环境配置 # 环境配置
active: dev active: dev
cloud: cloud:
nacos: nacos:
discovery: discovery:
# 服务注册地址 # 服务注册地址
server-addr: 127.0.0.1:8848 server-addr: 127.0.0.1:8848
config: config:
# 配置中心地址 # 配置中心地址
server-addr: 127.0.0.1:8848 server-addr: 127.0.0.1:8848
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置
shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} 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
Loading…
Cancel
Save