diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml index 050a76a3f..ff5166219 100644 --- a/checkstyle/checkstyle.xml +++ b/checkstyle/checkstyle.xml @@ -13,8 +13,8 @@ --> + "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" + "https://checkstyle.org/dtds/configuration_1_3.dtd"> diff --git "a/docs/category/\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/\345\277\253\351\200\237\345\274\200\345\247\213.md" "b/docs/category/\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/\345\277\253\351\200\237\345\274\200\345\247\213.md" index 770c5909d..032f6e5e2 100644 --- "a/docs/category/\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/\345\277\253\351\200\237\345\274\200\345\247\213.md" +++ "b/docs/category/\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/\345\277\253\351\200\237\345\274\200\345\247\213.md" @@ -74,8 +74,8 @@ public class TestDomain extends BaseEntity { - 17 - 17 + ${maven.compiler.source} + ${maven.compiler.source} UTF-8 diff --git a/pom.xml b/pom.xml index d08df9338..ccf00facb 100644 --- a/pom.xml +++ b/pom.xml @@ -457,6 +457,16 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + ${maven.compiler.source} + ${maven.compiler.target} + ${maven.compiler.encoding} + + + org.apache.maven.plugins maven-javadoc-plugin diff --git a/qing-application/pom.xml b/qing-application/pom.xml index ab3830617..4eb961568 100644 --- a/qing-application/pom.xml +++ b/qing-application/pom.xml @@ -14,15 +14,6 @@ qing-application qing-application pom - - 17 - 17 - 17 - 17 - UTF-8 - UTF-8 - UTF-8 - qing-application-manager diff --git a/qing-application/qing-application-demo/pom.xml b/qing-application/qing-application-demo/pom.xml index 14984ccae..b89f2de92 100644 --- a/qing-application/qing-application-demo/pom.xml +++ b/qing-application/qing-application-demo/pom.xml @@ -11,12 +11,6 @@ qing-application-demo - - 17 - 17 - UTF-8 - - org.springframework.boot diff --git a/qing-application/qing-application-manager/pom.xml b/qing-application/qing-application-manager/pom.xml index a9925d153..67b7ffdf1 100644 --- a/qing-application/qing-application-manager/pom.xml +++ b/qing-application/qing-application-manager/pom.xml @@ -16,7 +16,6 @@ qing-application-manager - 17 UTF-8 UTF-8 1.9.23 @@ -183,9 +182,9 @@ org.apache.maven.plugins maven-compiler-plugin - 17 - 17 - UTF-8 + ${maven.compiler.source} + ${maven.compiler.target} + ${maven.compiler.encoding} org.projectlombok diff --git a/qing-archetypes/pom.xml b/qing-archetypes/pom.xml index 472804e03..f487473a1 100644 --- a/qing-archetypes/pom.xml +++ b/qing-archetypes/pom.xml @@ -29,10 +29,4 @@ qing-service-archetype - - - UTF-8 - 17 - 17 - diff --git a/qing-archetypes/qing-service-archetype/src/main/resources/archetype-resources/pom.xml b/qing-archetypes/qing-service-archetype/src/main/resources/archetype-resources/pom.xml index 1cb63d413..9d64ed6dc 100644 --- a/qing-archetypes/qing-service-archetype/src/main/resources/archetype-resources/pom.xml +++ b/qing-archetypes/qing-service-archetype/src/main/resources/archetype-resources/pom.xml @@ -178,8 +178,6 @@ maven-compiler-plugin ${maven-compiler-plugin.version} - 17 - 17 cn.chenyunlong diff --git a/qing-codegen-plugin/qing-codegen-api/pom.xml b/qing-codegen-plugin/qing-codegen-api/pom.xml index 8f9542083..56f8753eb 100644 --- a/qing-codegen-plugin/qing-codegen-api/pom.xml +++ b/qing-codegen-plugin/qing-codegen-api/pom.xml @@ -26,12 +26,6 @@ qing-codegen-api jar - - 17 - 17 - UTF-8 - - io.swagger.core.v3 diff --git a/qing-codegen-plugin/qing-codegen-apt/pom.xml b/qing-codegen-plugin/qing-codegen-apt/pom.xml index d5dca9dae..bd9161b10 100644 --- a/qing-codegen-plugin/qing-codegen-apt/pom.xml +++ b/qing-codegen-plugin/qing-codegen-apt/pom.xml @@ -95,9 +95,9 @@ maven-compiler-plugin 3.8.1 - 17 - 17 - UTF-8 + ${maven.compiler.source} + ${maven.compiler.target} + ${maven.compiler.encoding} com.google.auto.service diff --git a/qing-codegen-plugin/readme.md b/qing-codegen-plugin/readme.md index c154e205a..0db05af66 100644 --- a/qing-codegen-plugin/readme.md +++ b/qing-codegen-plugin/readme.md @@ -74,8 +74,8 @@ public class TestDomain extends BaseEntity { - 17 - 17 + ${maven.compiler.source} + ${maven.compiler.source} UTF-8 diff --git a/qing-commons/pom.xml b/qing-commons/pom.xml index 1118e1291..e36320d62 100644 --- a/qing-commons/pom.xml +++ b/qing-commons/pom.xml @@ -102,8 +102,8 @@ org.apache.maven.plugins maven-compiler-plugin - 17 - 17 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/qing-domain-gen/pom.xml b/qing-domain-gen/pom.xml index 4584dee2a..65fbda361 100644 --- a/qing-domain-gen/pom.xml +++ b/qing-domain-gen/pom.xml @@ -14,13 +14,6 @@ jar - - 17 - 17 - UTF-8 - NONE - - cn.chenyunlong @@ -52,8 +45,8 @@ - 17 - 17 + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 -AbaseDir=${project.basedir} diff --git a/qing-domain/pom.xml b/qing-domain/pom.xml index 45be77230..d4d3e2213 100644 --- a/qing-domain/pom.xml +++ b/qing-domain/pom.xml @@ -220,9 +220,9 @@ - 17 - 17 - UTF-8 + ${maven.compiler.source} + ${maven.compiler.target} + ${maven.compiler.encoding} diff --git a/qing-infrastructure-anime/pom.xml b/qing-infrastructure-anime/pom.xml index 1aac96088..e63bf915d 100644 --- a/qing-infrastructure-anime/pom.xml +++ b/qing-infrastructure-anime/pom.xml @@ -12,11 +12,6 @@ qing-infrastructure-anime jar - - 17 - 17 - UTF-8 - org.springframework diff --git a/qing-infrastructure/pom.xml b/qing-infrastructure/pom.xml index 066565f36..ec9d57697 100644 --- a/qing-infrastructure/pom.xml +++ b/qing-infrastructure/pom.xml @@ -15,15 +15,6 @@ 基础设施 jar - - 17 - 17 - 17 - 17 - UTF-8 - UTF-8 - UTF-8 - diff --git a/qing-services/pom.xml b/qing-services/pom.xml index e9f6fea98..bc3fe1410 100644 --- a/qing-services/pom.xml +++ b/qing-services/pom.xml @@ -11,10 +11,4 @@ qing-services - - 17 - 17 - UTF-8 - - diff --git a/qing-starters/pom.xml b/qing-starters/pom.xml index d87e01f77..3907abba6 100644 --- a/qing-starters/pom.xml +++ b/qing-starters/pom.xml @@ -28,15 +28,6 @@ 0.0.2-SNAPSHOT pom - - 17 - 17 - 17 - 17 - UTF-8 - UTF-8 - UTF-8 - qing-jpa-spring-boot-starter diff --git a/qing-starters/qing-dingtalk-spring-boot-starter/pom.xml b/qing-starters/qing-dingtalk-spring-boot-starter/pom.xml index 0bd37e1d9..6487bb3ed 100644 --- a/qing-starters/qing-dingtalk-spring-boot-starter/pom.xml +++ b/qing-starters/qing-dingtalk-spring-boot-starter/pom.xml @@ -27,10 +27,6 @@ qing-dingtalk-spring-boot-starter qing-dingtalk-spring-boot-starter - - UTF-8 - - org.projectlombok diff --git a/qing-starters/qing-flowable-spring-boot-starter/pom.xml b/qing-starters/qing-flowable-spring-boot-starter/pom.xml index dab69d70e..15b91d6f1 100644 --- a/qing-starters/qing-flowable-spring-boot-starter/pom.xml +++ b/qing-starters/qing-flowable-spring-boot-starter/pom.xml @@ -26,17 +26,6 @@ qing-flowable-spring-boot-starter qing-flowable-spring-boot-starter - - - 17 - 17 - 17 - 17 - UTF-8 - UTF-8 - UTF-8 - - org.projectlombok @@ -48,7 +37,6 @@ camunda-bpm-spring-boot-starter 7.15.0 - org.springframework.boot spring-boot-starter diff --git a/qing-starters/qing-jimmer-spring-boot-starter/pom.xml b/qing-starters/qing-jimmer-spring-boot-starter/pom.xml index b831d5c2b..61fa517f2 100644 --- a/qing-starters/qing-jimmer-spring-boot-starter/pom.xml +++ b/qing-starters/qing-jimmer-spring-boot-starter/pom.xml @@ -24,15 +24,6 @@ 4.0.0 qing-jimmer-spring-boot-starter - - 17 - 17 - 17 - 17 - UTF-8 - UTF-8 - UTF-8 - org.projectlombok diff --git a/qing-starters/qing-jpa-spring-boot-starter/pom.xml b/qing-starters/qing-jpa-spring-boot-starter/pom.xml index f1628b59c..bd97cb140 100644 --- a/qing-starters/qing-jpa-spring-boot-starter/pom.xml +++ b/qing-starters/qing-jpa-spring-boot-starter/pom.xml @@ -24,15 +24,6 @@ 4.0.0 qing-jpa-spring-boot-starter - - 17 - 17 - 17 - 17 - UTF-8 - UTF-8 - UTF-8 - org.springframework.boot diff --git a/qing-starters/qing-mybatis-spring-boot-starter/pom.xml b/qing-starters/qing-mybatis-spring-boot-starter/pom.xml index fda4adad9..1c486228a 100644 --- a/qing-starters/qing-mybatis-spring-boot-starter/pom.xml +++ b/qing-starters/qing-mybatis-spring-boot-starter/pom.xml @@ -28,16 +28,6 @@ qing-mybatis-spring-boot-starter - - 17 - 17 - 17 - 17 - UTF-8 - UTF-8 - UTF-8 - - org.projectlombok diff --git a/qing-starters/qing-oss-spring-boot-starter/pom.xml b/qing-starters/qing-oss-spring-boot-starter/pom.xml index a6902d5ea..bb42d5e47 100644 --- a/qing-starters/qing-oss-spring-boot-starter/pom.xml +++ b/qing-starters/qing-oss-spring-boot-starter/pom.xml @@ -27,16 +27,6 @@ qing-oss-spring-boot-starter qing-oss-spring-boot-starter - - 17 - 17 - 17 - 17 - UTF-8 - UTF-8 - UTF-8 - - org.projectlombok diff --git a/qing-starters/qing-registry-spring-boot-starter/pom.xml b/qing-starters/qing-registry-spring-boot-starter/pom.xml index 992f1fd58..b75a2d86a 100644 --- a/qing-starters/qing-registry-spring-boot-starter/pom.xml +++ b/qing-starters/qing-registry-spring-boot-starter/pom.xml @@ -13,12 +13,6 @@ qing-registry-spring-boot-starter - - 17 - 17 - UTF-8 - - com.alibaba.cloud diff --git a/qing-starters/qing-security-spring-boot-starter/pom.xml b/qing-starters/qing-security-spring-boot-starter/pom.xml index dd551b3a0..84bdfa762 100644 --- a/qing-starters/qing-security-spring-boot-starter/pom.xml +++ b/qing-starters/qing-security-spring-boot-starter/pom.xml @@ -27,15 +27,6 @@ qing-security-spring-boot-starter 0.0.2-SNAPSHOT jar - - 17 - 17 - 17 - 17 - UTF-8 - UTF-8 - UTF-8 - diff --git a/qing-ui/src/main/frontend/src/router/index.ts b/qing-ui/src/main/frontend/src/router/index.ts index 741411cfa..f55efae53 100644 --- a/qing-ui/src/main/frontend/src/router/index.ts +++ b/qing-ui/src/main/frontend/src/router/index.ts @@ -1,4 +1,4 @@ -import {createRouter, createWebHashHistory, type NavigationGuardNext, type RouteLocationNormalized, type Router} from "vue-router"; +import {createRouter, createWebHistory, type NavigationGuardNext, type RouteLocationNormalized, type Router} from "vue-router"; import {userStore} from "@/stores/user"; import routerList from "@/router/modules/base-routes"; @@ -25,7 +25,7 @@ const whiteList = ["/login"]; * 创建路由实例 */ const router: Router = createRouter({ - history: createWebHashHistory(), + history: createWebHistory(), routes, }); diff --git a/qing-ui/src/main/frontend/src/router/modules/base-routes.ts b/qing-ui/src/main/frontend/src/router/modules/base-routes.ts index ca4fcba1c..64c898ee5 100644 --- a/qing-ui/src/main/frontend/src/router/modules/base-routes.ts +++ b/qing-ui/src/main/frontend/src/router/modules/base-routes.ts @@ -10,7 +10,7 @@ import Recommend from "@/views/recommend/Recommend.vue"; import UpdatePage from "@/views/UpdatePage.vue"; import Catalog from "@/views/catalog/Catalog.vue"; import RankPage from "@/views/RankPage.vue"; -import Detail from "@/views/Detail.vue"; +import Detail from "@/views/anime/detail/index.vue"; import Component from "@/views/examples/component/Component.vue"; import PlayPage from "@/views/PlayPage.vue"; import About from "@/views/about/About.vue"; diff --git a/qing-ui/src/main/frontend/src/views/Detail.vue b/qing-ui/src/main/frontend/src/views/anime/detail/index.vue similarity index 57% rename from qing-ui/src/main/frontend/src/views/Detail.vue rename to qing-ui/src/main/frontend/src/views/anime/detail/index.vue index c15729b9d..38ebd8266 100644 --- a/qing-ui/src/main/frontend/src/views/Detail.vue +++ b/qing-ui/src/main/frontend/src/views/anime/detail/index.vue @@ -1,66 +1,155 @@ + +