diff --git a/api/build.gradle b/api/build.gradle index c04f50aadb6c0eccddab05842d47720bef23b552..25ea651c02b6e54221c1610e8e7c9aef6f34ab23 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -13,6 +13,12 @@ compileTestJava.options.encoding = "UTF-8" javadoc.options.encoding = "UTF-8" repositories { + maven { + url "https://maven.aliyun.com/repository/central" + } + maven { + url "https://maven.aliyun.com/repository/public" + } mavenCentral() maven { url 'https://repo.spring.io/milestone' } maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots' } diff --git a/application/build.gradle b/application/build.gradle index 5208f100bbb45385c35faa34042a507c2a497062..6c112b123fbebe3b6d2e06d8a49e126fa7f27f1b 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -21,8 +21,13 @@ checkstyle { } repositories { + maven { + url "https://maven.aliyun.com/repository/central" + } + maven { + url "https://maven.aliyun.com/repository/public" + } mavenCentral() - maven { url 'https://repo.spring.io/milestone' } maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots' } } diff --git a/application/src/main/resources/application-dev.yaml b/application/src/main/resources/application-dev.yaml index ddc6b9521099a17897f9d84a1dbb586499085da8..3844be9d97fe89b77ba7847e0bd13447bdab4a43 100644 --- a/application/src/main/resources/application-dev.yaml +++ b/application/src/main/resources/application-dev.yaml @@ -2,6 +2,14 @@ server: port: 8090 spring: + r2dbc: + url: r2dbc:pool:mysql://localhost:3306/halo + username: root + password: yhlorcl + sql: + init: + mode: always + platform: mysql output: ansi: enabled: always @@ -25,7 +33,11 @@ halo: enabled: true plugin: runtime-mode: development # development, deployment - work-dir: ${user.home}/halo2-dev + fixed-plugin-path: + # 配置为插件绝对路径 + #- "/Users/yanhailin/Gitee-Projects/halo-plugins/plugin-starter-main" + - "/Users/yanhailin/Gitee-Projects/halo-plugins/plugin-starter-hello-world" + work-dir: ${user.home}/volumes_docker/halo logging: level: run.halo.app: DEBUG diff --git a/application/src/main/resources/application-mysql.yaml b/application/src/main/resources/application-mysql.yaml index fe3846c3cefe7fd4c4a26fe2dd8d45d0c2abb4c6..c312984137fed6ddc4241310d3f26ea1594577be 100644 --- a/application/src/main/resources/application-mysql.yaml +++ b/application/src/main/resources/application-mysql.yaml @@ -2,7 +2,7 @@ spring: r2dbc: url: r2dbc:pool:mysql://localhost:3306/halo username: root - password: openmysql + password: yhlorcl sql: init: mode: always diff --git a/application/src/main/resources/application.yaml b/application/src/main/resources/application.yaml index d289d8cf24ddbd26d591c0b47adf736aa7984990..bd6e9b26714e5d74c3117939951c3019b7788297 100644 --- a/application/src/main/resources/application.yaml +++ b/application/src/main/resources/application.yaml @@ -37,7 +37,7 @@ halo: page: # Disable page cache by default due to experimental feature disabled: true - work-dir: ${user.home}/.halo2 + work-dir: ${user.home}/volumes_docker/halo plugin: plugins-root: ${halo.work-dir}/plugins attachment: diff --git a/application/src/main/resources/extensions/system-setting.yaml b/application/src/main/resources/extensions/system-setting.yaml index 0f3a4f0c932f872f0c23a0f0b8b5acc3430d8c0e..fe9ad78cc0b5ca72f3f8b0a4de0a0f4d07f01a9b 100644 --- a/application/src/main/resources/extensions/system-setting.yaml +++ b/application/src/main/resources/extensions/system-setting.yaml @@ -11,9 +11,9 @@ spec: label: "站点标题" name: title validation: required - - $formkit: text - label: "站点副标题" - name: subtitle +# - $formkit: text +# label: "站点副标题" +# name: subtitle - $formkit: attachment label: Logo name: logo @@ -24,71 +24,71 @@ spec: name: favicon accepts: - 'image/*' - - group: post - label: 文章设置 - formSchema: - - $formkit: number - label: "文章列表显示条数" - name: postPageSize - value: 10 - min: 1 - max: 100 - validation: required | max:100 - - $formkit: number - label: "归档页文章显示条数" - name: archivePageSize - value: 10 - min: 1 - max: 100 - validation: required | max:100 - - $formkit: number - label: "分类页文章显示条数" - name: categoryPageSize - value: 10 - min: 1 - max: 100 - validation: required | max:100 - - $formkit: number - label: "标签页文章显示条数" - name: tagPageSize - value: 10 - min: 1 - max: 100 - validation: required - - $formkit: select - label: "别名生成策略" - name: slugGenerationStrategy - value: 'generateByTitle' - options: - - label: '根据标题' - value: 'generateByTitle' - - label: '时间戳' - value: 'timestamp' - - label: 'Short UUID' - value: 'shortUUID' - - label: 'UUID' - value: 'UUID' - - $formkit: attachmentPolicySelect - name: attachmentPolicyName - label: "附件存储策略" - value: "default-policy" - - $formkit: attachmentGroupSelect - name: attachmentGroupName - label: "附件存储组" - value: "" - - group: seo - label: SEO 设置 - formSchema: - - $formkit: checkbox - name: blockSpiders - label: "屏蔽搜索引擎" - value: false - - $formkit: textarea - name: keywords - label: "站点关键词" - - $formkit: textarea - name: description - label: "站点描述" +# - group: post +# label: 文章设置 +# formSchema: +# - $formkit: number +# label: "文章列表显示条数" +# name: postPageSize +# value: 10 +# min: 1 +# max: 100 +# validation: required | max:100 +# - $formkit: number +# label: "归档页文章显示条数" +# name: archivePageSize +# value: 10 +# min: 1 +# max: 100 +# validation: required | max:100 +# - $formkit: number +# label: "分类页文章显示条数" +# name: categoryPageSize +# value: 10 +# min: 1 +# max: 100 +# validation: required | max:100 +# - $formkit: number +# label: "标签页文章显示条数" +# name: tagPageSize +# value: 10 +# min: 1 +# max: 100 +# validation: required +# - $formkit: select +# label: "别名生成策略" +# name: slugGenerationStrategy +# value: 'generateByTitle' +# options: +# - label: '根据标题' +# value: 'generateByTitle' +# - label: '时间戳' +# value: 'timestamp' +# - label: 'Short UUID' +# value: 'shortUUID' +# - label: 'UUID' +# value: 'UUID' +# - $formkit: attachmentPolicySelect +# name: attachmentPolicyName +# label: "附件存储策略" +# value: "default-policy" +# - $formkit: attachmentGroupSelect +# name: attachmentGroupName +# label: "附件存储组" +# value: "" +# - group: seo +# label: SEO 设置 +# formSchema: +# - $formkit: checkbox +# name: blockSpiders +# label: "屏蔽搜索引擎" +# value: false +# - $formkit: textarea +# name: keywords +# label: "站点关键词" +# - $formkit: textarea +# name: description +# label: "站点描述" - group: user label: 用户设置 formSchema: @@ -118,62 +118,62 @@ spec: name: systemUserOnly value: true label: "仅允许注册用户评论" - - group: routeRules - label: 主题路由设置 - formSchema: - - $formkit: text - label: "分类页路由前缀" - value: "categories" - name: categories - validation: required | alphanumeric - - $formkit: text - label: "标签页路由前缀" - value: "tags" - name: tags - validation: required | alphanumeric - - $formkit: text - label: "归档页路由前缀" - value: "archives" - name: archives - validation: required | alphanumeric - - $formkit: select - label: 文章详情页访问规则 - value: '/archives/{slug}' - options: - - label: '/archives/{slug}' - value: '/archives/{slug}' - - label: '/archives/{name}' - value: '/archives/{name}' - - label: '/?p={name}' - value: '/?p={name}' - - label: '/?p={slug}' - value: '/?p={slug}' - - label: '/{year}/{slug}' - value: '/{year:\d{4}}/{slug}' - - label: '/{year}/{month}/{slug}' - value: '/{year:\d{4}}/{month:\d{2}}/{slug}' - - label: '/{year}/{month}/{day}/{slug}' - value: '/{year:\d{4}}/{month:\d{2}}/{day:\d{2}}/{slug}' - name: post - validation: required - - group: codeInjection - label: 代码注入 - formSchema: - - $formkit: code - language: html - height: 200px - label: "全局 head 标签" - name: globalHead - help: "注入代码到所有页面的 head 标签部分" - - $formkit: code - language: html - height: 200px - label: "内容页 head 标签" - name: contentHead - help: "注入代码到文章页面和自定义页面的 head 标签部分" - - $formkit: code - language: html - height: 200px - label: "页脚" - name: footer - help: "注入代码到所有页面的页脚部分" +# - group: routeRules +# label: 主题路由设置 +# formSchema: +# - $formkit: text +# label: "分类页路由前缀" +# value: "categories" +# name: categories +# validation: required | alphanumeric +# - $formkit: text +# label: "标签页路由前缀" +# value: "tags" +# name: tags +# validation: required | alphanumeric +# - $formkit: text +# label: "归档页路由前缀" +# value: "archives" +# name: archives +# validation: required | alphanumeric +# - $formkit: select +# label: 文章详情页访问规则 +# value: '/archives/{slug}' +# options: +# - label: '/archives/{slug}' +# value: '/archives/{slug}' +# - label: '/archives/{name}' +# value: '/archives/{name}' +# - label: '/?p={name}' +# value: '/?p={name}' +# - label: '/?p={slug}' +# value: '/?p={slug}' +# - label: '/{year}/{slug}' +# value: '/{year:\d{4}}/{slug}' +# - label: '/{year}/{month}/{slug}' +# value: '/{year:\d{4}}/{month:\d{2}}/{slug}' +# - label: '/{year}/{month}/{day}/{slug}' +# value: '/{year:\d{4}}/{month:\d{2}}/{day:\d{2}}/{slug}' +# name: post +# validation: required +# - group: codeInjection +# label: 代码注入 +# formSchema: +# - $formkit: code +# language: html +# height: 200px +# label: "全局 head 标签" +# name: globalHead +# help: "注入代码到所有页面的 head 标签部分" +# - $formkit: code +# language: html +# height: 200px +# label: "内容页 head 标签" +# name: contentHead +# help: "注入代码到文章页面和自定义页面的 head 标签部分" +# - $formkit: code +# language: html +# height: 200px +# label: "页脚" +# name: footer +# help: "注入代码到所有页面的页脚部分" diff --git a/console/console-src/modules/interface/themes/layouts/ThemeLayout.vue b/console/console-src/modules/interface/themes/layouts/ThemeLayout.vue index fd5c1bc29032b9558168d284cb8ab28ee1688142..5488ae3b84c5987ee761db5c355490625f408f16 100644 --- a/console/console-src/modules/interface/themes/layouts/ThemeLayout.vue +++ b/console/console-src/modules/interface/themes/layouts/ThemeLayout.vue @@ -207,7 +207,11 @@ onMounted(() => { {{ $t("core.common.buttons.preview") }} - + diff --git a/console/src/assets/home.svg b/console/src/assets/home.svg new file mode 100644 index 0000000000000000000000000000000000000000..824e85955ab32475a14658c09404fba63e199819 --- /dev/null +++ b/console/src/assets/home.svg @@ -0,0 +1 @@ + diff --git a/console/src/assets/my-logo.svg b/console/src/assets/my-logo.svg new file mode 100644 index 0000000000000000000000000000000000000000..d795702623b8b19afbe96f89c661d19fc7794ac4 --- /dev/null +++ b/console/src/assets/my-logo.svg @@ -0,0 +1,3 @@ + + diff --git a/console/src/vite/config-builder.ts b/console/src/vite/config-builder.ts index ee238d9b1c7df4b6948c137122786710645e7ded..40b6fb512596a347b83fd2817b025b7bcf246d2a 100644 --- a/console/src/vite/config-builder.ts +++ b/console/src/vite/config-builder.ts @@ -30,7 +30,7 @@ export const sharedPlugins = [ compiler: "vue3", customCollections: { core: { - logo: () => fs.readFileSync("./src/assets/logo.svg", "utf-8"), + logo: () => fs.readFileSync("./src/assets/my-logo.svg", "utf-8"), }, }, }), diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 309b4e18dbc7cb8a7a7d18a3fb70adefb27de513..bdc9a83b1e6524dceba5ea9ae6c6a2792494b4be 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index a672bc3cb34cc7dd821a3c834d8bc4f914ff6350..72f56e5ba0a625a241608b385142148acae06f60 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,13 @@ +//pluginManagement { +// repositories { +// maven { url 'https://repo.spring.io/milestone' } +// gradlePluginPortal() +// } +//} pluginManagement { repositories { - maven { url 'https://repo.spring.io/milestone' } + maven { url "https://maven.aliyun.com/repository/gradle-plugin" + } gradlePluginPortal() } }