From ec2781d166aeb71412452583966e1138cb68165f Mon Sep 17 00:00:00 2001 From: dataprince Date: Tue, 5 Sep 2023 16:18:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=A0=81=E4=BB=8Evu?= =?UTF-8?q?e2=E5=8D=87=E7=BA=A7=E5=88=B0vue3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 22 + .../src/main/resources/application.yml | 3 +- .../ruoyi/common/core/config/RuoYiConfig.java | 58 +- .../security/config/SecurityConfig.java | 32 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../src/main/resources/application.properties | 2 +- .../main/resources/vm/vue/index-tree.vue.vm | 431 ++++---- .../src/main/resources/vm/vue/index.vue.vm | 479 +++++---- .../resources/vm/vue/v3/index-tree.vue.vm | 474 --------- .../src/main/resources/vm/vue/v3/index.vue.vm | 590 ----------- .../monitor/SysLogininforController.java | 1 + .../service/impl/SysDeptServiceImpl.java | 2 +- ruoyi-ui/.env.development | 12 +- ruoyi-ui/.env.production | 13 +- ruoyi-ui/.env.staging | 13 +- ruoyi-ui/.eslintignore | 10 - ruoyi-ui/.eslintrc.js | 199 ---- ruoyi-ui/README.md | 8 +- ruoyi-ui/bin/build.bat | 4 +- ruoyi-ui/bin/package.bat | 2 +- ruoyi-ui/bin/run-web.bat | 4 +- ruoyi-ui/build/index.js | 35 - ruoyi-ui/{public => }/html/ie.html | 0 ruoyi-ui/{public => }/index.html | 47 +- ruoyi-ui/package.json | 82 +- ruoyi-ui/src/App.vue | 27 +- ruoyi-ui/src/api/monitor/job.js | 71 -- ruoyi-ui/src/api/monitor/server.js | 9 - ruoyi-ui/src/assets/icons/svg/company.svg | 1 + ruoyi-ui/src/assets/icons/svg/gitee.svg | 1 + ruoyi-ui/src/assets/icons/svg/maxkey.svg | 3 + .../src/assets/styles/variables.module.scss | 65 ++ ruoyi-ui/src/components/Breadcrumb/index.vue | 82 +- ruoyi-ui/src/components/Crontab/index.vue | 1 - ruoyi-ui/src/components/DictTag/index.vue | 93 +- ruoyi-ui/src/components/FileUpload/index.vue | 277 +++-- ruoyi-ui/src/components/Hamburger/index.vue | 23 +- .../src/components/HeaderSearch/index.vue | 241 +++-- ruoyi-ui/src/components/IconSelect/index.vue | 148 ++- .../src/components/IconSelect/requireIcons.js | 15 +- .../src/components/ImagePreview/index.vue | 101 +- ruoyi-ui/src/components/ImageUpload/index.vue | 319 +++--- ruoyi-ui/src/components/Pagination/index.vue | 152 ++- .../src/components/RightToolbar/index.vue | 139 ++- ruoyi-ui/src/components/RuoYi/Doc/index.vue | 20 +- ruoyi-ui/src/components/RuoYi/Git/index.vue | 20 +- ruoyi-ui/src/components/Screenfull/index.vue | 47 +- ruoyi-ui/src/components/SizeSelect/index.vue | 97 +- ruoyi-ui/src/components/SvgIcon/index.vue | 64 +- ruoyi-ui/src/components/SvgIcon/svgicon.js | 10 + ruoyi-ui/src/components/TopNav/index.vue | 271 +++-- ruoyi-ui/src/components/TreeSelect/index.vue | 156 +++ ruoyi-ui/src/components/iFrame/index.vue | 47 +- ruoyi-ui/src/directive/index.js | 45 +- ruoyi-ui/src/layout/components/AppMain.vue | 51 +- .../layout/components/IframeToggle/index.vue | 20 +- .../src/layout/components/InnerLink/index.vue | 65 +- ruoyi-ui/src/layout/components/Navbar.vue | 161 ++- .../src/layout/components/Settings/index.vue | 482 +++++---- .../src/layout/components/Sidebar/Item.vue | 33 - .../src/layout/components/Sidebar/Link.vue | 61 +- .../src/layout/components/Sidebar/Logo.vue | 43 +- .../layout/components/Sidebar/SidebarItem.vue | 140 ++- .../src/layout/components/Sidebar/index.vue | 96 +- .../layout/components/TagsView/ScrollPane.vue | 152 +-- .../src/layout/components/TagsView/index.vue | 436 ++++---- ruoyi-ui/src/layout/components/index.js | 1 - ruoyi-ui/src/layout/index.vue | 172 ++-- ruoyi-ui/src/layout/mixin/ResizeHandler.js | 45 - ruoyi-ui/src/main.js | 108 +- ruoyi-ui/src/permission.js | 24 +- ruoyi-ui/src/plugins/download.js | 34 +- ruoyi-ui/src/plugins/index.js | 24 +- ruoyi-ui/src/plugins/modal.js | 33 +- ruoyi-ui/src/plugins/tab.js | 28 +- ruoyi-ui/src/router/index.js | 123 ++- ruoyi-ui/src/settings.js | 7 +- ruoyi-ui/src/store/getters.js | 1 - ruoyi-ui/src/store/index.js | 12 +- ruoyi-ui/src/store/modules/permission.js | 23 +- ruoyi-ui/src/store/modules/user.js | 3 +- ruoyi-ui/src/utils/dict.js | 17 + ruoyi-ui/src/utils/dict/Dict.js | 82 -- ruoyi-ui/src/utils/dict/DictConverter.js | 17 - ruoyi-ui/src/utils/dict/DictData.js | 13 - ruoyi-ui/src/utils/dict/DictMeta.js | 38 - ruoyi-ui/src/utils/dict/DictOptions.js | 51 - ruoyi-ui/src/utils/dict/index.js | 33 - ruoyi-ui/src/utils/dynamicTitle.js | 13 + ruoyi-ui/src/utils/index.js | 14 +- ruoyi-ui/src/utils/request.js | 88 +- ruoyi-ui/src/utils/ruoyi.js | 27 +- ruoyi-ui/src/utils/validate.js | 9 + ruoyi-ui/src/views/dashboard/BarChart.vue | 102 -- ruoyi-ui/src/views/dashboard/LineChart.vue | 135 --- ruoyi-ui/src/views/dashboard/PanelGroup.vue | 181 ---- ruoyi-ui/src/views/dashboard/PieChart.vue | 79 -- ruoyi-ui/src/views/dashboard/RaddarChart.vue | 116 --- ruoyi-ui/src/views/dashboard/mixins/resize.js | 56 -- ruoyi-ui/src/views/demo/customer/index.vue | 427 ++++---- ruoyi-ui/src/views/demo/product/index.vue | 372 ++++--- ruoyi-ui/src/views/demo/student/index.vue | 373 ++++--- ruoyi-ui/src/views/error/401.vue | 28 +- ruoyi-ui/src/views/error/404.vue | 14 +- ruoyi-ui/src/views/index.vue | 48 +- ruoyi-ui/src/views/index_v1.vue | 98 -- ruoyi-ui/src/views/login.vue | 189 ++-- ruoyi-ui/src/views/monitor/admin/index.vue | 16 +- ruoyi-ui/src/views/monitor/cache/index.vue | 128 ++- ruoyi-ui/src/views/monitor/cache/list.vue | 241 ----- .../src/views/monitor/logininfor/index.vue | 255 +++-- ruoyi-ui/src/views/monitor/online/index.vue | 124 ++- ruoyi-ui/src/views/monitor/operlog/index.vue | 255 +++-- ruoyi-ui/src/views/monitor/powerjob/index.vue | 16 +- ruoyi-ui/src/views/monitor/server/index.vue | 207 ---- ruoyi-ui/src/views/redirect/index.vue | 14 + ruoyi-ui/src/views/register.vue | 193 ++-- ruoyi-ui/src/views/system/config/index.vue | 352 +++---- ruoyi-ui/src/views/system/dept/index.vue | 357 +++---- ruoyi-ui/src/views/system/dict/data.vue | 450 ++++----- ruoyi-ui/src/views/system/dict/index.vue | 366 +++---- ruoyi-ui/src/views/system/menu/index.vue | 542 +++++----- ruoyi-ui/src/views/system/notice/index.vue | 337 +++---- ruoyi-ui/src/views/system/post/index.vue | 330 +++--- ruoyi-ui/src/views/system/role/authUser.vue | 207 ++-- ruoyi-ui/src/views/system/role/index.vue | 796 +++++++-------- ruoyi-ui/src/views/system/role/selectUser.vue | 184 ++-- ruoyi-ui/src/views/system/user/authRole.vue | 157 +-- ruoyi-ui/src/views/system/user/index.vue | 792 +++++++-------- .../src/views/system/user/profile/index.vue | 80 +- .../views/system/user/profile/resetPwd.vue | 95 +- .../views/system/user/profile/userAvatar.vue | 281 +++--- .../views/system/user/profile/userInfo.vue | 81 +- .../src/views/tool/build/CodeTypeDialog.vue | 106 -- .../src/views/tool/build/DraggableItem.vue | 100 -- ruoyi-ui/src/views/tool/build/IconsDialog.vue | 123 --- ruoyi-ui/src/views/tool/build/RightPanel.vue | 946 ------------------ .../src/views/tool/build/TreeNodeDialog.vue | 149 --- ruoyi-ui/src/views/tool/build/index.vue | 767 +------------- ruoyi-ui/src/views/tool/gen/basicInfoForm.vue | 40 +- ruoyi-ui/src/views/tool/gen/editTable.vue | 196 ++-- ruoyi-ui/src/views/tool/gen/genInfoForm.vue | 388 ++++--- ruoyi-ui/src/views/tool/gen/importTable.vue | 160 ++- ruoyi-ui/src/views/tool/gen/index.vue | 387 ++++--- ruoyi-ui/vite.config.js | 52 + ruoyi-ui/vite/plugins/auto-import.js | 16 + ruoyi-ui/vite/plugins/compression.js | 27 + ruoyi-ui/vite/plugins/index.js | 15 + ruoyi-ui/vite/plugins/setup-extend.js | 5 + ruoyi-ui/vite/plugins/svg-icon.js | 10 + ruoyi-ui/vue.config.js | 134 --- 151 files changed, 7448 insertions(+), 13097 deletions(-) delete mode 100644 ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm delete mode 100644 ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm delete mode 100644 ruoyi-ui/.eslintignore delete mode 100644 ruoyi-ui/.eslintrc.js delete mode 100644 ruoyi-ui/build/index.js rename ruoyi-ui/{public => }/html/ie.html (100%) rename ruoyi-ui/{public => }/index.html (85%) delete mode 100644 ruoyi-ui/src/api/monitor/job.js delete mode 100644 ruoyi-ui/src/api/monitor/server.js create mode 100644 ruoyi-ui/src/assets/icons/svg/company.svg create mode 100644 ruoyi-ui/src/assets/icons/svg/gitee.svg create mode 100644 ruoyi-ui/src/assets/icons/svg/maxkey.svg create mode 100644 ruoyi-ui/src/assets/styles/variables.module.scss create mode 100644 ruoyi-ui/src/components/SvgIcon/svgicon.js create mode 100644 ruoyi-ui/src/components/TreeSelect/index.vue delete mode 100644 ruoyi-ui/src/layout/components/Sidebar/Item.vue delete mode 100644 ruoyi-ui/src/layout/mixin/ResizeHandler.js create mode 100644 ruoyi-ui/src/utils/dict.js delete mode 100644 ruoyi-ui/src/utils/dict/Dict.js delete mode 100644 ruoyi-ui/src/utils/dict/DictConverter.js delete mode 100644 ruoyi-ui/src/utils/dict/DictData.js delete mode 100644 ruoyi-ui/src/utils/dict/DictMeta.js delete mode 100644 ruoyi-ui/src/utils/dict/DictOptions.js delete mode 100644 ruoyi-ui/src/utils/dict/index.js create mode 100644 ruoyi-ui/src/utils/dynamicTitle.js delete mode 100644 ruoyi-ui/src/views/dashboard/BarChart.vue delete mode 100644 ruoyi-ui/src/views/dashboard/LineChart.vue delete mode 100644 ruoyi-ui/src/views/dashboard/PanelGroup.vue delete mode 100644 ruoyi-ui/src/views/dashboard/PieChart.vue delete mode 100644 ruoyi-ui/src/views/dashboard/RaddarChart.vue delete mode 100644 ruoyi-ui/src/views/dashboard/mixins/resize.js delete mode 100644 ruoyi-ui/src/views/index_v1.vue delete mode 100644 ruoyi-ui/src/views/monitor/cache/list.vue delete mode 100644 ruoyi-ui/src/views/monitor/server/index.vue create mode 100644 ruoyi-ui/src/views/redirect/index.vue delete mode 100644 ruoyi-ui/src/views/tool/build/CodeTypeDialog.vue delete mode 100644 ruoyi-ui/src/views/tool/build/DraggableItem.vue delete mode 100644 ruoyi-ui/src/views/tool/build/IconsDialog.vue delete mode 100644 ruoyi-ui/src/views/tool/build/RightPanel.vue delete mode 100644 ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue create mode 100644 ruoyi-ui/vite.config.js create mode 100644 ruoyi-ui/vite/plugins/auto-import.js create mode 100644 ruoyi-ui/vite/plugins/compression.js create mode 100644 ruoyi-ui/vite/plugins/index.js create mode 100644 ruoyi-ui/vite/plugins/setup-extend.js create mode 100644 ruoyi-ui/vite/plugins/svg-icon.js delete mode 100644 ruoyi-ui/vue.config.js diff --git a/.gitignore b/.gitignore index 841c149..efdc120 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,25 @@ nbdist/ !*/build/*.xml .flattened-pom.xml + +DS_Store +node_modules/ +npm-debug.log* +yarn-debug.log* +yarn-error.log* +**/*.log + +tests/**/coverage/ +tests/e2e/reports +selenium-debug.log + +# Editor directories and files +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.local + +package-lock.json +yarn.lock diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 94f84d1..3342d19 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -1,7 +1,7 @@ # 项目相关配置 ruoyi: # 名称 - name: RuoYi-Flex + name: Ruoyi-Flex # 版本 version: 4.1.6 # 版权年份 @@ -217,6 +217,7 @@ security: - /**/*.html - /**/*.css - /**/*.js + - /profile/** # 公共路径 - /favicon.ico - /error diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/RuoYiConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/RuoYiConfig.java index 8b6fe87..7870827 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/RuoYiConfig.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/RuoYiConfig.java @@ -10,7 +10,6 @@ import org.springframework.stereotype.Component; * * @author ruoyi */ -@Data @Component @ConfigurationProperties(prefix = "ruoyi") public class RuoYiConfig { @@ -43,11 +42,46 @@ public class RuoYiConfig { /** * 获取地址开关 */ - @Getter private static boolean addressEnabled; - public void setAddressEnabled(boolean addressEnabled) { - RuoYiConfig.addressEnabled = addressEnabled; + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public String getVersion() + { + return version; + } + + public void setVersion(String version) + { + this.version = version; + } + + public String getCopyrightYear() + { + return copyrightYear; + } + + public void setCopyrightYear(String copyrightYear) + { + this.copyrightYear = copyrightYear; + } + + public boolean isDemoEnabled() + { + return demoEnabled; + } + + public void setDemoEnabled(boolean demoEnabled) + { + this.demoEnabled = demoEnabled; } public static String getProfile() @@ -55,6 +89,22 @@ public class RuoYiConfig { return profile; } + public void setProfile(String profile) + { + RuoYiConfig.profile = profile; + } + + public static boolean isAddressEnabled() + { + return addressEnabled; + } + + public void setAddressEnabled(boolean addressEnabled) + { + RuoYiConfig.addressEnabled = addressEnabled; + } + + /** * 获取导入上传路径 */ diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/SecurityConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/SecurityConfig.java index e2cf40e..3c50273 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/SecurityConfig.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/SecurityConfig.java @@ -17,6 +17,8 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import java.util.Arrays; + /** * 权限安全配置 * @@ -38,12 +40,32 @@ public class SecurityConfig implements WebMvcConfigurer { public void addInterceptors(InterceptorRegistry registry) { // 注册路由拦截器，自定义验证规则 registry.addInterceptor(new SaInterceptor(handler -> { - AllUrlHandler allUrlHandler = SpringUtils.getBean(AllUrlHandler.class); + //AllUrlHandler allUrlHandler = SpringUtils.getBean(AllUrlHandler.class); // 登录验证 -- 排除多个路径 SaRouter // 获取所有的 - .match(allUrlHandler.getUrls()) - // 对未排除的路径进行检查 + //.match(allUrlHandler.getUrls()) // 拦截的 path 列表 + .match("/**") + .notMatch( + Arrays.asList( + "/*.html", + "/**/*.html", + "/**/*.css", + "/**/*.js", + "/**/*.css", + "/**/*.js", + "/profile/**", + "/favicon.ico", + "/error", + "/*/api-docs", + "/*/api-docs/**", + "/actuator", + "/actuator/**", + "/login", + "/register", + "/captchaImage", + "/captcha/get", + "/captcha/check")) .check(() -> { // 检查是否登录 是否有token StpUtil.checkLogin(); @@ -51,9 +73,9 @@ public class SecurityConfig implements WebMvcConfigurer { //TODO :以后完善多平台登录校验clientID功能 }); - })).addPathPatterns("/**") + })).addPathPatterns("/**"); // 排除不需要拦截的路径 - .excludePathPatterns(securityProperties.getExcludes()); + //.excludePathPatterns(securityProperties.getExcludes()); } } diff --git a/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 5f8dc63..7e9c085 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,4 +1,4 @@ com.ruoyi.common.security.config.SaTokenConfig +com.ruoyi.common.security.config.SecurityConfig com.ruoyi.common.security.handler.GlobalExceptionHandler com.ruoyi.common.security.handler.AllUrlHandler -com.ruoyi.common.security.config.SecurityConfig \ No newline at end of file diff --git a/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application.properties b/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application.properties index 5735473..e59248b 100644 --- a/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application.properties +++ b/ruoyi-extra/ruoyi-powerjob-server/src/main/resources/application.properties @@ -26,7 +26,7 @@ oms.http.port=10010 oms.table-prefix=pj_ # Actuator 监控端点的配置项 -spring.application.name: ruoyi-powerjob-server +spring.application.name: Ruoyi-Powerjob-Server management.endpoints.web.exposure.include=* management.endpoint.health.show-details=ALWAYS management.endpoint.logfile.external-file=./logs/ruoyi-powerjob-server.log diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm index a4c64a0..ba12ebc 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm @@ -1,6 +1,6 @@