Merge branch 'master' into product

zhaoyangkun · Mar 2, 2024 · 7ca3921 · 7ca3921
2 parents 1254dba + ad392f4
commit 7ca3921
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ## 注意
 
-部署了最新版本 `Aries` 的小伙伴请注意一下，需要进入后台管理的 `系统/设置/网站设置`，将**静态资源根路径**修改为最新版本：[https://gcore.jsdelivr.net/gh/zhaoyangkun/aries@latest](https://gcore.jsdelivr.net/gh/zhaoyangkun/aries@latest)
+部署了最新版本 `Aries` 的小伙伴请注意一下，需要进入后台管理的 `系统/设置/网站设置`，将**静态资源根路径**修改为最新版本：[https://jsd.onmicrosoft.cn/gh/zhaoyangkun/aries@latest](https://jsd.onmicrosoft.cn/gh/zhaoyangkun/aries@latest)
 
 [//]: # (> 最后的 `v1.2.3` 为 github release 对应的版本号，请保持最新，否则可能出现部分静态资源无法访问的情况。)
 

diff --git a/admin/vue.config.js b/admin/vue.config.js
@@ -13,7 +13,7 @@ process.env.VUE_APP_VERSION = require('./package.json').version
 process.env.VUE_APP_BUILD_TIME = require('dayjs')().format('YYYY-M-D HH:mm:ss')
 
 // 基础路径 注意发布之前要先修改这里
-const publicPath = process.env.NODE_ENV === 'development' ? process.env.VUE_APP_PUBLIC_PATH || '/' : 'https://gcore.jsdelivr.net/gh/zhaoyangkun/aries@latest/resources/admin'
+const publicPath = process.env.NODE_ENV === 'development' ? process.env.VUE_APP_PUBLIC_PATH || '/' : 'https://jsd.onmicrosoft.cn/gh/zhaoyangkun/aries@latest/resources/admin'
 // https://gh.sourcegcdn.com/zhaoyangkun/aries/v1.2.3/resources/admin
 // const publicPath = process.env.VUE_APP_PUBLIC_PATH || '/' // 开发环境
 // const publicPath = './' // 生产环境

diff --git a/config/setting/setting.go b/config/setting/setting.go
@@ -143,7 +143,7 @@ func (b *BlogVariable) InitBlogVars(siteSetting map[string]string, socialInfo ma
 		if Config.Server.Mode == gin.DebugMode {
 			b.StaticRootPath = b.ContextPath
 		} else {
-			b.StaticRootPath = "https://gcore.jsdelivr.net/gh/zhaoyangkun/aries@latest"
+			b.StaticRootPath = "https://jsd.onmicrosoft.cn/gh/zhaoyangkun/aries@latest"
 		}
 	}
 	if siteName, ok := siteSetting["site_name"]; ok {

diff --git a/handlers/api/auth_handler.go b/handlers/api/auth_handler.go
@@ -90,7 +90,7 @@ func (a *AuthHandler) Register(ctx *gin.Context) {
 	}
 	staticRootVal := regForm.SiteUrl
 	if setting.Config.Server.Mode == gin.ReleaseMode {
-		staticRootVal = "https://gcore.jsdelivr.net/gh/zhaoyangkun/aries@latest"
+		staticRootVal = "https://jsd.onmicrosoft.cn/gh/zhaoyangkun/aries@latest"
 	}
 	staticRootItem := models.SysSettingItem{
 		SysId: sysSetting.ID,

diff --git a/handlers/api/sys_setting_handler.go b/handlers/api/sys_setting_handler.go
@@ -82,7 +82,7 @@ func (s *SysSettingHandler) SaveSiteSetting(ctx *gin.Context) {
 	if sysId == 0 {
 		staticRootVal := settingForm.SiteUrl
 		if setting.Config.Server.Mode == gin.ReleaseMode {
-			staticRootVal = "https://gcore.jsdelivr.net/gh/zhaoyangkun/aries@latest"
+			staticRootVal = "https://jsd.onmicrosoft.cn/gh/zhaoyangkun/aries@latest"
 		}
 		staticRootItem := models.SysSettingItem{
 			SysId: sysSetting.ID,

diff --git a/resources/admin/index.html b/resources/admin/index.html
@@ -1,6 +1,6 @@
-<!DOCTYPE html><html lang=zh-cmn-Hans><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=https://gcore.jsdelivr.net/gh/zhaoyangkun/aries@latest/resources/admin/aries.ico><link href=https://npm.elemecdn.com/element-ui@2.13.1/lib/theme-chalk/index.css rel=preload as=style><link href=https://npm.elemecdn.com/element-ui@2.13.1/lib/theme-chalk/index.css rel=stylesheet><link href=https://npm.elemecdn.com/nprogress@0.2.0/nprogress.css rel=preload as=style><link href=https://npm.elemecdn.com/nprogress@0.2.0/nprogress.css rel=stylesheet><link href=https://npm.elemecdn.com/vue@2.6.10/dist/vue.min.js rel=preload as=script><link href=https://npm.elemecdn.com/vue-i18n@8.15.1/dist/vue-i18n.min.js rel=preload as=script><link href=https://npm.elemecdn.com/vue-router@3.1.2/dist/vue-router.min.js rel=preload as=script><link href=https://npm.elemecdn.com/vuex@3.1.2/dist/vuex.min.js rel=preload as=script><link href=https://npm.elemecdn.com/axios@0.19.0/dist/axios.min.js rel=preload as=script><link href=https://npm.elemecdn.com/better-scroll@1.15.1/dist/bscroll.min.js rel=preload as=script><link href=https://npm.elemecdn.com/axios-mock-adapter@1.18.1/dist/axios-mock-adapter.min.js rel=preload as=script><link href=https://npm.elemecdn.com/element-ui@2.13.1/lib/index.js rel=preload as=script><link href=https://npm.elemecdn.com/lodash@4.17.15/lodash.min.js rel=preload as=script><link href=https://npm.elemecdn.com/ua-parser-js@0.7.20/dist/ua-parser.min.js rel=preload as=script><link href=https://npm.elemecdn.com/js-cookie@2.2.1/src/js.cookie.js rel=preload as=script><link href=https://npm.elemecdn.com/nprogress@0.2.0/nprogress.js rel=preload as=script><link href=https://npm.elemecdn.com/dayjs@1.8.17/dayjs.min.js rel=preload as=script><link href=https://npm.elemecdn.com/fuse.js@5.2.3/dist/fuse.min.js rel=preload as=script><link href=https://npm.elemecdn.com/hotkeys-js@3.7.3/dist/hotkeys.min.js rel=preload as=script><link href=https://npm.elemecdn.com/qs@6.9.2/dist/qs.js rel=preload as=script><link href=https://npm.elemecdn.com/lowdb@1.0.0/dist/low.min.js rel=preload as=script><link href=https://npm.elemecdn.com/lowdb@1.0.0/dist/LocalStorage.min.js rel=preload as=script><link href=https://npm.elemecdn.com/screenfull@5.0.2/dist/screenfull.js rel=preload as=script><link href=https://npm.elemecdn.com/sortablejs@1.10.2/Sortable.min.js rel=preload as=script><title>Aries Admin</title><style>html, body, #app { height: 100%; margin: 0px; padding: 0px; width: 100%; }
+<!DOCTYPE html><html lang=zh-cmn-Hans><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=https://jsd.onmicrosoft.cn/gh/zhaoyangkun/aries@latest/resources/admin/aries.ico><link href=https://npm.elemecdn.com/element-ui@2.13.1/lib/theme-chalk/index.css rel=preload as=style><link href=https://npm.elemecdn.com/element-ui@2.13.1/lib/theme-chalk/index.css rel=stylesheet><link href=https://npm.elemecdn.com/nprogress@0.2.0/nprogress.css rel=preload as=style><link href=https://npm.elemecdn.com/nprogress@0.2.0/nprogress.css rel=stylesheet><link href=https://npm.elemecdn.com/vue@2.6.10/dist/vue.min.js rel=preload as=script><link href=https://npm.elemecdn.com/vue-i18n@8.15.1/dist/vue-i18n.min.js rel=preload as=script><link href=https://npm.elemecdn.com/vue-router@3.1.2/dist/vue-router.min.js rel=preload as=script><link href=https://npm.elemecdn.com/vuex@3.1.2/dist/vuex.min.js rel=preload as=script><link href=https://npm.elemecdn.com/axios@0.19.0/dist/axios.min.js rel=preload as=script><link href=https://npm.elemecdn.com/better-scroll@1.15.1/dist/bscroll.min.js rel=preload as=script><link href=https://npm.elemecdn.com/axios-mock-adapter@1.18.1/dist/axios-mock-adapter.min.js rel=preload as=script><link href=https://npm.elemecdn.com/element-ui@2.13.1/lib/index.js rel=preload as=script><link href=https://npm.elemecdn.com/lodash@4.17.15/lodash.min.js rel=preload as=script><link href=https://npm.elemecdn.com/ua-parser-js@0.7.20/dist/ua-parser.min.js rel=preload as=script><link href=https://npm.elemecdn.com/js-cookie@2.2.1/src/js.cookie.js rel=preload as=script><link href=https://npm.elemecdn.com/nprogress@0.2.0/nprogress.js rel=preload as=script><link href=https://npm.elemecdn.com/dayjs@1.8.17/dayjs.min.js rel=preload as=script><link href=https://npm.elemecdn.com/fuse.js@5.2.3/dist/fuse.min.js rel=preload as=script><link href=https://npm.elemecdn.com/hotkeys-js@3.7.3/dist/hotkeys.min.js rel=preload as=script><link href=https://npm.elemecdn.com/qs@6.9.2/dist/qs.js rel=preload as=script><link href=https://npm.elemecdn.com/lowdb@1.0.0/dist/low.min.js rel=preload as=script><link href=https://npm.elemecdn.com/lowdb@1.0.0/dist/LocalStorage.min.js rel=preload as=script><link href=https://npm.elemecdn.com/screenfull@5.0.2/dist/screenfull.js rel=preload as=script><link href=https://npm.elemecdn.com/sortablejs@1.10.2/Sortable.min.js rel=preload as=script><title>Aries Admin</title><style>html, body, #app { height: 100%; margin: 0px; padding: 0px; width: 100%; }
       .d2-home { background-color: #303133; height: 100%; display: flex; flex-direction: column; }
       .d2-home__main { user-select: none; width: 100%; flex-grow: 1; display: flex; justify-content: center; align-items: center; flex-direction: column; }
       .d2-home__footer { width: 100%; flex-grow: 0; text-align: center; padding: 1em 0; }
       .d2-home__footer > a { font-size: 12px; color: #ABABAB; text-decoration: none; }
-      .d2-home__loading { height: 32px; width: 32px; margin-bottom: 20px; }</style><link href=https://gcore.jsdelivr.net/gh/zhaoyangkun/aries@latest/resources/admin/css/admin.css rel=stylesheet></head><body><noscript><strong>Sorry, D2Admin will not work properly without JavaScript support. Enable JavaScript for browsers and continue.</strong></noscript><div id=app><div class=d2-home><div class=d2-home__main><img class=d2-home__loading src=https://gcore.jsdelivr.net/gh/zhaoyangkun/aries@latest/resources/admin/image/loading/loading-spin.svg alt=loading></div><div class=d2-home__footer><a href=https://github.com/d2-projects/d2-admin target=_blank>https://github.com/d2-projects/d2-admin</a></div></div></div><script src=https://npm.elemecdn.com/vue@2.6.10/dist/vue.min.js></script><script src=https://npm.elemecdn.com/vue-i18n@8.15.1/dist/vue-i18n.min.js></script><script src=https://npm.elemecdn.com/vue-router@3.1.2/dist/vue-router.min.js></script><script src=https://npm.elemecdn.com/vuex@3.1.2/dist/vuex.min.js></script><script src=https://npm.elemecdn.com/axios@0.19.0/dist/axios.min.js></script><script src=https://npm.elemecdn.com/better-scroll@1.15.1/dist/bscroll.min.js></script><script src=https://npm.elemecdn.com/axios-mock-adapter@1.18.1/dist/axios-mock-adapter.min.js></script><script src=https://npm.elemecdn.com/element-ui@2.13.1/lib/index.js></script><script src=https://npm.elemecdn.com/lodash@4.17.15/lodash.min.js></script><script src=https://npm.elemecdn.com/ua-parser-js@0.7.20/dist/ua-parser.min.js></script><script src=https://npm.elemecdn.com/js-cookie@2.2.1/src/js.cookie.js></script><script src=https://npm.elemecdn.com/nprogress@0.2.0/nprogress.js></script><script src=https://npm.elemecdn.com/dayjs@1.8.17/dayjs.min.js></script><script src=https://npm.elemecdn.com/fuse.js@5.2.3/dist/fuse.min.js></script><script src=https://npm.elemecdn.com/hotkeys-js@3.7.3/dist/hotkeys.min.js></script><script src=https://npm.elemecdn.com/qs@6.9.2/dist/qs.js></script><script src=https://npm.elemecdn.com/lowdb@1.0.0/dist/low.min.js></script><script src=https://npm.elemecdn.com/lowdb@1.0.0/dist/LocalStorage.min.js></script><script src=https://npm.elemecdn.com/screenfull@5.0.2/dist/screenfull.js></script><script src=https://npm.elemecdn.com/sortablejs@1.10.2/Sortable.min.js></script><script src=https://gcore.jsdelivr.net/gh/zhaoyangkun/aries@latest/resources/admin/js/admin.js></script></body></html>
+      .d2-home__loading { height: 32px; width: 32px; margin-bottom: 20px; }</style><link href=https://jsd.onmicrosoft.cn/gh/zhaoyangkun/aries@latest/resources/admin/css/admin.css rel=stylesheet></head><body><noscript><strong>Sorry, D2Admin will not work properly without JavaScript support. Enable JavaScript for browsers and continue.</strong></noscript><div id=app><div class=d2-home><div class=d2-home__main><img class=d2-home__loading src=https://jsd.onmicrosoft.cn/gh/zhaoyangkun/aries@latest/resources/admin/image/loading/loading-spin.svg alt=loading></div><div class=d2-home__footer><a href=https://github.com/d2-projects/d2-admin target=_blank>https://github.com/d2-projects/d2-admin</a></div></div></div><script src=https://npm.elemecdn.com/vue@2.6.10/dist/vue.min.js></script><script src=https://npm.elemecdn.com/vue-i18n@8.15.1/dist/vue-i18n.min.js></script><script src=https://npm.elemecdn.com/vue-router@3.1.2/dist/vue-router.min.js></script><script src=https://npm.elemecdn.com/vuex@3.1.2/dist/vuex.min.js></script><script src=https://npm.elemecdn.com/axios@0.19.0/dist/axios.min.js></script><script src=https://npm.elemecdn.com/better-scroll@1.15.1/dist/bscroll.min.js></script><script src=https://npm.elemecdn.com/axios-mock-adapter@1.18.1/dist/axios-mock-adapter.min.js></script><script src=https://npm.elemecdn.com/element-ui@2.13.1/lib/index.js></script><script src=https://npm.elemecdn.com/lodash@4.17.15/lodash.min.js></script><script src=https://npm.elemecdn.com/ua-parser-js@0.7.20/dist/ua-parser.min.js></script><script src=https://npm.elemecdn.com/js-cookie@2.2.1/src/js.cookie.js></script><script src=https://npm.elemecdn.com/nprogress@0.2.0/nprogress.js></script><script src=https://npm.elemecdn.com/dayjs@1.8.17/dayjs.min.js></script><script src=https://npm.elemecdn.com/fuse.js@5.2.3/dist/fuse.min.js></script><script src=https://npm.elemecdn.com/hotkeys-js@3.7.3/dist/hotkeys.min.js></script><script src=https://npm.elemecdn.com/qs@6.9.2/dist/qs.js></script><script src=https://npm.elemecdn.com/lowdb@1.0.0/dist/low.min.js></script><script src=https://npm.elemecdn.com/lowdb@1.0.0/dist/LocalStorage.min.js></script><script src=https://npm.elemecdn.com/screenfull@5.0.2/dist/screenfull.js></script><script src=https://npm.elemecdn.com/sortablejs@1.10.2/Sortable.min.js></script><script src=https://jsd.onmicrosoft.cn/gh/zhaoyangkun/aries@latest/resources/admin/js/admin.js></script></body></html>
diff --git a/resources/admin/js/admin.js b/resources/admin/js/admin.js
diff --git a/resources/themes/boundless-ui/static/js/vditor.min.js b/resources/themes/boundless-ui/static/js/vditor.min.js
diff --git a/resources/themes/boundless-ui/templates/common/head.tmpl b/resources/themes/boundless-ui/templates/common/head.tmpl
@@ -5,7 +5,7 @@
     <meta charset="UTF-8">
     <meta name="keywords" content="{{ .blogVars.SiteKeywords }}">
     <meta name="description" content="{{ .blogVars.SiteDesc }}">
-    <link rel="preconnect" href="https://gcore.jsdelivr.net">
+    <link rel="preconnect" href="https://jsd.onmicrosoft.cn">
     <link rel="preconnect" href="https://npm.elemecdn.com">
     <link rel="shortcut icon" href="{{ .blogVars.SiteLogo }}">
     <title>{{ if .subTitle }}{{ .subTitle }} - {{ end }}{{ .blogVars.SiteName }}</title>

diff --git a/resources/themes/xue/static/js/aries-comment.js b/resources/themes/xue/static/js/aries-comment.js
diff --git a/resources/themes/xue/templates/common/head.tmpl b/resources/themes/xue/templates/common/head.tmpl
@@ -6,7 +6,7 @@
         <meta name="keywords" content="{{ .blogVars.SiteKeywords }}">
         <meta name="description" content="{{ .blogVars.SiteDesc }}">
         <link rel="shortcut icon" href="{{ .blogVars.SiteLogo }}">
-        <link rel="preconnect" href="https://gcore.jsdelivr.net">
+        <link rel="preconnect" href="https://jsd.onmicrosoft.cn">
         <link rel="preconnect" href="https://npm.elemecdn.com">
         <title>{{ if .subTitle }}{{ .subTitle }} - {{ end }}{{ .blogVars.SiteName }}</title>
         <link rel="stylesheet" href="https://npm.elemecdn.com/tailwindcss@1.4.6/dist/tailwind.min.css">