From 4b36e415050546729919e7f1ba8c697c992c62a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=BE=E8=AF=91=E5=8D=87?= <2596969567@qq.com> Date: Wed, 31 Mar 2021 15:08:04 +0800 Subject: [PATCH] s --- .../src/main/resources/application-druid.yml | 12 +- .../src/main/resources/application.yml | 4 +- ruoyi-admin/src/main/resources/logback.xml | 2 +- .../src/main/resources/templates/login.html | 137 ++++++++---------- .../src/main/resources/templates/login3.html | 71 +++++++++ .../style/images/4271617159537_.pic_hd.jpg | Bin 0 -> 108727 bytes .../H6dab62e0541a46969864585570bca3a6Q.jpg | Bin 0 -> 44851 bytes .../H6dab62e0541a46969864585570bca3a6Q.png | Bin 0 -> 155824 bytes .../style/images/img/login-background.jpg | Bin 0 -> 815065 bytes .../templates/style/js/canvas-nest.min.js | 1 + 10 files changed, 140 insertions(+), 87 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/templates/login3.html create mode 100644 ruoyi-admin/src/main/resources/templates/style/images/4271617159537_.pic_hd.jpg create mode 100644 ruoyi-admin/src/main/resources/templates/style/images/H6dab62e0541a46969864585570bca3a6Q.jpg create mode 100644 ruoyi-admin/src/main/resources/templates/style/images/H6dab62e0541a46969864585570bca3a6Q.png create mode 100644 ruoyi-admin/src/main/resources/templates/style/images/img/login-background.jpg create mode 100644 ruoyi-admin/src/main/resources/templates/style/js/canvas-nest.min.js diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 5243abd67..4a49dbdc1 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,16 +6,16 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://8.136.221.121:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: password + password: zsemko # 从库数据源 slave: # 从数据源开关/默认关闭 - enabled: false - url: - username: - password: + enabled: true + url: jdbc:mysql://8.136.221.121:3306/crm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: root + password: zsemko # 初始连接数 initialSize: 5 # 最小连接池数量 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index d013a3f1e..59ae3df5d 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -9,14 +9,14 @@ ruoyi: # 实例演示开关 demoEnabled: true # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: D:/ruoyi/uploadPath + profile: /Users/jiayisheng/Desktop # 获取ip地址开关 addressEnabled: false # 开发环境配置 server: # 服务器的HTTP端口，默认为80 - port: 80 + port: 888 servlet: # 应用的访问路径 context-path: / diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml index d69a57207..ee770ab78 100644 --- a/ruoyi-admin/src/main/resources/logback.xml +++ b/ruoyi-admin/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html index 7327463fa..10a0bf846 100644 --- a/ruoyi-admin/src/main/resources/templates/login.html +++ b/ruoyi-admin/src/main/resources/templates/login.html @@ -1,84 +1,65 @@ - + - - - - 登录若依系统 - - - - - - - - - - - - - - - -
-
-
-