Skip to content

Commit

Permalink
Merge branch 'master' into product
Browse files Browse the repository at this point in the history
  • Loading branch information
zhaoyangkun committed Mar 21, 2024
2 parents 6d7712c + 5529f2e commit 959cd96
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## 注意

部署了最新版本 `Aries` 的小伙伴请注意一下，需要进入后台管理的 `系统/设置/网站设置`，将**静态资源根路径**修改为最新版本：[https://jsd.onmicrosoft.cn/gh/zhaoyangkun/aries@latest](https://jsd.onmicrosoft.cn/gh/zhaoyangkun/aries@latest)
部署了最新版本 `Aries` 的小伙伴请注意一下，需要进入后台管理的 `系统/设置/网站设置`，将**静态资源根路径**修改为最新版本：[https://jsd.onmicrosoft.cn/gh/zhaoyangkun/aries@1.3.6](https://jsd.onmicrosoft.cn/gh/zhaoyangkun/aries@1.3.6)

[//]: # (> 最后的 `v1.2.3` 为 github release 对应的版本号，请保持最新，否则可能出现部分静态资源无法访问的情况。)

Expand Down
2 changes: 1 addition & 1 deletion admin/vue.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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://jsd.onmicrosoft.cn/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@1.3.6/resources/admin'
// https://gh.sourcegcdn.com/zhaoyangkun/aries/v1.2.3/resources/admin
// const publicPath = process.env.VUE_APP_PUBLIC_PATH || '/' // 开发环境
// const publicPath = './' // 生产环境
Expand Down
2 changes: 1 addition & 1 deletion config/setting/setting.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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://jsd.onmicrosoft.cn/gh/zhaoyangkun/aries@latest"
b.StaticRootPath = "https://jsd.onmicrosoft.cn/gh/zhaoyangkun/aries@1.3.6"
}
}
if siteName, ok := siteSetting["site_name"]; ok {
Expand Down
2 changes: 1 addition & 1 deletion handlers/api/auth_handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func (a *AuthHandler) Register(ctx *gin.Context) {
}
staticRootVal := regForm.SiteUrl
if setting.Config.Server.Mode == gin.ReleaseMode {
staticRootVal = "https://jsd.onmicrosoft.cn/gh/zhaoyangkun/aries@latest"
staticRootVal = "https://jsd.onmicrosoft.cn/gh/zhaoyangkun/aries@1.3.6"
}
staticRootItem := models.SysSettingItem{
SysId: sysSetting.ID,
Expand Down
2 changes: 1 addition & 1 deletion handlers/api/sys_setting_handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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://jsd.onmicrosoft.cn/gh/zhaoyangkun/aries@latest"
staticRootVal = "https://jsd.onmicrosoft.cn/gh/zhaoyangkun/aries@1.3.6"
}
staticRootItem := models.SysSettingItem{
SysId: sysSetting.ID,
Expand Down
4 changes: 2 additions & 2 deletions resources/admin/index.html
View file
Original file line number Diff line number Diff line change
@@ -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://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%; }
<!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@1.3.6/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://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>
.d2-home__loading { height: 32px; width: 32px; margin-bottom: 20px; }</style><link href=https://jsd.onmicrosoft.cn/gh/zhaoyangkun/aries@1.3.6/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@1.3.6/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@1.3.6/resources/admin/js/admin.js></script></body></html>
6 changes: 3 additions & 3 deletions resources/admin/js/admin.js
View file

Large diffs are not rendered by default.

0 comments on commit 959cd96

Please sign in to comment.