diff --git a/pom.xml b/pom.xml index 65abb93bc..5c5a08a5c 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ 3.8.2 UTF-8 UTF-8 - 1.8 + 17 3.1.1 1.2.8 1.21 diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 1f098e407..d770b75c3 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: root - password: password + url: jdbc:mysql://192.168.2.9:3306/nuoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: saas + password: XKrs123. # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 5fa30a4e8..0e2561941 100644 --- 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: @@ -66,9 +69,9 @@ spring: # 端口,默认为6379 port: 6379 # 数据库索引 - database: 0 + database: 3 # 密码 - password: + password: sdust2020 # 连接超时时间 timeout: 10s lettuce: @@ -114,7 +117,7 @@ swagger: pathMapping: /dev-api # 防止XSS攻击 -xss: +xss: # 过滤开关 enabled: true # 排除链接(多个用逗号分隔) diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 50377539c..9983733b6 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -39,7 +39,7 @@ "@riophae/vue-treeselect": "0.4.0", "axios": "0.24.0", "clipboard": "2.0.8", - "core-js": "3.19.1", + "core-js": "^3.19.1", "echarts": "4.9.0", "element-ui": "2.15.8", "file-saver": "2.0.5",