Merge branch 'master' of https://gitea.star-rising.cn/Song/xkrs_ms

# Conflicts: # ruoyi-admin/src/main/resources/application-druid.yml # ruoyi-admin/src/main/resources/application.yml
2022-05-11 17:27:34 +08:00
parent 9facc1b682 93835778ad
commit f2cb431c90
3 changed files with 8 additions and 5 deletions
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@ -41,12 +41,15 @@ logging:

 # Spring配置
 spring:
+#  config:
+#    activate:
+#      on-profile: druid
+  profiles:
+    active: druid
  # 资源信息
  messages:
    # 国际化资源文件路径
    basename: i18n/messages
-  profiles: 
-    active: druid
  # 文件上传
  servlet:
     multipart:
@ -114,7 +117,7 @@ swagger:
  pathMapping: /dev-api

 # 防止XSS攻击
-xss: 
+xss:
  # 过滤开关
  enabled: true
  # 排除链接（多个用逗号分隔）