From bd99606db1bf111a3ee8fb7c568f4db14b4988e9 Mon Sep 17 00:00:00 2001 From: xiao-fajia <1665375861@qq.com> Date: Tue, 23 Jul 2024 18:07:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/cms/api/CMSCategoryAPI.java | 46 +++++++ .../java/com/ruoyi/cms/api/CMSContentAPI.java | 31 +++++ .../cms/controller/UeditorController.java | 24 +++- .../com/ruoyi/cms/domain/CmsCategory.java | 4 +- .../java/com/ruoyi/cms/domain/CmsContent.java | 6 + .../ruoyi/cms/domain/vo/CMSCategoryVo.java | 49 ++++++++ .../cms/service/ICmsCategoryService.java | 22 ++++ .../service/impl/CmsCategoryServiceImpl.java | 50 ++++++++ .../config/{ => ueditor}/config.json | 2 +- .../resources/mapper/cms/CmsContentMapper.xml | 4 +- ruoyi-admin/target/classes/config/config.json | 69 ---------- .../classes/mapper/cms/CmsContentMapper.xml | 4 +- .../ruoyi/common/core/domain/BaseEntity.java | 4 + .../framework/config/SecurityConfig.java | 2 +- .../UEditorPlus}/dialogs/anchor/anchor.html | 0 .../dialogs/attachment/attachment.css | 0 .../dialogs/attachment/attachment.html | 0 .../dialogs/attachment/attachment.js | 0 .../dialogs/attachment/images/alignicon.gif | Bin .../dialogs/attachment/images/alignicon.png | Bin .../dialogs/attachment/images/bg.png | Bin .../dialogs/attachment/images/file-icons.gif | Bin .../dialogs/attachment/images/file-icons.png | Bin .../dialogs/attachment/images/icons.gif | Bin .../dialogs/attachment/images/icons.png | Bin .../dialogs/attachment/images/image.png | Bin .../dialogs/attachment/images/progress.png | Bin .../dialogs/attachment/images/success.gif | Bin .../dialogs/attachment/images/success.png | Bin .../UEditorPlus}/dialogs/audio/audio.css | 0 .../UEditorPlus}/dialogs/audio/audio.html | 0 .../UEditorPlus}/dialogs/audio/audio.js | 0 .../UEditorPlus}/dialogs/audio/images/bg.png | Bin .../dialogs/audio/images/center_focus.jpg | Bin .../dialogs/audio/images/file-icons.gif | Bin .../dialogs/audio/images/file-icons.png | Bin .../dialogs/audio/images/icons.gif | Bin .../dialogs/audio/images/icons.png | Bin .../dialogs/audio/images/image.png | Bin .../dialogs/audio/images/left_focus.jpg | Bin .../dialogs/audio/images/none_focus.jpg | Bin .../dialogs/audio/images/progress.png | Bin .../dialogs/audio/images/right_focus.jpg | Bin .../dialogs/audio/images/success.gif | Bin .../dialogs/audio/images/success.png | Bin .../dialogs/background/background.css | 0 .../dialogs/background/background.html | 0 .../dialogs/background/background.js | 0 .../dialogs/background/images/bg.png | Bin .../dialogs/background/images/success.png | Bin .../dialogs/contentimport/contentimport.html | 0 .../dialogs/contentimport/contentimport.js | 0 .../contentimport/mammoth.browser.min.js | 0 .../dialogs/contentimport/showdown.min.js | 0 .../UEditorPlus}/dialogs/emotion/emotion.css | 0 .../UEditorPlus}/dialogs/emotion/emotion.html | 0 .../UEditorPlus}/dialogs/emotion/emotion.js | 0 .../UEditorPlus}/dialogs/emotion/images/0.gif | Bin .../dialogs/emotion/images/bface.gif | Bin .../dialogs/emotion/images/cface.gif | Bin .../dialogs/emotion/images/fface.gif | Bin .../dialogs/emotion/images/jxface2.gif | Bin .../emotion/images/neweditor-tab-bg.png | Bin .../dialogs/emotion/images/tface.gif | Bin .../dialogs/emotion/images/wface.gif | Bin .../dialogs/emotion/images/yface.gif | Bin .../UEditorPlus}/dialogs/formula/formula.html | 0 .../UEditorPlus}/dialogs/formula/formula.js | 0 .../UEditorPlus}/dialogs/help/help.css | 0 .../UEditorPlus}/dialogs/help/help.html | 0 .../UEditorPlus}/dialogs/help/help.js | 0 .../UEditorPlus}/dialogs/image/image.css | 0 .../UEditorPlus}/dialogs/image/image.html | 0 .../UEditorPlus}/dialogs/image/image.js | 0 .../dialogs/image/images/alignicon.jpg | Bin .../UEditorPlus}/dialogs/image/images/bg.png | Bin .../dialogs/image/images/icons.gif | Bin .../dialogs/image/images/icons.png | Bin .../dialogs/image/images/image.png | Bin .../dialogs/image/images/progress.png | Bin .../dialogs/image/images/success.gif | Bin .../dialogs/image/images/success.png | Bin .../dialogs/insertframe/insertframe.html | 0 .../UEditorPlus}/dialogs/internal.js | 0 .../UEditorPlus}/dialogs/link/link.html | 0 .../UEditorPlus}/dialogs/preview/preview.html | 0 .../dialogs/scrawl/images/addimg.png | Bin .../dialogs/scrawl/images/brush.png | Bin .../dialogs/scrawl/images/delimg.png | Bin .../dialogs/scrawl/images/delimgH.png | Bin .../dialogs/scrawl/images/empty.png | Bin .../dialogs/scrawl/images/emptyH.png | Bin .../dialogs/scrawl/images/eraser.png | Bin .../dialogs/scrawl/images/redo.png | Bin .../dialogs/scrawl/images/redoH.png | Bin .../dialogs/scrawl/images/scale.png | Bin .../dialogs/scrawl/images/scaleH.png | Bin .../dialogs/scrawl/images/size.png | Bin .../dialogs/scrawl/images/undo.png | Bin .../dialogs/scrawl/images/undoH.png | Bin .../UEditorPlus}/dialogs/scrawl/scrawl.css | 0 .../UEditorPlus}/dialogs/scrawl/scrawl.html | 0 .../UEditorPlus}/dialogs/scrawl/scrawl.js | 0 .../dialogs/searchreplace/searchreplace.html | 0 .../dialogs/searchreplace/searchreplace.js | 0 .../dialogs/spechars/spechars.html | 0 .../UEditorPlus}/dialogs/spechars/spechars.js | 0 .../UEditorPlus}/dialogs/table/dragicon.png | Bin .../UEditorPlus}/dialogs/table/edittable.css | 0 .../UEditorPlus}/dialogs/table/edittable.html | 0 .../UEditorPlus}/dialogs/table/edittable.js | 0 .../UEditorPlus}/dialogs/table/edittd.html | 0 .../UEditorPlus}/dialogs/table/edittip.html | 0 .../UEditorPlus}/dialogs/template/config.js | 0 .../dialogs/template/images/bg.gif | Bin .../dialogs/template/images/pre0.png | Bin .../dialogs/template/images/pre1.png | Bin .../dialogs/template/images/pre2.png | Bin .../dialogs/template/images/pre3.png | Bin .../dialogs/template/images/pre4.png | Bin .../dialogs/template/template.css | 0 .../dialogs/template/template.html | 0 .../UEditorPlus}/dialogs/template/template.js | 0 .../UEditorPlus}/dialogs/video/images/bg.png | Bin .../dialogs/video/images/center_focus.jpg | Bin .../dialogs/video/images/file-icons.gif | Bin .../dialogs/video/images/file-icons.png | Bin .../dialogs/video/images/icons.gif | Bin .../dialogs/video/images/icons.png | Bin .../dialogs/video/images/image.png | Bin .../dialogs/video/images/left_focus.jpg | Bin .../dialogs/video/images/none_focus.jpg | Bin .../dialogs/video/images/progress.png | Bin .../dialogs/video/images/right_focus.jpg | Bin .../dialogs/video/images/success.gif | Bin .../dialogs/video/images/success.png | Bin .../UEditorPlus}/dialogs/video/video.css | 0 .../UEditorPlus}/dialogs/video/video.html | 0 .../UEditorPlus}/dialogs/video/video.js | 0 .../dialogs/wordimage/wordimage.html | 0 .../dialogs/wordimage/wordimage.js | 0 .../UEditorPlus}/index.html | 0 .../UEditorPlus}/lang/en/en.js | 4 +- .../UEditorPlus}/lang/en/images/addimage.png | Bin .../lang/en/images/alldeletebtnhoverskin.png | Bin .../lang/en/images/alldeletebtnupskin.png | Bin .../lang/en/images/background.png | Bin .../UEditorPlus}/lang/en/images/button.png | Bin .../UEditorPlus}/lang/en/images/copy.png | Bin .../lang/en/images/deletedisable.png | Bin .../lang/en/images/deleteenable.png | Bin .../lang/en/images/listbackground.png | Bin .../lang/en/images/localimage.png | Bin .../UEditorPlus}/lang/en/images/music.png | Bin .../lang/en/images/rotateleftdisable.png | Bin .../lang/en/images/rotateleftenable.png | Bin .../lang/en/images/rotaterightdisable.png | Bin .../lang/en/images/rotaterightenable.png | Bin .../UEditorPlus}/lang/en/images/upload.png | Bin .../UEditorPlus}/lang/zh-cn/images/copy.png | Bin .../lang/zh-cn/images/localimage.png | Bin .../UEditorPlus}/lang/zh-cn/images/music.png | Bin .../UEditorPlus}/lang/zh-cn/images/upload.png | Bin .../UEditorPlus}/lang/zh-cn/zh-cn.js | 4 +- .../UEditorPlus}/plugins/demo/demo.js | 0 .../themes/default/css/ueditor.css | 0 .../UEditorPlus}/themes/default/dialog.css | 0 .../themes/default/dialogbase.css | 0 .../UEditorPlus}/themes/default/exts/ai.svg | 0 .../UEditorPlus}/themes/default/exts/apk.svg | 0 .../UEditorPlus}/themes/default/exts/chm.svg | 0 .../UEditorPlus}/themes/default/exts/css.svg | 0 .../UEditorPlus}/themes/default/exts/doc.svg | 0 .../UEditorPlus}/themes/default/exts/docx.svg | 0 .../UEditorPlus}/themes/default/exts/dwg.svg | 0 .../themes/default/exts/folder.svg | 0 .../UEditorPlus}/themes/default/exts/gif.svg | 0 .../UEditorPlus}/themes/default/exts/html.svg | 0 .../UEditorPlus}/themes/default/exts/jpeg.svg | 0 .../UEditorPlus}/themes/default/exts/jpg.svg | 0 .../UEditorPlus}/themes/default/exts/log.svg | 0 .../UEditorPlus}/themes/default/exts/mp3.svg | 0 .../UEditorPlus}/themes/default/exts/mp4.svg | 0 .../UEditorPlus}/themes/default/exts/pdf.svg | 0 .../UEditorPlus}/themes/default/exts/png.svg | 0 .../UEditorPlus}/themes/default/exts/ppt.svg | 0 .../UEditorPlus}/themes/default/exts/pptx.svg | 0 .../UEditorPlus}/themes/default/exts/psd.svg | 0 .../UEditorPlus}/themes/default/exts/rar.svg | 0 .../UEditorPlus}/themes/default/exts/svg.svg | 0 .../themes/default/exts/torrent.svg | 0 .../UEditorPlus}/themes/default/exts/txt.svg | 0 .../themes/default/exts/unknown.svg | 0 .../UEditorPlus}/themes/default/exts/xls.svg | 0 .../UEditorPlus}/themes/default/exts/xlsx.svg | 0 .../UEditorPlus}/themes/default/exts/zip.svg | 0 .../themes/default/images/anchor.gif | Bin .../themes/default/images/arrow.png | Bin .../themes/default/images/arrow_down.png | Bin .../themes/default/images/arrow_up.png | Bin .../themes/default/images/button-bg.gif | Bin .../themes/default/images/cancelbutton.gif | Bin .../themes/default/images/charts.png | Bin .../themes/default/images/cursor_h.gif | Bin .../themes/default/images/cursor_h.png | Bin .../themes/default/images/cursor_v.gif | Bin .../themes/default/images/cursor_v.png | Bin .../themes/default/images/dialog-title-bg.png | Bin .../themes/default/images/filescan.png | Bin .../themes/default/images/highlighted.gif | Bin .../themes/default/images/icons-all.gif | Bin .../themes/default/images/icons.gif | Bin .../themes/default/images/icons.png | Bin .../themes/default/images/img-cracked.png | Bin .../themes/default/images/loaderror.png | Bin .../themes/default/images/loading.gif | Bin .../themes/default/images/lock.gif | Bin .../default/images/neweditor-tab-bg.png | Bin .../themes/default/images/pagebreak.gif | Bin .../themes/default/images/scale.png | Bin .../themes/default/images/sortable.png | Bin .../themes/default/images/spacer.gif | Bin .../themes/default/images/sparator_v.png | Bin .../default/images/table-cell-align.png | Bin .../default/images/tangram-colorpicker.png | Bin .../themes/default/images/toolbar_bg.png | Bin .../themes/default/images/unhighlighted.gif | Bin .../themes/default/images/upload.png | Bin .../themes/default/images/videologo.gif | Bin .../themes/default/images/word.gif | Bin .../themes/default/images/wordpaste.png | Bin .../UEditorPlus}/themes/iframe.css | 0 .../third-party/SyntaxHighlighter/shCore.js | 50 ++++---- .../SyntaxHighlighter/shCoreDefault.css | 0 .../third-party/clipboard/clipboard.js | 0 .../third-party/clipboard/clipboard.swf | Bin .../third-party/codemirror/codemirror.css | 0 .../third-party/codemirror/codemirror.js | 0 .../UEditorPlus}/third-party/jquery-1.10.2.js | 0 .../third-party/webuploader/webuploader.css | 0 .../third-party/webuploader/webuploader.js | 0 .../zeroclipboard/ZeroClipboard.js | 0 .../zeroclipboard/ZeroClipboard.swf | Bin .../UEditorPlus}/ueditor.all.js | 8 +- .../UEditorPlus}/ueditor.config.js | 0 .../UEditorPlus}/ueditor.parse.js | 0 ruoyi-ui/src/api/cms/editor.js | 9 ++ ruoyi-ui/src/main.js | 2 +- ruoyi-ui/src/views/cms/editor/index.vue | 118 ++++++++++++++++-- 249 files changed, 394 insertions(+), 118 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/cms/api/CMSCategoryAPI.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/cms/api/CMSContentAPI.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/CMSCategoryVo.java rename ruoyi-admin/src/main/resources/config/{ => ueditor}/config.json (98%) delete mode 100644 ruoyi-admin/target/classes/config/config.json rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/anchor/anchor.html (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/attachment/attachment.css (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/attachment/attachment.html (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/attachment/attachment.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/attachment/images/alignicon.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/attachment/images/alignicon.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/attachment/images/bg.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/attachment/images/file-icons.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/attachment/images/file-icons.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/attachment/images/icons.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/attachment/images/icons.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/attachment/images/image.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/attachment/images/progress.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/attachment/images/success.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/attachment/images/success.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/audio/audio.css (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/audio/audio.html (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/audio/audio.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/audio/images/bg.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/audio/images/center_focus.jpg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/audio/images/file-icons.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/audio/images/file-icons.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/audio/images/icons.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/audio/images/icons.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/audio/images/image.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/audio/images/left_focus.jpg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/audio/images/none_focus.jpg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/audio/images/progress.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/audio/images/right_focus.jpg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/audio/images/success.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/audio/images/success.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/background/background.css (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/background/background.html (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/background/background.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/background/images/bg.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/background/images/success.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/contentimport/contentimport.html (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/contentimport/contentimport.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/contentimport/mammoth.browser.min.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/contentimport/showdown.min.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/emotion/emotion.css (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/emotion/emotion.html (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/emotion/emotion.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/emotion/images/0.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/emotion/images/bface.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/emotion/images/cface.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/emotion/images/fface.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/emotion/images/jxface2.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/emotion/images/neweditor-tab-bg.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/emotion/images/tface.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/emotion/images/wface.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/emotion/images/yface.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/formula/formula.html (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/formula/formula.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/help/help.css (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/help/help.html (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/help/help.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/image/image.css (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/image/image.html (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/image/image.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/image/images/alignicon.jpg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/image/images/bg.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/image/images/icons.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/image/images/icons.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/image/images/image.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/image/images/progress.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/image/images/success.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/image/images/success.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/insertframe/insertframe.html (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/internal.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/link/link.html (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/preview/preview.html (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/scrawl/images/addimg.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/scrawl/images/brush.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/scrawl/images/delimg.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/scrawl/images/delimgH.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/scrawl/images/empty.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/scrawl/images/emptyH.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/scrawl/images/eraser.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/scrawl/images/redo.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/scrawl/images/redoH.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/scrawl/images/scale.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/scrawl/images/scaleH.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/scrawl/images/size.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/scrawl/images/undo.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/scrawl/images/undoH.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/scrawl/scrawl.css (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/scrawl/scrawl.html (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/scrawl/scrawl.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/searchreplace/searchreplace.html (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/searchreplace/searchreplace.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/spechars/spechars.html (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/spechars/spechars.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/table/dragicon.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/table/edittable.css (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/table/edittable.html (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/table/edittable.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/table/edittd.html (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/table/edittip.html (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/template/config.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/template/images/bg.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/template/images/pre0.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/template/images/pre1.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/template/images/pre2.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/template/images/pre3.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/template/images/pre4.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/template/template.css (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/template/template.html (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/template/template.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/video/images/bg.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/video/images/center_focus.jpg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/video/images/file-icons.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/video/images/file-icons.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/video/images/icons.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/video/images/icons.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/video/images/image.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/video/images/left_focus.jpg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/video/images/none_focus.jpg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/video/images/progress.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/video/images/right_focus.jpg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/video/images/success.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/video/images/success.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/video/video.css (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/video/video.html (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/video/video.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/wordimage/wordimage.html (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/dialogs/wordimage/wordimage.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/index.html (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/lang/en/en.js (99%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/lang/en/images/addimage.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/lang/en/images/alldeletebtnhoverskin.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/lang/en/images/alldeletebtnupskin.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/lang/en/images/background.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/lang/en/images/button.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/lang/en/images/copy.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/lang/en/images/deletedisable.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/lang/en/images/deleteenable.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/lang/en/images/listbackground.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/lang/en/images/localimage.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/lang/en/images/music.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/lang/en/images/rotateleftdisable.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/lang/en/images/rotateleftenable.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/lang/en/images/rotaterightdisable.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/lang/en/images/rotaterightenable.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/lang/en/images/upload.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/lang/zh-cn/images/copy.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/lang/zh-cn/images/localimage.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/lang/zh-cn/images/music.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/lang/zh-cn/images/upload.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/lang/zh-cn/zh-cn.js (98%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/plugins/demo/demo.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/css/ueditor.css (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/dialog.css (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/dialogbase.css (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/ai.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/apk.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/chm.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/css.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/doc.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/docx.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/dwg.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/folder.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/gif.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/html.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/jpeg.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/jpg.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/log.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/mp3.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/mp4.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/pdf.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/png.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/ppt.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/pptx.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/psd.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/rar.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/svg.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/torrent.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/txt.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/unknown.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/xls.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/xlsx.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/exts/zip.svg (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/anchor.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/arrow.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/arrow_down.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/arrow_up.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/button-bg.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/cancelbutton.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/charts.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/cursor_h.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/cursor_h.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/cursor_v.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/cursor_v.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/dialog-title-bg.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/filescan.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/highlighted.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/icons-all.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/icons.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/icons.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/img-cracked.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/loaderror.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/loading.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/lock.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/neweditor-tab-bg.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/pagebreak.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/scale.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/sortable.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/spacer.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/sparator_v.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/table-cell-align.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/tangram-colorpicker.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/toolbar_bg.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/unhighlighted.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/upload.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/videologo.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/word.gif (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/default/images/wordpaste.png (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/themes/iframe.css (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/third-party/SyntaxHighlighter/shCore.js (98%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/third-party/SyntaxHighlighter/shCoreDefault.css (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/third-party/clipboard/clipboard.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/third-party/clipboard/clipboard.swf (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/third-party/codemirror/codemirror.css (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/third-party/codemirror/codemirror.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/third-party/jquery-1.10.2.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/third-party/webuploader/webuploader.css (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/third-party/webuploader/webuploader.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/third-party/zeroclipboard/ZeroClipboard.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/third-party/zeroclipboard/ZeroClipboard.swf (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/ueditor.all.js (99%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/ueditor.config.js (100%) rename ruoyi-ui/public/{UEditor => static/UEditorPlus}/ueditor.parse.js (100%) create mode 100644 ruoyi-ui/src/api/cms/editor.js diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/api/CMSCategoryAPI.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/api/CMSCategoryAPI.java new file mode 100644 index 0000000..0dc2927 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/api/CMSCategoryAPI.java @@ -0,0 +1,46 @@ +package com.ruoyi.cms.api; + +import com.ruoyi.cms.domain.CmsCategory; +import com.ruoyi.cms.service.ICmsCategoryService; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Anonymous +@RequestMapping("/api/category") +@RestController +public class CMSCategoryAPI extends BaseController { + + @Autowired + private ICmsCategoryService categoryService; + + /** + * 获取栏目及文章 + */ + @GetMapping("/list") + public AjaxResult getCategory(CmsCategory category){ + return success(categoryService.selectCmsCategoryTreeList(category)); + } + + /** + * 获取栏目下的子栏目及文章 + * @param id 顶层栏目ID + */ + @GetMapping("/{id}") + public AjaxResult getContents(@PathVariable Long id){ + return success(categoryService.selectCmsCategoryAndContentTreeList(id)); + } + + /** + * 获取某个子栏目的文章 + */ + @GetMapping("/content/{id}") + public AjaxResult getContentById(@PathVariable Long id){ + return success(categoryService.getContentById(id)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/api/CMSContentAPI.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/api/CMSContentAPI.java new file mode 100644 index 0000000..48ff7be --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/api/CMSContentAPI.java @@ -0,0 +1,31 @@ +package com.ruoyi.cms.api; + +import com.ruoyi.cms.service.ICmsContentService; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Anonymous +@RestController +@RequestMapping("/api/content") +public class CMSContentAPI extends BaseController { + + @Autowired + private ICmsContentService contentService; + + /** + * 文章详情 + * @param id + * @return + */ + @GetMapping("/{id}") + public AjaxResult getContentById(@PathVariable Long id){ + return success(contentService.selectCmsContentById(id)); + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/UeditorController.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/UeditorController.java index 0621053..1c775f6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/UeditorController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/UeditorController.java @@ -1,11 +1,17 @@ package com.ruoyi.cms.controller; +import cn.hutool.core.io.resource.ResourceUtil; import com.alibaba.fastjson2.JSON; import com.baidu.ueditor.ActionEnter; +import com.ruoyi.cms.service.ICmsCategoryService; import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.file.FileUploadUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.util.ClassUtils; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; @@ -22,6 +28,9 @@ import java.util.Map; @RequestMapping("/ueditor") public class UeditorController { + @Autowired + private ICmsCategoryService categoryService; + //配置ueditor后端上传接口的验证 @RequestMapping("/config") public String config(HttpServletRequest request, HttpServletResponse response, String action, MultipartFile[] upfile) throws IOException { @@ -48,7 +57,7 @@ public class UeditorController { result.put("title", upload.substring(upload.lastIndexOf("/")+1)); result.put("original", multipartFile.getOriginalFilename()); result.put("state", "SUCCESS"); - result.put("url", upload); + result.put("url", upload.substring(upload.indexOf("/") + 1)); String jStr = JSON.toJSONString(result); return jStr; } @@ -64,7 +73,7 @@ public class UeditorController { result.put("title", upload.substring(upload.lastIndexOf("/")+1)); result.put("original", multipartFile.getOriginalFilename()); result.put("state", "SUCCESS"); - result.put("url", upload); + result.put("url", upload.substring(upload.indexOf("/") + 1)); String jStr = JSON.toJSONString(result); return jStr; } @@ -77,11 +86,20 @@ public class UeditorController { result.put("title", upload.substring(upload.lastIndexOf("/")+1)); result.put("original", multipartFile.getOriginalFilename()); result.put("state", "SUCCESS"); - result.put("url", upload); + result.put("url", upload.substring(upload.indexOf("/") + 1)); String jStr = JSON.toJSONString(result); return jStr; } } return null; } + + /** + * 获取所有的叶子节点 + * @return + */ + @GetMapping("/leavesCategoryList") + public AjaxResult getLeavesCategoryList(){ + return AjaxResult.success(categoryService.getLeavesCategoryList()); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/CmsCategory.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/CmsCategory.java index 2cb16dc..a3e0cf5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/CmsCategory.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/CmsCategory.java @@ -1,10 +1,9 @@ package com.ruoyi.cms.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; @@ -54,5 +53,6 @@ public class CmsCategory extends BaseEntity /** 逻辑删除0未删除1真删除 */ private Integer delFlag; + @TableField(exist = false) private List children = new ArrayList(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/CmsContent.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/CmsContent.java index 7c5cc51..d681fb2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/CmsContent.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/CmsContent.java @@ -93,6 +93,12 @@ public class CmsContent extends BaseEntity @Excel(name = "附件路径") private String accessoryUrl; + /** 图片地址 */ + private String imageUrl; + + /** 视频地址 */ + private String videoUrl; + /** 逻辑删除0未删除1真删除 */ private Integer delFlag; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/CMSCategoryVo.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/CMSCategoryVo.java new file mode 100644 index 0000000..499c602 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/CMSCategoryVo.java @@ -0,0 +1,49 @@ +package com.ruoyi.cms.domain.vo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.github.pagehelper.PageInfo; +import com.ruoyi.cms.domain.CmsContent; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; + + +@Data +public class CMSCategoryVo extends BaseEntity { + + @JsonSerialize(using = ToStringSerializer.class) + /** 栏目ID */ + private Long id; + + /** 栏目名称 */ + @Excel(name = "栏目名称") + private String categoryName; + + /** 栏目排序(默认0) */ + @Excel(name = "栏目排序(默认0)") + private Long categorySort; + + /** 栏目路径 */ + @Excel(name = "栏目路径") + private String categoryUrl; + + @JsonSerialize(using = ToStringSerializer.class) + /** 父栏目ID */ + @Excel(name = "父栏目ID") + private Long parentId; + + /** 是否外链（0：否，1：是） */ + @Excel(name = "是否外链", readConverterExp = "0=：否，1：是") + private String isFrame; + + /** 是否显示(0：显示，1：不显示，默认0) */ + @Excel(name = "是否显示(0：显示，1：不显示，默认0)") + private String isDisable; + + /** 逻辑删除0未删除1真删除 */ + private Integer delFlag; + + /** 栏目下的文章 */ + private PageInfo children; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/ICmsCategoryService.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/ICmsCategoryService.java index 534dab5..8bd0cd7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/ICmsCategoryService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/ICmsCategoryService.java @@ -3,7 +3,10 @@ package com.ruoyi.cms.service; import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; +import com.github.pagehelper.PageInfo; import com.ruoyi.cms.domain.CmsCategory; +import com.ruoyi.cms.domain.CmsContent; +import com.ruoyi.cms.domain.vo.CMSCategoryVo; import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysMenu; @@ -95,4 +98,23 @@ public interface ICmsCategoryService extends IService * @return 下拉树结构列表 */ public List buildCmsCategoryTreeSelect(List categorys); + + /** + * 获取栏目下的子栏目及文章 + * @param id 顶层栏目ID + */ + List selectCmsCategoryAndContentTreeList(Long id); + + /** + * 按ID查文章 + * @param id + * @return + */ + public PageInfo getContentById(Long id); + + /** + * 获取所有的叶子节点 + * @return + */ + List getLeavesCategoryList(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/CmsCategoryServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/CmsCategoryServiceImpl.java index 3536c38..85b90ea 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/CmsCategoryServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/CmsCategoryServiceImpl.java @@ -5,9 +5,16 @@ import java.util.Iterator; import java.util.List; import java.util.stream.Collectors; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Snowflake; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.ruoyi.cms.core.NewTreeSelect; +import com.ruoyi.cms.domain.CmsContent; +import com.ruoyi.cms.domain.vo.CMSCategoryVo; +import com.ruoyi.cms.mapper.CmsContentMapper; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.utils.DateUtils; @@ -19,6 +26,8 @@ import com.ruoyi.cms.mapper.CmsCategoryMapper; import com.ruoyi.cms.domain.CmsCategory; import com.ruoyi.cms.service.ICmsCategoryService; +import javax.annotation.Resource; + /** * 栏目Service业务层处理 * @@ -31,6 +40,9 @@ public class CmsCategoryServiceImpl extends ServiceImpl 0; } + + /** + * 获取栏目下的子栏目及文章 + * @param id 顶层栏目ID + */ + @Override + public List selectCmsCategoryAndContentTreeList(Long id) { + List categories = baseMapper.selectList(new QueryWrapper().eq("parent_id", id)); + List categoryVoList = new ArrayList<>(); + for (CmsCategory category : categories){ + CMSCategoryVo categoryVo = new CMSCategoryVo(); + BeanUtil.copyProperties(category, categoryVo); + categoryVo.setChildren(getContentById(category.getId())); + categoryVoList.add(categoryVo); + } + return categoryVoList; + } + + /** + * 按ID查文章 + * @param id + * @return + */ + @Override + public PageInfo getContentById(Long id){ + PageHelper.startPage(1, 10); + List contents = contentMapper.selectList(new QueryWrapper().eq("category_id", id)); + return new PageInfo(contents); + } + + /** + * 获取所有的叶子节点 + * @return + */ + @Override + public List getLeavesCategoryList(){ + return baseMapper.selectList(new QueryWrapper().ne("parent_id", 0)); + } } diff --git a/ruoyi-admin/src/main/resources/config/config.json b/ruoyi-admin/src/main/resources/config/ueditor/config.json similarity index 98% rename from ruoyi-admin/src/main/resources/config/config.json rename to ruoyi-admin/src/main/resources/config/ueditor/config.json index 403be8e..614dafb 100644 --- a/ruoyi-admin/src/main/resources/config/config.json +++ b/ruoyi-admin/src/main/resources/config/ueditor/config.json @@ -3,7 +3,7 @@ "imageActionName": "uploadimage", /* 执行上传图片的action名称 */ "imageFieldName": "upfile", /* 提交的图片表单名称 */ "imageMaxSize": 2048000, /* 上传大小限制，单位B */ - "imageAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 上传图片格式显示 */ + "imageAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp", '.webp'], /* 上传图片格式显示 */ "imageCompressEnable": true, /* 是否压缩图片,默认是true */ "imageCompressBorder": 1600, /* 图片压缩最长边限制 */ "imageInsertAlign": "none", /* 插入的图片浮动方式 */ diff --git a/ruoyi-admin/src/main/resources/mapper/cms/CmsContentMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/CmsContentMapper.xml index b99bbf6..2f7c13f 100644 --- a/ruoyi-admin/src/main/resources/mapper/cms/CmsContentMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/cms/CmsContentMapper.xml @@ -28,10 +28,12 @@ + + - select id, category_id, content_type, content_title, content_img, content_detail, source, source_url, original, author, editor, summary, status, publish_date, offline_date, is_accessory, accessory_url, remark, del_flag, create_time, create_by, update_time, update_by from cms_content + select id, category_id, content_type,image_url, video_url content_title, content_img, content_detail, source, source_url, original, author, editor, summary, status, publish_date, offline_date, is_accessory, accessory_url, remark, del_flag, create_time, create_by, update_time, update_by from cms_content diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java index 15bf66b..7bdbf06 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java @@ -4,6 +4,8 @@ import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; + +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; @@ -19,6 +21,7 @@ public class BaseEntity implements Serializable /** 搜索值 */ @JsonIgnore + @TableField(exist = false) private String searchValue; /** 创建者 */ @@ -39,6 +42,7 @@ public class BaseEntity implements Serializable private String remark; /** 请求参数 */ + @TableField(exist = false) @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map params; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 511842b..23c7a87 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -115,7 +115,7 @@ public class SecurityConfig // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() - // 除上面外的所有请求全部需要鉴权认证 + // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated(); }) // 添加Logout filter diff --git a/ruoyi-ui/public/UEditor/dialogs/anchor/anchor.html b/ruoyi-ui/public/static/UEditorPlus/dialogs/anchor/anchor.html similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/anchor/anchor.html rename to ruoyi-ui/public/static/UEditorPlus/dialogs/anchor/anchor.html diff --git a/ruoyi-ui/public/UEditor/dialogs/attachment/attachment.css b/ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/attachment.css similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/attachment/attachment.css rename to ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/attachment.css diff --git a/ruoyi-ui/public/UEditor/dialogs/attachment/attachment.html b/ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/attachment.html similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/attachment/attachment.html rename to ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/attachment.html diff --git a/ruoyi-ui/public/UEditor/dialogs/attachment/attachment.js b/ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/attachment.js similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/attachment/attachment.js rename to ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/attachment.js diff --git a/ruoyi-ui/public/UEditor/dialogs/attachment/images/alignicon.gif b/ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/images/alignicon.gif similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/attachment/images/alignicon.gif rename to ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/images/alignicon.gif diff --git a/ruoyi-ui/public/UEditor/dialogs/attachment/images/alignicon.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/images/alignicon.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/attachment/images/alignicon.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/images/alignicon.png diff --git a/ruoyi-ui/public/UEditor/dialogs/attachment/images/bg.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/images/bg.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/attachment/images/bg.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/images/bg.png diff --git a/ruoyi-ui/public/UEditor/dialogs/attachment/images/file-icons.gif b/ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/images/file-icons.gif similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/attachment/images/file-icons.gif rename to ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/images/file-icons.gif diff --git a/ruoyi-ui/public/UEditor/dialogs/attachment/images/file-icons.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/images/file-icons.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/attachment/images/file-icons.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/images/file-icons.png diff --git a/ruoyi-ui/public/UEditor/dialogs/attachment/images/icons.gif b/ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/images/icons.gif similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/attachment/images/icons.gif rename to ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/images/icons.gif diff --git a/ruoyi-ui/public/UEditor/dialogs/attachment/images/icons.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/images/icons.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/attachment/images/icons.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/images/icons.png diff --git a/ruoyi-ui/public/UEditor/dialogs/attachment/images/image.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/images/image.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/attachment/images/image.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/images/image.png diff --git a/ruoyi-ui/public/UEditor/dialogs/attachment/images/progress.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/images/progress.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/attachment/images/progress.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/images/progress.png diff --git a/ruoyi-ui/public/UEditor/dialogs/attachment/images/success.gif b/ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/images/success.gif similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/attachment/images/success.gif rename to ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/images/success.gif diff --git a/ruoyi-ui/public/UEditor/dialogs/attachment/images/success.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/images/success.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/attachment/images/success.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/attachment/images/success.png diff --git a/ruoyi-ui/public/UEditor/dialogs/audio/audio.css b/ruoyi-ui/public/static/UEditorPlus/dialogs/audio/audio.css similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/audio/audio.css rename to ruoyi-ui/public/static/UEditorPlus/dialogs/audio/audio.css diff --git a/ruoyi-ui/public/UEditor/dialogs/audio/audio.html b/ruoyi-ui/public/static/UEditorPlus/dialogs/audio/audio.html similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/audio/audio.html rename to ruoyi-ui/public/static/UEditorPlus/dialogs/audio/audio.html diff --git a/ruoyi-ui/public/UEditor/dialogs/audio/audio.js b/ruoyi-ui/public/static/UEditorPlus/dialogs/audio/audio.js similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/audio/audio.js rename to ruoyi-ui/public/static/UEditorPlus/dialogs/audio/audio.js diff --git a/ruoyi-ui/public/UEditor/dialogs/audio/images/bg.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/bg.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/audio/images/bg.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/bg.png diff --git a/ruoyi-ui/public/UEditor/dialogs/audio/images/center_focus.jpg b/ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/center_focus.jpg similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/audio/images/center_focus.jpg rename to ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/center_focus.jpg diff --git a/ruoyi-ui/public/UEditor/dialogs/audio/images/file-icons.gif b/ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/file-icons.gif similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/audio/images/file-icons.gif rename to ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/file-icons.gif diff --git a/ruoyi-ui/public/UEditor/dialogs/audio/images/file-icons.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/file-icons.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/audio/images/file-icons.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/file-icons.png diff --git a/ruoyi-ui/public/UEditor/dialogs/audio/images/icons.gif b/ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/icons.gif similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/audio/images/icons.gif rename to ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/icons.gif diff --git a/ruoyi-ui/public/UEditor/dialogs/audio/images/icons.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/icons.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/audio/images/icons.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/icons.png diff --git a/ruoyi-ui/public/UEditor/dialogs/audio/images/image.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/image.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/audio/images/image.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/image.png diff --git a/ruoyi-ui/public/UEditor/dialogs/audio/images/left_focus.jpg b/ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/left_focus.jpg similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/audio/images/left_focus.jpg rename to ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/left_focus.jpg diff --git a/ruoyi-ui/public/UEditor/dialogs/audio/images/none_focus.jpg b/ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/none_focus.jpg similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/audio/images/none_focus.jpg rename to ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/none_focus.jpg diff --git a/ruoyi-ui/public/UEditor/dialogs/audio/images/progress.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/progress.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/audio/images/progress.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/progress.png diff --git a/ruoyi-ui/public/UEditor/dialogs/audio/images/right_focus.jpg b/ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/right_focus.jpg similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/audio/images/right_focus.jpg rename to ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/right_focus.jpg diff --git a/ruoyi-ui/public/UEditor/dialogs/audio/images/success.gif b/ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/success.gif similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/audio/images/success.gif rename to ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/success.gif diff --git a/ruoyi-ui/public/UEditor/dialogs/audio/images/success.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/success.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/audio/images/success.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/audio/images/success.png diff --git a/ruoyi-ui/public/UEditor/dialogs/background/background.css b/ruoyi-ui/public/static/UEditorPlus/dialogs/background/background.css similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/background/background.css rename to ruoyi-ui/public/static/UEditorPlus/dialogs/background/background.css diff --git a/ruoyi-ui/public/UEditor/dialogs/background/background.html b/ruoyi-ui/public/static/UEditorPlus/dialogs/background/background.html similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/background/background.html rename to ruoyi-ui/public/static/UEditorPlus/dialogs/background/background.html diff --git a/ruoyi-ui/public/UEditor/dialogs/background/background.js b/ruoyi-ui/public/static/UEditorPlus/dialogs/background/background.js similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/background/background.js rename to ruoyi-ui/public/static/UEditorPlus/dialogs/background/background.js diff --git a/ruoyi-ui/public/UEditor/dialogs/background/images/bg.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/background/images/bg.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/background/images/bg.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/background/images/bg.png diff --git a/ruoyi-ui/public/UEditor/dialogs/background/images/success.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/background/images/success.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/background/images/success.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/background/images/success.png diff --git a/ruoyi-ui/public/UEditor/dialogs/contentimport/contentimport.html b/ruoyi-ui/public/static/UEditorPlus/dialogs/contentimport/contentimport.html similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/contentimport/contentimport.html rename to ruoyi-ui/public/static/UEditorPlus/dialogs/contentimport/contentimport.html diff --git a/ruoyi-ui/public/UEditor/dialogs/contentimport/contentimport.js b/ruoyi-ui/public/static/UEditorPlus/dialogs/contentimport/contentimport.js similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/contentimport/contentimport.js rename to ruoyi-ui/public/static/UEditorPlus/dialogs/contentimport/contentimport.js diff --git a/ruoyi-ui/public/UEditor/dialogs/contentimport/mammoth.browser.min.js b/ruoyi-ui/public/static/UEditorPlus/dialogs/contentimport/mammoth.browser.min.js similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/contentimport/mammoth.browser.min.js rename to ruoyi-ui/public/static/UEditorPlus/dialogs/contentimport/mammoth.browser.min.js diff --git a/ruoyi-ui/public/UEditor/dialogs/contentimport/showdown.min.js b/ruoyi-ui/public/static/UEditorPlus/dialogs/contentimport/showdown.min.js similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/contentimport/showdown.min.js rename to ruoyi-ui/public/static/UEditorPlus/dialogs/contentimport/showdown.min.js diff --git a/ruoyi-ui/public/UEditor/dialogs/emotion/emotion.css b/ruoyi-ui/public/static/UEditorPlus/dialogs/emotion/emotion.css similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/emotion/emotion.css rename to ruoyi-ui/public/static/UEditorPlus/dialogs/emotion/emotion.css diff --git a/ruoyi-ui/public/UEditor/dialogs/emotion/emotion.html b/ruoyi-ui/public/static/UEditorPlus/dialogs/emotion/emotion.html similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/emotion/emotion.html rename to ruoyi-ui/public/static/UEditorPlus/dialogs/emotion/emotion.html diff --git a/ruoyi-ui/public/UEditor/dialogs/emotion/emotion.js b/ruoyi-ui/public/static/UEditorPlus/dialogs/emotion/emotion.js similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/emotion/emotion.js rename to ruoyi-ui/public/static/UEditorPlus/dialogs/emotion/emotion.js diff --git a/ruoyi-ui/public/UEditor/dialogs/emotion/images/0.gif b/ruoyi-ui/public/static/UEditorPlus/dialogs/emotion/images/0.gif similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/emotion/images/0.gif rename to ruoyi-ui/public/static/UEditorPlus/dialogs/emotion/images/0.gif diff --git a/ruoyi-ui/public/UEditor/dialogs/emotion/images/bface.gif b/ruoyi-ui/public/static/UEditorPlus/dialogs/emotion/images/bface.gif similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/emotion/images/bface.gif rename to ruoyi-ui/public/static/UEditorPlus/dialogs/emotion/images/bface.gif diff --git a/ruoyi-ui/public/UEditor/dialogs/emotion/images/cface.gif b/ruoyi-ui/public/static/UEditorPlus/dialogs/emotion/images/cface.gif similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/emotion/images/cface.gif rename to ruoyi-ui/public/static/UEditorPlus/dialogs/emotion/images/cface.gif diff --git a/ruoyi-ui/public/UEditor/dialogs/emotion/images/fface.gif b/ruoyi-ui/public/static/UEditorPlus/dialogs/emotion/images/fface.gif similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/emotion/images/fface.gif rename to ruoyi-ui/public/static/UEditorPlus/dialogs/emotion/images/fface.gif diff --git a/ruoyi-ui/public/UEditor/dialogs/emotion/images/jxface2.gif b/ruoyi-ui/public/static/UEditorPlus/dialogs/emotion/images/jxface2.gif similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/emotion/images/jxface2.gif rename to ruoyi-ui/public/static/UEditorPlus/dialogs/emotion/images/jxface2.gif diff --git a/ruoyi-ui/public/UEditor/dialogs/emotion/images/neweditor-tab-bg.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/emotion/images/neweditor-tab-bg.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/emotion/images/neweditor-tab-bg.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/emotion/images/neweditor-tab-bg.png diff --git a/ruoyi-ui/public/UEditor/dialogs/emotion/images/tface.gif b/ruoyi-ui/public/static/UEditorPlus/dialogs/emotion/images/tface.gif similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/emotion/images/tface.gif rename to ruoyi-ui/public/static/UEditorPlus/dialogs/emotion/images/tface.gif diff --git a/ruoyi-ui/public/UEditor/dialogs/emotion/images/wface.gif b/ruoyi-ui/public/static/UEditorPlus/dialogs/emotion/images/wface.gif similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/emotion/images/wface.gif rename to ruoyi-ui/public/static/UEditorPlus/dialogs/emotion/images/wface.gif diff --git a/ruoyi-ui/public/UEditor/dialogs/emotion/images/yface.gif b/ruoyi-ui/public/static/UEditorPlus/dialogs/emotion/images/yface.gif similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/emotion/images/yface.gif rename to ruoyi-ui/public/static/UEditorPlus/dialogs/emotion/images/yface.gif diff --git a/ruoyi-ui/public/UEditor/dialogs/formula/formula.html b/ruoyi-ui/public/static/UEditorPlus/dialogs/formula/formula.html similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/formula/formula.html rename to ruoyi-ui/public/static/UEditorPlus/dialogs/formula/formula.html diff --git a/ruoyi-ui/public/UEditor/dialogs/formula/formula.js b/ruoyi-ui/public/static/UEditorPlus/dialogs/formula/formula.js similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/formula/formula.js rename to ruoyi-ui/public/static/UEditorPlus/dialogs/formula/formula.js diff --git a/ruoyi-ui/public/UEditor/dialogs/help/help.css b/ruoyi-ui/public/static/UEditorPlus/dialogs/help/help.css similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/help/help.css rename to ruoyi-ui/public/static/UEditorPlus/dialogs/help/help.css diff --git a/ruoyi-ui/public/UEditor/dialogs/help/help.html b/ruoyi-ui/public/static/UEditorPlus/dialogs/help/help.html similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/help/help.html rename to ruoyi-ui/public/static/UEditorPlus/dialogs/help/help.html diff --git a/ruoyi-ui/public/UEditor/dialogs/help/help.js b/ruoyi-ui/public/static/UEditorPlus/dialogs/help/help.js similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/help/help.js rename to ruoyi-ui/public/static/UEditorPlus/dialogs/help/help.js diff --git a/ruoyi-ui/public/UEditor/dialogs/image/image.css b/ruoyi-ui/public/static/UEditorPlus/dialogs/image/image.css similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/image/image.css rename to ruoyi-ui/public/static/UEditorPlus/dialogs/image/image.css diff --git a/ruoyi-ui/public/UEditor/dialogs/image/image.html b/ruoyi-ui/public/static/UEditorPlus/dialogs/image/image.html similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/image/image.html rename to ruoyi-ui/public/static/UEditorPlus/dialogs/image/image.html diff --git a/ruoyi-ui/public/UEditor/dialogs/image/image.js b/ruoyi-ui/public/static/UEditorPlus/dialogs/image/image.js similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/image/image.js rename to ruoyi-ui/public/static/UEditorPlus/dialogs/image/image.js diff --git a/ruoyi-ui/public/UEditor/dialogs/image/images/alignicon.jpg b/ruoyi-ui/public/static/UEditorPlus/dialogs/image/images/alignicon.jpg similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/image/images/alignicon.jpg rename to ruoyi-ui/public/static/UEditorPlus/dialogs/image/images/alignicon.jpg diff --git a/ruoyi-ui/public/UEditor/dialogs/image/images/bg.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/image/images/bg.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/image/images/bg.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/image/images/bg.png diff --git a/ruoyi-ui/public/UEditor/dialogs/image/images/icons.gif b/ruoyi-ui/public/static/UEditorPlus/dialogs/image/images/icons.gif similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/image/images/icons.gif rename to ruoyi-ui/public/static/UEditorPlus/dialogs/image/images/icons.gif diff --git a/ruoyi-ui/public/UEditor/dialogs/image/images/icons.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/image/images/icons.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/image/images/icons.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/image/images/icons.png diff --git a/ruoyi-ui/public/UEditor/dialogs/image/images/image.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/image/images/image.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/image/images/image.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/image/images/image.png diff --git a/ruoyi-ui/public/UEditor/dialogs/image/images/progress.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/image/images/progress.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/image/images/progress.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/image/images/progress.png diff --git a/ruoyi-ui/public/UEditor/dialogs/image/images/success.gif b/ruoyi-ui/public/static/UEditorPlus/dialogs/image/images/success.gif similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/image/images/success.gif rename to ruoyi-ui/public/static/UEditorPlus/dialogs/image/images/success.gif diff --git a/ruoyi-ui/public/UEditor/dialogs/image/images/success.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/image/images/success.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/image/images/success.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/image/images/success.png diff --git a/ruoyi-ui/public/UEditor/dialogs/insertframe/insertframe.html b/ruoyi-ui/public/static/UEditorPlus/dialogs/insertframe/insertframe.html similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/insertframe/insertframe.html rename to ruoyi-ui/public/static/UEditorPlus/dialogs/insertframe/insertframe.html diff --git a/ruoyi-ui/public/UEditor/dialogs/internal.js b/ruoyi-ui/public/static/UEditorPlus/dialogs/internal.js similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/internal.js rename to ruoyi-ui/public/static/UEditorPlus/dialogs/internal.js diff --git a/ruoyi-ui/public/UEditor/dialogs/link/link.html b/ruoyi-ui/public/static/UEditorPlus/dialogs/link/link.html similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/link/link.html rename to ruoyi-ui/public/static/UEditorPlus/dialogs/link/link.html diff --git a/ruoyi-ui/public/UEditor/dialogs/preview/preview.html b/ruoyi-ui/public/static/UEditorPlus/dialogs/preview/preview.html similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/preview/preview.html rename to ruoyi-ui/public/static/UEditorPlus/dialogs/preview/preview.html diff --git a/ruoyi-ui/public/UEditor/dialogs/scrawl/images/addimg.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/addimg.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/scrawl/images/addimg.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/addimg.png diff --git a/ruoyi-ui/public/UEditor/dialogs/scrawl/images/brush.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/brush.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/scrawl/images/brush.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/brush.png diff --git a/ruoyi-ui/public/UEditor/dialogs/scrawl/images/delimg.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/delimg.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/scrawl/images/delimg.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/delimg.png diff --git a/ruoyi-ui/public/UEditor/dialogs/scrawl/images/delimgH.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/delimgH.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/scrawl/images/delimgH.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/delimgH.png diff --git a/ruoyi-ui/public/UEditor/dialogs/scrawl/images/empty.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/empty.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/scrawl/images/empty.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/empty.png diff --git a/ruoyi-ui/public/UEditor/dialogs/scrawl/images/emptyH.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/emptyH.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/scrawl/images/emptyH.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/emptyH.png diff --git a/ruoyi-ui/public/UEditor/dialogs/scrawl/images/eraser.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/eraser.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/scrawl/images/eraser.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/eraser.png diff --git a/ruoyi-ui/public/UEditor/dialogs/scrawl/images/redo.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/redo.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/scrawl/images/redo.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/redo.png diff --git a/ruoyi-ui/public/UEditor/dialogs/scrawl/images/redoH.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/redoH.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/scrawl/images/redoH.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/redoH.png diff --git a/ruoyi-ui/public/UEditor/dialogs/scrawl/images/scale.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/scale.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/scrawl/images/scale.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/scale.png diff --git a/ruoyi-ui/public/UEditor/dialogs/scrawl/images/scaleH.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/scaleH.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/scrawl/images/scaleH.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/scaleH.png diff --git a/ruoyi-ui/public/UEditor/dialogs/scrawl/images/size.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/size.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/scrawl/images/size.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/size.png diff --git a/ruoyi-ui/public/UEditor/dialogs/scrawl/images/undo.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/undo.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/scrawl/images/undo.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/undo.png diff --git a/ruoyi-ui/public/UEditor/dialogs/scrawl/images/undoH.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/undoH.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/scrawl/images/undoH.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/images/undoH.png diff --git a/ruoyi-ui/public/UEditor/dialogs/scrawl/scrawl.css b/ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/scrawl.css similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/scrawl/scrawl.css rename to ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/scrawl.css diff --git a/ruoyi-ui/public/UEditor/dialogs/scrawl/scrawl.html b/ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/scrawl.html similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/scrawl/scrawl.html rename to ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/scrawl.html diff --git a/ruoyi-ui/public/UEditor/dialogs/scrawl/scrawl.js b/ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/scrawl.js similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/scrawl/scrawl.js rename to ruoyi-ui/public/static/UEditorPlus/dialogs/scrawl/scrawl.js diff --git a/ruoyi-ui/public/UEditor/dialogs/searchreplace/searchreplace.html b/ruoyi-ui/public/static/UEditorPlus/dialogs/searchreplace/searchreplace.html similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/searchreplace/searchreplace.html rename to ruoyi-ui/public/static/UEditorPlus/dialogs/searchreplace/searchreplace.html diff --git a/ruoyi-ui/public/UEditor/dialogs/searchreplace/searchreplace.js b/ruoyi-ui/public/static/UEditorPlus/dialogs/searchreplace/searchreplace.js similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/searchreplace/searchreplace.js rename to ruoyi-ui/public/static/UEditorPlus/dialogs/searchreplace/searchreplace.js diff --git a/ruoyi-ui/public/UEditor/dialogs/spechars/spechars.html b/ruoyi-ui/public/static/UEditorPlus/dialogs/spechars/spechars.html similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/spechars/spechars.html rename to ruoyi-ui/public/static/UEditorPlus/dialogs/spechars/spechars.html diff --git a/ruoyi-ui/public/UEditor/dialogs/spechars/spechars.js b/ruoyi-ui/public/static/UEditorPlus/dialogs/spechars/spechars.js similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/spechars/spechars.js rename to ruoyi-ui/public/static/UEditorPlus/dialogs/spechars/spechars.js diff --git a/ruoyi-ui/public/UEditor/dialogs/table/dragicon.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/table/dragicon.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/table/dragicon.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/table/dragicon.png diff --git a/ruoyi-ui/public/UEditor/dialogs/table/edittable.css b/ruoyi-ui/public/static/UEditorPlus/dialogs/table/edittable.css similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/table/edittable.css rename to ruoyi-ui/public/static/UEditorPlus/dialogs/table/edittable.css diff --git a/ruoyi-ui/public/UEditor/dialogs/table/edittable.html b/ruoyi-ui/public/static/UEditorPlus/dialogs/table/edittable.html similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/table/edittable.html rename to ruoyi-ui/public/static/UEditorPlus/dialogs/table/edittable.html diff --git a/ruoyi-ui/public/UEditor/dialogs/table/edittable.js b/ruoyi-ui/public/static/UEditorPlus/dialogs/table/edittable.js similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/table/edittable.js rename to ruoyi-ui/public/static/UEditorPlus/dialogs/table/edittable.js diff --git a/ruoyi-ui/public/UEditor/dialogs/table/edittd.html b/ruoyi-ui/public/static/UEditorPlus/dialogs/table/edittd.html similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/table/edittd.html rename to ruoyi-ui/public/static/UEditorPlus/dialogs/table/edittd.html diff --git a/ruoyi-ui/public/UEditor/dialogs/table/edittip.html b/ruoyi-ui/public/static/UEditorPlus/dialogs/table/edittip.html similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/table/edittip.html rename to ruoyi-ui/public/static/UEditorPlus/dialogs/table/edittip.html diff --git a/ruoyi-ui/public/UEditor/dialogs/template/config.js b/ruoyi-ui/public/static/UEditorPlus/dialogs/template/config.js similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/template/config.js rename to ruoyi-ui/public/static/UEditorPlus/dialogs/template/config.js diff --git a/ruoyi-ui/public/UEditor/dialogs/template/images/bg.gif b/ruoyi-ui/public/static/UEditorPlus/dialogs/template/images/bg.gif similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/template/images/bg.gif rename to ruoyi-ui/public/static/UEditorPlus/dialogs/template/images/bg.gif diff --git a/ruoyi-ui/public/UEditor/dialogs/template/images/pre0.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/template/images/pre0.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/template/images/pre0.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/template/images/pre0.png diff --git a/ruoyi-ui/public/UEditor/dialogs/template/images/pre1.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/template/images/pre1.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/template/images/pre1.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/template/images/pre1.png diff --git a/ruoyi-ui/public/UEditor/dialogs/template/images/pre2.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/template/images/pre2.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/template/images/pre2.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/template/images/pre2.png diff --git a/ruoyi-ui/public/UEditor/dialogs/template/images/pre3.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/template/images/pre3.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/template/images/pre3.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/template/images/pre3.png diff --git a/ruoyi-ui/public/UEditor/dialogs/template/images/pre4.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/template/images/pre4.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/template/images/pre4.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/template/images/pre4.png diff --git a/ruoyi-ui/public/UEditor/dialogs/template/template.css b/ruoyi-ui/public/static/UEditorPlus/dialogs/template/template.css similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/template/template.css rename to ruoyi-ui/public/static/UEditorPlus/dialogs/template/template.css diff --git a/ruoyi-ui/public/UEditor/dialogs/template/template.html b/ruoyi-ui/public/static/UEditorPlus/dialogs/template/template.html similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/template/template.html rename to ruoyi-ui/public/static/UEditorPlus/dialogs/template/template.html diff --git a/ruoyi-ui/public/UEditor/dialogs/template/template.js b/ruoyi-ui/public/static/UEditorPlus/dialogs/template/template.js similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/template/template.js rename to ruoyi-ui/public/static/UEditorPlus/dialogs/template/template.js diff --git a/ruoyi-ui/public/UEditor/dialogs/video/images/bg.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/bg.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/video/images/bg.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/bg.png diff --git a/ruoyi-ui/public/UEditor/dialogs/video/images/center_focus.jpg b/ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/center_focus.jpg similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/video/images/center_focus.jpg rename to ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/center_focus.jpg diff --git a/ruoyi-ui/public/UEditor/dialogs/video/images/file-icons.gif b/ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/file-icons.gif similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/video/images/file-icons.gif rename to ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/file-icons.gif diff --git a/ruoyi-ui/public/UEditor/dialogs/video/images/file-icons.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/file-icons.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/video/images/file-icons.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/file-icons.png diff --git a/ruoyi-ui/public/UEditor/dialogs/video/images/icons.gif b/ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/icons.gif similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/video/images/icons.gif rename to ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/icons.gif diff --git a/ruoyi-ui/public/UEditor/dialogs/video/images/icons.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/icons.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/video/images/icons.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/icons.png diff --git a/ruoyi-ui/public/UEditor/dialogs/video/images/image.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/image.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/video/images/image.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/image.png diff --git a/ruoyi-ui/public/UEditor/dialogs/video/images/left_focus.jpg b/ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/left_focus.jpg similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/video/images/left_focus.jpg rename to ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/left_focus.jpg diff --git a/ruoyi-ui/public/UEditor/dialogs/video/images/none_focus.jpg b/ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/none_focus.jpg similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/video/images/none_focus.jpg rename to ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/none_focus.jpg diff --git a/ruoyi-ui/public/UEditor/dialogs/video/images/progress.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/progress.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/video/images/progress.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/progress.png diff --git a/ruoyi-ui/public/UEditor/dialogs/video/images/right_focus.jpg b/ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/right_focus.jpg similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/video/images/right_focus.jpg rename to ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/right_focus.jpg diff --git a/ruoyi-ui/public/UEditor/dialogs/video/images/success.gif b/ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/success.gif similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/video/images/success.gif rename to ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/success.gif diff --git a/ruoyi-ui/public/UEditor/dialogs/video/images/success.png b/ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/success.png similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/video/images/success.png rename to ruoyi-ui/public/static/UEditorPlus/dialogs/video/images/success.png diff --git a/ruoyi-ui/public/UEditor/dialogs/video/video.css b/ruoyi-ui/public/static/UEditorPlus/dialogs/video/video.css similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/video/video.css rename to ruoyi-ui/public/static/UEditorPlus/dialogs/video/video.css diff --git a/ruoyi-ui/public/UEditor/dialogs/video/video.html b/ruoyi-ui/public/static/UEditorPlus/dialogs/video/video.html similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/video/video.html rename to ruoyi-ui/public/static/UEditorPlus/dialogs/video/video.html diff --git a/ruoyi-ui/public/UEditor/dialogs/video/video.js b/ruoyi-ui/public/static/UEditorPlus/dialogs/video/video.js similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/video/video.js rename to ruoyi-ui/public/static/UEditorPlus/dialogs/video/video.js diff --git a/ruoyi-ui/public/UEditor/dialogs/wordimage/wordimage.html b/ruoyi-ui/public/static/UEditorPlus/dialogs/wordimage/wordimage.html similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/wordimage/wordimage.html rename to ruoyi-ui/public/static/UEditorPlus/dialogs/wordimage/wordimage.html diff --git a/ruoyi-ui/public/UEditor/dialogs/wordimage/wordimage.js b/ruoyi-ui/public/static/UEditorPlus/dialogs/wordimage/wordimage.js similarity index 100% rename from ruoyi-ui/public/UEditor/dialogs/wordimage/wordimage.js rename to ruoyi-ui/public/static/UEditorPlus/dialogs/wordimage/wordimage.js diff --git a/ruoyi-ui/public/UEditor/index.html b/ruoyi-ui/public/static/UEditorPlus/index.html similarity index 100% rename from ruoyi-ui/public/UEditor/index.html rename to ruoyi-ui/public/static/UEditorPlus/index.html diff --git a/ruoyi-ui/public/UEditor/lang/en/en.js b/ruoyi-ui/public/static/UEditorPlus/lang/en/en.js similarity index 99% rename from ruoyi-ui/public/UEditor/lang/en/en.js rename to ruoyi-ui/public/static/UEditorPlus/lang/en/en.js index 7ba4a56..6435bdb 100644 --- a/ruoyi-ui/public/UEditor/lang/en/en.js +++ b/ruoyi-ui/public/static/UEditorPlus/lang/en/en.js @@ -545,9 +545,9 @@ UE.I18N['en'] = { }, help: { 'static': { - 'lang_input_about': 'About UEditor Plus', + 'lang_input_about': 'About UEditorPlus Plus', 'lang_input_shortcuts': 'Shortcuts', - 'lang_input_introduction': "UEditor Plus is based on UEditor.", + 'lang_input_introduction': "UEditorPlus Plus is based on UEditorPlus.", 'lang_Txt_shortcuts': 'Shortcuts', 'lang_Txt_func': 'Function', 'lang_Txt_bold': 'Bold', diff --git a/ruoyi-ui/public/UEditor/lang/en/images/addimage.png b/ruoyi-ui/public/static/UEditorPlus/lang/en/images/addimage.png similarity index 100% rename from ruoyi-ui/public/UEditor/lang/en/images/addimage.png rename to ruoyi-ui/public/static/UEditorPlus/lang/en/images/addimage.png diff --git a/ruoyi-ui/public/UEditor/lang/en/images/alldeletebtnhoverskin.png b/ruoyi-ui/public/static/UEditorPlus/lang/en/images/alldeletebtnhoverskin.png similarity index 100% rename from ruoyi-ui/public/UEditor/lang/en/images/alldeletebtnhoverskin.png rename to ruoyi-ui/public/static/UEditorPlus/lang/en/images/alldeletebtnhoverskin.png diff --git a/ruoyi-ui/public/UEditor/lang/en/images/alldeletebtnupskin.png b/ruoyi-ui/public/static/UEditorPlus/lang/en/images/alldeletebtnupskin.png similarity index 100% rename from ruoyi-ui/public/UEditor/lang/en/images/alldeletebtnupskin.png rename to ruoyi-ui/public/static/UEditorPlus/lang/en/images/alldeletebtnupskin.png diff --git a/ruoyi-ui/public/UEditor/lang/en/images/background.png b/ruoyi-ui/public/static/UEditorPlus/lang/en/images/background.png similarity index 100% rename from ruoyi-ui/public/UEditor/lang/en/images/background.png rename to ruoyi-ui/public/static/UEditorPlus/lang/en/images/background.png diff --git a/ruoyi-ui/public/UEditor/lang/en/images/button.png b/ruoyi-ui/public/static/UEditorPlus/lang/en/images/button.png similarity index 100% rename from ruoyi-ui/public/UEditor/lang/en/images/button.png rename to ruoyi-ui/public/static/UEditorPlus/lang/en/images/button.png diff --git a/ruoyi-ui/public/UEditor/lang/en/images/copy.png b/ruoyi-ui/public/static/UEditorPlus/lang/en/images/copy.png similarity index 100% rename from ruoyi-ui/public/UEditor/lang/en/images/copy.png rename to ruoyi-ui/public/static/UEditorPlus/lang/en/images/copy.png diff --git a/ruoyi-ui/public/UEditor/lang/en/images/deletedisable.png b/ruoyi-ui/public/static/UEditorPlus/lang/en/images/deletedisable.png similarity index 100% rename from ruoyi-ui/public/UEditor/lang/en/images/deletedisable.png rename to ruoyi-ui/public/static/UEditorPlus/lang/en/images/deletedisable.png diff --git a/ruoyi-ui/public/UEditor/lang/en/images/deleteenable.png b/ruoyi-ui/public/static/UEditorPlus/lang/en/images/deleteenable.png similarity index 100% rename from ruoyi-ui/public/UEditor/lang/en/images/deleteenable.png rename to ruoyi-ui/public/static/UEditorPlus/lang/en/images/deleteenable.png diff --git a/ruoyi-ui/public/UEditor/lang/en/images/listbackground.png b/ruoyi-ui/public/static/UEditorPlus/lang/en/images/listbackground.png similarity index 100% rename from ruoyi-ui/public/UEditor/lang/en/images/listbackground.png rename to ruoyi-ui/public/static/UEditorPlus/lang/en/images/listbackground.png diff --git a/ruoyi-ui/public/UEditor/lang/en/images/localimage.png b/ruoyi-ui/public/static/UEditorPlus/lang/en/images/localimage.png similarity index 100% rename from ruoyi-ui/public/UEditor/lang/en/images/localimage.png rename to ruoyi-ui/public/static/UEditorPlus/lang/en/images/localimage.png diff --git a/ruoyi-ui/public/UEditor/lang/en/images/music.png b/ruoyi-ui/public/static/UEditorPlus/lang/en/images/music.png similarity index 100% rename from ruoyi-ui/public/UEditor/lang/en/images/music.png rename to ruoyi-ui/public/static/UEditorPlus/lang/en/images/music.png diff --git a/ruoyi-ui/public/UEditor/lang/en/images/rotateleftdisable.png b/ruoyi-ui/public/static/UEditorPlus/lang/en/images/rotateleftdisable.png similarity index 100% rename from ruoyi-ui/public/UEditor/lang/en/images/rotateleftdisable.png rename to ruoyi-ui/public/static/UEditorPlus/lang/en/images/rotateleftdisable.png diff --git a/ruoyi-ui/public/UEditor/lang/en/images/rotateleftenable.png b/ruoyi-ui/public/static/UEditorPlus/lang/en/images/rotateleftenable.png similarity index 100% rename from ruoyi-ui/public/UEditor/lang/en/images/rotateleftenable.png rename to ruoyi-ui/public/static/UEditorPlus/lang/en/images/rotateleftenable.png diff --git a/ruoyi-ui/public/UEditor/lang/en/images/rotaterightdisable.png b/ruoyi-ui/public/static/UEditorPlus/lang/en/images/rotaterightdisable.png similarity index 100% rename from ruoyi-ui/public/UEditor/lang/en/images/rotaterightdisable.png rename to ruoyi-ui/public/static/UEditorPlus/lang/en/images/rotaterightdisable.png diff --git a/ruoyi-ui/public/UEditor/lang/en/images/rotaterightenable.png b/ruoyi-ui/public/static/UEditorPlus/lang/en/images/rotaterightenable.png similarity index 100% rename from ruoyi-ui/public/UEditor/lang/en/images/rotaterightenable.png rename to ruoyi-ui/public/static/UEditorPlus/lang/en/images/rotaterightenable.png diff --git a/ruoyi-ui/public/UEditor/lang/en/images/upload.png b/ruoyi-ui/public/static/UEditorPlus/lang/en/images/upload.png similarity index 100% rename from ruoyi-ui/public/UEditor/lang/en/images/upload.png rename to ruoyi-ui/public/static/UEditorPlus/lang/en/images/upload.png diff --git a/ruoyi-ui/public/UEditor/lang/zh-cn/images/copy.png b/ruoyi-ui/public/static/UEditorPlus/lang/zh-cn/images/copy.png similarity index 100% rename from ruoyi-ui/public/UEditor/lang/zh-cn/images/copy.png rename to ruoyi-ui/public/static/UEditorPlus/lang/zh-cn/images/copy.png diff --git a/ruoyi-ui/public/UEditor/lang/zh-cn/images/localimage.png b/ruoyi-ui/public/static/UEditorPlus/lang/zh-cn/images/localimage.png similarity index 100% rename from ruoyi-ui/public/UEditor/lang/zh-cn/images/localimage.png rename to ruoyi-ui/public/static/UEditorPlus/lang/zh-cn/images/localimage.png diff --git a/ruoyi-ui/public/UEditor/lang/zh-cn/images/music.png b/ruoyi-ui/public/static/UEditorPlus/lang/zh-cn/images/music.png similarity index 100% rename from ruoyi-ui/public/UEditor/lang/zh-cn/images/music.png rename to ruoyi-ui/public/static/UEditorPlus/lang/zh-cn/images/music.png diff --git a/ruoyi-ui/public/UEditor/lang/zh-cn/images/upload.png b/ruoyi-ui/public/static/UEditorPlus/lang/zh-cn/images/upload.png similarity index 100% rename from ruoyi-ui/public/UEditor/lang/zh-cn/images/upload.png rename to ruoyi-ui/public/static/UEditorPlus/lang/zh-cn/images/upload.png diff --git a/ruoyi-ui/public/UEditor/lang/zh-cn/zh-cn.js b/ruoyi-ui/public/static/UEditorPlus/lang/zh-cn/zh-cn.js similarity index 98% rename from ruoyi-ui/public/UEditor/lang/zh-cn/zh-cn.js rename to ruoyi-ui/public/static/UEditorPlus/lang/zh-cn/zh-cn.js index a49e91d..bec0fbe 100644 --- a/ruoyi-ui/public/UEditor/lang/zh-cn/zh-cn.js +++ b/ruoyi-ui/public/static/UEditorPlus/lang/zh-cn/zh-cn.js @@ -625,9 +625,9 @@ UE.I18N['zh-cn'] = { }, 'help': { 'static': { - 'lang_input_about': '关于 UEditor Plus', + 'lang_input_about': '关于 UEditorPlus Plus', 'lang_input_shortcuts': '快捷键', - 'lang_input_introduction': 'UEditor Plus 是基于百度UEditor二次开发的所见即所得富文本web编辑器，主要丰富也界面样式，注重用户体验等特点。基于Apache 2.0协议开源，允许自由使用和修改代码。', + 'lang_input_introduction': 'UEditorPlus Plus 是基于百度UEditor二次开发的所见即所得富文本web编辑器，主要丰富也界面样式，注重用户体验等特点。基于Apache 2.0协议开源，允许自由使用和修改代码。', 'lang_Txt_shortcuts': '快捷键', 'lang_Txt_func': '功能', 'lang_Txt_bold': '给选中字设置为加粗', diff --git a/ruoyi-ui/public/UEditor/plugins/demo/demo.js b/ruoyi-ui/public/static/UEditorPlus/plugins/demo/demo.js similarity index 100% rename from ruoyi-ui/public/UEditor/plugins/demo/demo.js rename to ruoyi-ui/public/static/UEditorPlus/plugins/demo/demo.js diff --git a/ruoyi-ui/public/UEditor/themes/default/css/ueditor.css b/ruoyi-ui/public/static/UEditorPlus/themes/default/css/ueditor.css similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/css/ueditor.css rename to ruoyi-ui/public/static/UEditorPlus/themes/default/css/ueditor.css diff --git a/ruoyi-ui/public/UEditor/themes/default/dialog.css b/ruoyi-ui/public/static/UEditorPlus/themes/default/dialog.css similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/dialog.css rename to ruoyi-ui/public/static/UEditorPlus/themes/default/dialog.css diff --git a/ruoyi-ui/public/UEditor/themes/default/dialogbase.css b/ruoyi-ui/public/static/UEditorPlus/themes/default/dialogbase.css similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/dialogbase.css rename to ruoyi-ui/public/static/UEditorPlus/themes/default/dialogbase.css diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/ai.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/ai.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/ai.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/ai.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/apk.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/apk.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/apk.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/apk.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/chm.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/chm.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/chm.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/chm.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/css.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/css.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/css.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/css.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/doc.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/doc.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/doc.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/doc.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/docx.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/docx.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/docx.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/docx.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/dwg.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/dwg.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/dwg.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/dwg.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/folder.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/folder.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/folder.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/folder.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/gif.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/gif.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/gif.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/gif.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/html.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/html.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/html.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/html.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/jpeg.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/jpeg.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/jpeg.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/jpeg.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/jpg.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/jpg.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/jpg.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/jpg.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/log.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/log.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/log.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/log.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/mp3.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/mp3.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/mp3.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/mp3.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/mp4.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/mp4.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/mp4.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/mp4.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/pdf.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/pdf.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/pdf.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/pdf.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/png.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/png.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/png.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/png.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/ppt.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/ppt.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/ppt.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/ppt.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/pptx.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/pptx.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/pptx.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/pptx.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/psd.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/psd.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/psd.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/psd.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/rar.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/rar.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/rar.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/rar.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/svg.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/svg.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/svg.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/svg.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/torrent.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/torrent.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/torrent.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/torrent.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/txt.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/txt.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/txt.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/txt.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/unknown.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/unknown.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/unknown.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/unknown.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/xls.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/xls.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/xls.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/xls.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/xlsx.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/xlsx.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/xlsx.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/xlsx.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/exts/zip.svg b/ruoyi-ui/public/static/UEditorPlus/themes/default/exts/zip.svg similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/exts/zip.svg rename to ruoyi-ui/public/static/UEditorPlus/themes/default/exts/zip.svg diff --git a/ruoyi-ui/public/UEditor/themes/default/images/anchor.gif b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/anchor.gif similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/anchor.gif rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/anchor.gif diff --git a/ruoyi-ui/public/UEditor/themes/default/images/arrow.png b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/arrow.png similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/arrow.png rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/arrow.png diff --git a/ruoyi-ui/public/UEditor/themes/default/images/arrow_down.png b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/arrow_down.png similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/arrow_down.png rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/arrow_down.png diff --git a/ruoyi-ui/public/UEditor/themes/default/images/arrow_up.png b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/arrow_up.png similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/arrow_up.png rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/arrow_up.png diff --git a/ruoyi-ui/public/UEditor/themes/default/images/button-bg.gif b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/button-bg.gif similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/button-bg.gif rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/button-bg.gif diff --git a/ruoyi-ui/public/UEditor/themes/default/images/cancelbutton.gif b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/cancelbutton.gif similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/cancelbutton.gif rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/cancelbutton.gif diff --git a/ruoyi-ui/public/UEditor/themes/default/images/charts.png b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/charts.png similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/charts.png rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/charts.png diff --git a/ruoyi-ui/public/UEditor/themes/default/images/cursor_h.gif b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/cursor_h.gif similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/cursor_h.gif rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/cursor_h.gif diff --git a/ruoyi-ui/public/UEditor/themes/default/images/cursor_h.png b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/cursor_h.png similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/cursor_h.png rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/cursor_h.png diff --git a/ruoyi-ui/public/UEditor/themes/default/images/cursor_v.gif b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/cursor_v.gif similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/cursor_v.gif rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/cursor_v.gif diff --git a/ruoyi-ui/public/UEditor/themes/default/images/cursor_v.png b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/cursor_v.png similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/cursor_v.png rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/cursor_v.png diff --git a/ruoyi-ui/public/UEditor/themes/default/images/dialog-title-bg.png b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/dialog-title-bg.png similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/dialog-title-bg.png rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/dialog-title-bg.png diff --git a/ruoyi-ui/public/UEditor/themes/default/images/filescan.png b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/filescan.png similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/filescan.png rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/filescan.png diff --git a/ruoyi-ui/public/UEditor/themes/default/images/highlighted.gif b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/highlighted.gif similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/highlighted.gif rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/highlighted.gif diff --git a/ruoyi-ui/public/UEditor/themes/default/images/icons-all.gif b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/icons-all.gif similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/icons-all.gif rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/icons-all.gif diff --git a/ruoyi-ui/public/UEditor/themes/default/images/icons.gif b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/icons.gif similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/icons.gif rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/icons.gif diff --git a/ruoyi-ui/public/UEditor/themes/default/images/icons.png b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/icons.png similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/icons.png rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/icons.png diff --git a/ruoyi-ui/public/UEditor/themes/default/images/img-cracked.png b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/img-cracked.png similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/img-cracked.png rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/img-cracked.png diff --git a/ruoyi-ui/public/UEditor/themes/default/images/loaderror.png b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/loaderror.png similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/loaderror.png rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/loaderror.png diff --git a/ruoyi-ui/public/UEditor/themes/default/images/loading.gif b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/loading.gif similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/loading.gif rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/loading.gif diff --git a/ruoyi-ui/public/UEditor/themes/default/images/lock.gif b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/lock.gif similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/lock.gif rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/lock.gif diff --git a/ruoyi-ui/public/UEditor/themes/default/images/neweditor-tab-bg.png b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/neweditor-tab-bg.png similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/neweditor-tab-bg.png rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/neweditor-tab-bg.png diff --git a/ruoyi-ui/public/UEditor/themes/default/images/pagebreak.gif b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/pagebreak.gif similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/pagebreak.gif rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/pagebreak.gif diff --git a/ruoyi-ui/public/UEditor/themes/default/images/scale.png b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/scale.png similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/scale.png rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/scale.png diff --git a/ruoyi-ui/public/UEditor/themes/default/images/sortable.png b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/sortable.png similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/sortable.png rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/sortable.png diff --git a/ruoyi-ui/public/UEditor/themes/default/images/spacer.gif b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/spacer.gif similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/spacer.gif rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/spacer.gif diff --git a/ruoyi-ui/public/UEditor/themes/default/images/sparator_v.png b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/sparator_v.png similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/sparator_v.png rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/sparator_v.png diff --git a/ruoyi-ui/public/UEditor/themes/default/images/table-cell-align.png b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/table-cell-align.png similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/table-cell-align.png rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/table-cell-align.png diff --git a/ruoyi-ui/public/UEditor/themes/default/images/tangram-colorpicker.png b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/tangram-colorpicker.png similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/tangram-colorpicker.png rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/tangram-colorpicker.png diff --git a/ruoyi-ui/public/UEditor/themes/default/images/toolbar_bg.png b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/toolbar_bg.png similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/toolbar_bg.png rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/toolbar_bg.png diff --git a/ruoyi-ui/public/UEditor/themes/default/images/unhighlighted.gif b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/unhighlighted.gif similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/unhighlighted.gif rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/unhighlighted.gif diff --git a/ruoyi-ui/public/UEditor/themes/default/images/upload.png b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/upload.png similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/upload.png rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/upload.png diff --git a/ruoyi-ui/public/UEditor/themes/default/images/videologo.gif b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/videologo.gif similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/videologo.gif rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/videologo.gif diff --git a/ruoyi-ui/public/UEditor/themes/default/images/word.gif b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/word.gif similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/word.gif rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/word.gif diff --git a/ruoyi-ui/public/UEditor/themes/default/images/wordpaste.png b/ruoyi-ui/public/static/UEditorPlus/themes/default/images/wordpaste.png similarity index 100% rename from ruoyi-ui/public/UEditor/themes/default/images/wordpaste.png rename to ruoyi-ui/public/static/UEditorPlus/themes/default/images/wordpaste.png diff --git a/ruoyi-ui/public/UEditor/themes/iframe.css b/ruoyi-ui/public/static/UEditorPlus/themes/iframe.css similarity index 100% rename from ruoyi-ui/public/UEditor/themes/iframe.css rename to ruoyi-ui/public/static/UEditorPlus/themes/iframe.css diff --git a/ruoyi-ui/public/UEditor/third-party/SyntaxHighlighter/shCore.js b/ruoyi-ui/public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore.js similarity index 98% rename from ruoyi-ui/public/UEditor/third-party/SyntaxHighlighter/shCore.js rename to ruoyi-ui/public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore.js index 82479f5..6c8f7de 100644 --- a/ruoyi-ui/public/UEditor/third-party/SyntaxHighlighter/shCore.js +++ b/ruoyi-ui/public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore.js @@ -2383,7 +2383,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { @@ -2427,7 +2427,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { @@ -2486,7 +2486,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { @@ -2529,7 +2529,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { @@ -2613,7 +2613,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { @@ -2694,7 +2694,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { @@ -2743,7 +2743,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { @@ -2818,7 +2818,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { @@ -2857,7 +2857,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { @@ -2882,7 +2882,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { @@ -2918,7 +2918,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { @@ -2969,7 +2969,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { @@ -3010,7 +3010,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { @@ -3052,7 +3052,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { @@ -3088,7 +3088,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { @@ -3165,7 +3165,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { @@ -3237,7 +3237,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { @@ -3254,7 +3254,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { @@ -3313,7 +3313,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { @@ -3361,7 +3361,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { @@ -3400,7 +3400,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { @@ -3478,7 +3478,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { @@ -3513,7 +3513,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { @@ -3563,7 +3563,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { @@ -3603,7 +3603,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ;(function() { // CommonJS - SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/UEditor/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); + SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('public/static/UEditorPlus/third-party/SyntaxHighlighter/shCore').SyntaxHighlighter : null); function Brush() { diff --git a/ruoyi-ui/public/UEditor/third-party/SyntaxHighlighter/shCoreDefault.css b/ruoyi-ui/public/static/UEditorPlus/third-party/SyntaxHighlighter/shCoreDefault.css similarity index 100% rename from ruoyi-ui/public/UEditor/third-party/SyntaxHighlighter/shCoreDefault.css rename to ruoyi-ui/public/static/UEditorPlus/third-party/SyntaxHighlighter/shCoreDefault.css diff --git a/ruoyi-ui/public/UEditor/third-party/clipboard/clipboard.js b/ruoyi-ui/public/static/UEditorPlus/third-party/clipboard/clipboard.js similarity index 100% rename from ruoyi-ui/public/UEditor/third-party/clipboard/clipboard.js rename to ruoyi-ui/public/static/UEditorPlus/third-party/clipboard/clipboard.js diff --git a/ruoyi-ui/public/UEditor/third-party/clipboard/clipboard.swf b/ruoyi-ui/public/static/UEditorPlus/third-party/clipboard/clipboard.swf similarity index 100% rename from ruoyi-ui/public/UEditor/third-party/clipboard/clipboard.swf rename to ruoyi-ui/public/static/UEditorPlus/third-party/clipboard/clipboard.swf diff --git a/ruoyi-ui/public/UEditor/third-party/codemirror/codemirror.css b/ruoyi-ui/public/static/UEditorPlus/third-party/codemirror/codemirror.css similarity index 100% rename from ruoyi-ui/public/UEditor/third-party/codemirror/codemirror.css rename to ruoyi-ui/public/static/UEditorPlus/third-party/codemirror/codemirror.css diff --git a/ruoyi-ui/public/UEditor/third-party/codemirror/codemirror.js b/ruoyi-ui/public/static/UEditorPlus/third-party/codemirror/codemirror.js similarity index 100% rename from ruoyi-ui/public/UEditor/third-party/codemirror/codemirror.js rename to ruoyi-ui/public/static/UEditorPlus/third-party/codemirror/codemirror.js diff --git a/ruoyi-ui/public/UEditor/third-party/jquery-1.10.2.js b/ruoyi-ui/public/static/UEditorPlus/third-party/jquery-1.10.2.js similarity index 100% rename from ruoyi-ui/public/UEditor/third-party/jquery-1.10.2.js rename to ruoyi-ui/public/static/UEditorPlus/third-party/jquery-1.10.2.js diff --git a/ruoyi-ui/public/UEditor/third-party/webuploader/webuploader.css b/ruoyi-ui/public/static/UEditorPlus/third-party/webuploader/webuploader.css similarity index 100% rename from ruoyi-ui/public/UEditor/third-party/webuploader/webuploader.css rename to ruoyi-ui/public/static/UEditorPlus/third-party/webuploader/webuploader.css diff --git a/ruoyi-ui/public/UEditor/third-party/webuploader/webuploader.js b/ruoyi-ui/public/static/UEditorPlus/third-party/webuploader/webuploader.js similarity index 100% rename from ruoyi-ui/public/UEditor/third-party/webuploader/webuploader.js rename to ruoyi-ui/public/static/UEditorPlus/third-party/webuploader/webuploader.js diff --git a/ruoyi-ui/public/UEditor/third-party/zeroclipboard/ZeroClipboard.js b/ruoyi-ui/public/static/UEditorPlus/third-party/zeroclipboard/ZeroClipboard.js similarity index 100% rename from ruoyi-ui/public/UEditor/third-party/zeroclipboard/ZeroClipboard.js rename to ruoyi-ui/public/static/UEditorPlus/third-party/zeroclipboard/ZeroClipboard.js diff --git a/ruoyi-ui/public/UEditor/third-party/zeroclipboard/ZeroClipboard.swf b/ruoyi-ui/public/static/UEditorPlus/third-party/zeroclipboard/ZeroClipboard.swf similarity index 100% rename from ruoyi-ui/public/UEditor/third-party/zeroclipboard/ZeroClipboard.swf rename to ruoyi-ui/public/static/UEditorPlus/third-party/zeroclipboard/ZeroClipboard.swf diff --git a/ruoyi-ui/public/UEditor/ueditor.all.js b/ruoyi-ui/public/static/UEditorPlus/ueditor.all.js similarity index 99% rename from ruoyi-ui/public/UEditor/ueditor.all.js rename to ruoyi-ui/public/static/UEditorPlus/ueditor.all.js index 735d3e6..96578c0 100644 --- a/ruoyi-ui/public/UEditor/ueditor.all.js +++ b/ruoyi-ui/public/static/UEditorPlus/ueditor.all.js @@ -372,10 +372,10 @@ var utils = (UE.utils = { * @example * ```javascript * - * var protoObject = { sayHello: function () { console.log('Hello UEditor!'); } }; + * var protoObject = { sayHello: function () { console.log('Hello UEditorPlus!'); } }; * * var newObject = UE.utils.makeInstance( protoObject ); - * //output: Hello UEditor! + * //output: Hello UEditorPlus! * newObject.sayHello(); * ``` */ @@ -8989,7 +8989,8 @@ UE.Editor.defaultOptions = function (editor) { ); var configUrl = me.getActionUrl("config"), - isJsonp = utils.isCrossDomainUrl(configUrl); + // isJsonp = utils.isCrossDomainUrl(configUrl); + isJsonp = false; /* 发出ajax请求 */ me._serverConfigLoaded = false; @@ -29572,6 +29573,7 @@ UE.plugins["catchremoteimage"] = function () { params ), isJsonp = utils.isCrossDomainUrl(url), + // isJsonp = false, opt = { method: "POST", dataType: isJsonp ? "jsonp" : "", diff --git a/ruoyi-ui/public/UEditor/ueditor.config.js b/ruoyi-ui/public/static/UEditorPlus/ueditor.config.js similarity index 100% rename from ruoyi-ui/public/UEditor/ueditor.config.js rename to ruoyi-ui/public/static/UEditorPlus/ueditor.config.js diff --git a/ruoyi-ui/public/UEditor/ueditor.parse.js b/ruoyi-ui/public/static/UEditorPlus/ueditor.parse.js similarity index 100% rename from ruoyi-ui/public/UEditor/ueditor.parse.js rename to ruoyi-ui/public/static/UEditorPlus/ueditor.parse.js diff --git a/ruoyi-ui/src/api/cms/editor.js b/ruoyi-ui/src/api/cms/editor.js new file mode 100644 index 0000000..bad3fd0 --- /dev/null +++ b/ruoyi-ui/src/api/cms/editor.js @@ -0,0 +1,9 @@ +// 获取所有叶子节点 +import request from "@/utils/request"; + +export function getLeavesCategoryList() { + return request({ + url: '/ueditor/leavesCategoryList', + method: 'get' + }) +} diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js index 6344f94..4613dd6 100644 --- a/ruoyi-ui/src/main.js +++ b/ruoyi-ui/src/main.js @@ -37,7 +37,7 @@ import DictTag from '@/components/DictTag' import VueMeta from 'vue-meta' // 字典数据组件 import DictData from '@/components/DictData' -// UEditor +// UEditorPlus import VueUeditorWrap from 'vue-ueditor-wrap' // 全局方法挂载 diff --git a/ruoyi-ui/src/views/cms/editor/index.vue b/ruoyi-ui/src/views/cms/editor/index.vue index dd4f4dd..106d1f7 100644 --- a/ruoyi-ui/src/views/cms/editor/index.vue +++ b/ruoyi-ui/src/views/cms/editor/index.vue @@ -32,23 +32,101 @@ +
+ + + + {{dict.label}} + + + +
-
+
+
+ + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
@@ -56,19 +134,26 @@