Browse Source

异常天气等级

develop
王兴琳 8 months ago
parent
commit
4d9bc0583f
  1. 10
      ruoyi-admin/src/main/resources/application-druid.yml
  2. 12
      ruoyi-admin/src/main/resources/application.yml
  3. 6
      ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

10
ruoyi-admin/src/main/resources/application-druid.yml

@ -8,10 +8,12 @@ spring:
master: master:
# 公司数据库地址 # 公司数据库地址
# url: jdbc:mysql://10.168.3.169:3306/athena?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 # url: jdbc:mysql://10.168.3.169:3306/athena?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
url: jdbc:mysql://10.168.56.204:3306/jihe-dc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true # url: jdbc:mysql://127.0.0.1:3308/event_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
username: root # url: jdbc:mysql://127.0.0.1:3308/jihe-dc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
# password: Platform123!@# url: jdbc:mysql://10.168.56.204:3306/jihe-dc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
password: Platform123!@# username: root
# password: root
password: Platform123!@#
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭

12
ruoyi-admin/src/main/resources/application.yml

@ -67,9 +67,9 @@ spring:
# 端口,默认为6379 # 端口,默认为6379
port: 6379 port: 6379
# 数据库索引 # 数据库索引
database: 0 database: 1
# 密码 # 密码
password: Redis123!@# password:
# 连接超时时间 # 连接超时时间
timeout: 10s timeout: 10s
lettuce: lettuce:
@ -156,7 +156,7 @@ aj:
iot: iot:
# 物联平台地址 # 物联平台地址
address: http://127.0.0.1:8080 address: https://10.0.81.202:8081
# redis 配置 # redis 配置
redis: redis:
# 地址 # 地址
@ -164,9 +164,9 @@ iot:
# 端口,默认为6379 # 端口,默认为6379
port: 6379 port: 6379
# 数据库索引 # 数据库索引
database: 10 database: 0
# 密码 # 密码
password: Redis123!@# password:
# 连接超时时间 # 连接超时时间
timeout: 10s timeout: 10s
lettuce: lettuce:
@ -183,4 +183,4 @@ iot:
# 允许访问的ip地址 # 允许访问的ip地址
allowed: allowed:
ips: 10.0.81.202,10.168.73.54,10.168.71.194 ips: 10.0.81.202,10.168.73.54,10.168.71.194,

6
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@ -116,7 +116,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
// 过滤请求 // 过滤请求
.authorizeRequests() .authorizeRequests()
// 对于登录login 注册register 验证码captchaImage 允许匿名访问 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
.antMatchers("/login", "/register", "/captchaImage").anonymous() .antMatchers("/login", "/register", "/captchaImage","/dc/**").anonymous()
.antMatchers( .antMatchers(
HttpMethod.GET, HttpMethod.GET,
"/", "/",
@ -126,8 +126,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
"/**/*.js", "/**/*.js",
"/profile/**" "/profile/**"
).permitAll() ).permitAll()
// .antMatchers("/swagger-ui.html").anonymous() .antMatchers("/swagger-ui.html").anonymous()
// .antMatchers("/swagger-resources/**").anonymous() .antMatchers("/swagger-resources/**").anonymous()
.antMatchers("/webjars/**").anonymous() .antMatchers("/webjars/**").anonymous()
.antMatchers("/*/api-docs").anonymous() .antMatchers("/*/api-docs").anonymous()
.antMatchers("/druid/**").anonymous() .antMatchers("/druid/**").anonymous()

Loading…
Cancel
Save