From 9f20555ea2f3848b1b93155a02f51246be17d5ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=9F=8E=E5=BF=B5=E4=BA=91?= <495888462@qq.com> Date: Sat, 11 Jan 2020 17:22:26 +0800 Subject: [PATCH] no commit message --- ruoyi-ui/src/layout/components/Navbar.vue | 358 +++++---- ruoyi-ui/src/settings.js | 2 +- ruoyi-ui/src/views/system/notice/index.vue | 689 +++++++++--------- ruoyi-ui/vue.config.js | 2 +- .../controller/SysNoticeController.java | 27 +- .../src/main/resources/application-druid.yml | 2 +- 6 files changed, 538 insertions(+), 542 deletions(-) diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue index bafb11a01..00fc726c3 100644 --- a/ruoyi-ui/src/layout/components/Navbar.vue +++ b/ruoyi-ui/src/layout/components/Navbar.vue @@ -1,181 +1,177 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/settings.js b/ruoyi-ui/src/settings.js index 0a734add2..2e23cf82e 100644 --- a/ruoyi-ui/src/settings.js +++ b/ruoyi-ui/src/settings.js @@ -19,7 +19,7 @@ module.exports = { /** * 是否显示logo */ - sidebarLogo: true, + sidebarLogo: false, /** * @type {string | array} 'production' | ['production', 'development'] diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/ruoyi-ui/src/views/system/notice/index.vue index 404bec3e4..b91f3e066 100644 --- a/ruoyi-ui/src/views/system/notice/index.vue +++ b/ruoyi-ui/src/views/system/notice/index.vue @@ -1,345 +1,344 @@ - - - \ No newline at end of file + + + diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index fe7e462b5..19787f87c 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -17,7 +17,7 @@ module.exports = { // 部署生产环境和开发环境下的URL。 // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 - publicPath: process.env.NODE_ENV === "production" ? "./" : "/", + publicPath: process.env.NODE_ENV === "production" ? "/" : "/", // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） outputDir: 'dist', // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java index 243505337..b8e2f94fc 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java @@ -1,17 +1,5 @@ package com.ruoyi.project.system.controller; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.aspectj.lang.enums.BusinessType; @@ -20,10 +8,16 @@ import com.ruoyi.framework.web.domain.AjaxResult; import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.project.system.domain.SysNotice; import com.ruoyi.project.system.service.ISysNoticeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 公告 信息操作处理 - * + * * @author ruoyi */ @RestController @@ -89,4 +83,11 @@ public class SysNoticeController extends BaseController { return toAjax(noticeService.deleteNoticeById(noticeId)); } + + + @GetMapping("/msg") + public AjaxResult message() + { + return toAjax(10); + } } diff --git a/ruoyi/src/main/resources/application-druid.yml b/ruoyi/src/main/resources/application-druid.yml index 9e16357d3..0d8d370df 100644 --- a/ruoyi/src/main/resources/application-druid.yml +++ b/ruoyi/src/main/resources/application-druid.yml @@ -6,7 +6,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://locahost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: MRyyserver2019 # 从库数据源