diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 5f1cee010..a85d3da47 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -8,7 +8,7 @@ spring: master: url: jdbc:mysql://localhost:3306/intermarketing?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: + password: root # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 2461f46a6..c21090052 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -16,7 +16,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口,默认为80 - port: 80 + port: 8088 servlet: # 应用的访问路径 context-path: / diff --git a/ruoyi-admin/src/main/resources/static/img/hei.jpg b/ruoyi-admin/src/main/resources/static/img/hei.jpg new file mode 100644 index 000000000..c984be3d0 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/hei.jpg differ diff --git a/ruoyi-admin/src/main/resources/static/img/shj.jpg b/ruoyi-admin/src/main/resources/static/img/shj.jpg new file mode 100644 index 000000000..d4d2259f7 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/shj.jpg differ diff --git a/ruoyi-admin/src/main/resources/static/img/yun.jpg b/ruoyi-admin/src/main/resources/static/img/yun.jpg new file mode 100644 index 000000000..d0a3a32db Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/yun.jpg differ diff --git a/ruoyi-admin/src/main/resources/templates/demo/form/basic.html b/ruoyi-admin/src/main/resources/templates/demo/form/basic.html index 0bfef4a81..af9af3e14 100644 --- a/ruoyi-admin/src/main/resources/templates/demo/form/basic.html +++ b/ruoyi-admin/src/main/resources/templates/demo/form/basic.html @@ -203,7 +203,7 @@ - + 复选框&
diff --git a/ruoyi-admin/src/main/resources/templates/demo/form/wizard.html b/ruoyi-admin/src/main/resources/templates/demo/form/wizard.html index ffcdde1fc..3bd35a56d 100644 --- a/ruoyi-admin/src/main/resources/templates/demo/form/wizard.html +++ b/ruoyi-admin/src/main/resources/templates/demo/form/wizard.html @@ -300,7 +300,7 @@ $('#smartwizard').smartWizard({ } return true; }); - + $("#theme-selector").on("change", function() { // Change theme var options = { diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html index 7cea757b3..06a920501 100644 --- a/ruoyi-admin/src/main/resources/templates/login.html +++ b/ruoyi-admin/src/main/resources/templates/login.html @@ -15,6 +15,7 @@ +