Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
智布道
OneBlog
提交
da025d15
O
OneBlog
项目概览
智布道
/
OneBlog
8 个月 前同步成功
通知
11
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
OneBlog
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
da025d15
编写于
12月 22, 2021
作者:
c_x_lei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
前端cdn更新,readme更新
上级
5318ad1c
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
61 addition
and
59 deletion
+61
-59
README.md
README.md
+4
-6
blog-admin/src/main/resources/templates/include/macros.ftl
blog-admin/src/main/resources/templates/include/macros.ftl
+12
-12
blog-admin/src/main/resources/templates/layout/footer.ftl
blog-admin/src/main/resources/templates/layout/footer.ftl
+20
-19
blog-admin/src/main/resources/templates/login.ftl
blog-admin/src/main/resources/templates/login.ftl
+8
-7
blog-web/src/main/resources/templates/layout/footer.ftl
blog-web/src/main/resources/templates/layout/footer.ftl
+10
-9
blog-web/src/main/resources/templates/layout/quote.ftl
blog-web/src/main/resources/templates/layout/quote.ftl
+7
-6
未找到文件。
README.md
浏览文件 @
da025d15
...
...
@@ -111,12 +111,10 @@ ps: 虽然我知道,大部分人都是来了**直接下载源代码**后就潇
## Docker Compose(推荐)
1.
在任意位置下分别创建
`.env`
和
`docker-compose.yml`
(可以参考或直接复制
`docs/docker/docker-compose.yml.template`
的内容)
2.
执行
`docker-compose -p oneblog up -d`
## Docker Compose
1.
打包项目
`mvn clean package -Dmaven.test.skip=true -Pdev`
Compose 是用于定义和运行多容器 Docker 应用程序的工具。通过 Compose,您可以使用 YML 文件来配置应用程序需要的所有服务。然后,使用一个命令,就可以从 YML 文件配置中创建并启动所有服务。
使用之前需要先安装docker环境,建议版本为17.06.0-ce以上版本
1.
下载源码,安装maven环境,
打包项目
`mvn clean package -Dmaven.test.skip=true -Pdev`
,放到服务器
2.
进入
`docs/docker`
目录
3.
按照注释修改
`.env`
文件
4.
执行
`docker-compose -p oneblog up -d`
...
...
blog-admin/src/main/resources/templates/include/macros.ftl
浏览文件 @
da025d15
...
...
@@ -9,20 +9,20 @@
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1"
>
<title>
${config.siteName}后台管理系统
</title>
<link
href=
"/assets/images/favicon.ico"
rel=
"shortcut icon"
type=
"image/x-icon"
>
<link
href=
"https://cdn.
jsdelivr.net/npm/font-awesome@
4.7.0/css/font-awesome.min.css"
rel=
"stylesheet"
type=
"text/css"
>
<link
href=
"https://cdn.
jsdelivr.net/npm/bootstrap@3.3.0/dist
/css/bootstrap.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.
jsdelivr.net/npm/jquery-confirm@3.3.2/dist
/jquery-confirm.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.
jsdelivr.net/npm/jquery.fancybox@2.1.5/source
/jquery.fancybox.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.
jsdelivr.net/npm/nprogress@
0.2.0/nprogress.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.
jsdelivr.net/npm/toastr@2.0.3/nuget/content/content
/toastr.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.
bootcdn.net/ajax/libs/font-awesome/
4.7.0/css/font-awesome.min.css"
rel=
"stylesheet"
type=
"text/css"
>
<link
href=
"https://cdn.
bootcdn.net/ajax/libs/twitter-bootstrap/3.3.5
/css/bootstrap.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.
bootcdn.net/ajax/libs/jquery-confirm/3.3.2
/jquery-confirm.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.
bootcdn.net/ajax/libs/fancybox/2.1.5
/jquery.fancybox.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.
bootcdn.net/ajax/libs/nprogress/
0.2.0/nprogress.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.
bootcdn.net/ajax/libs/toastr.js/2.0.3/css
/toastr.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.jsdelivr.net/npm/icheck@1.0.2/skins/square/green.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.
jsdelivr.net/npm/bootstrap-table@1.11.1/dist
/bootstrap-table.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.
jsdelivr.net/npm/daterangepicker@
2.1.25/daterangepicker.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.
jsdelivr.net/npm/bootstrap-datetimepicker-npm@4.17.37-npm/build
/css/bootstrap-datetimepicker.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.
bootcdn.net/ajax/libs/bootstrap-table/1.11.1
/bootstrap-table.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.
bootcdn.net/ajax/libs/bootstrap-daterangepicker/
2.1.25/daterangepicker.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.
bootcdn.net/ajax/libs/bootstrap-datetimepicker/4.17.37
/css/bootstrap-datetimepicker.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.jsdelivr.net/npm/@ztree/ztree_v3@3.5.37/css/metroStyle/metroStyle.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.
jsdelivr.net/npm/switchery@0.0
.2/switchery.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.
jsdelivr.net/npm/@adactive/bootstrap-tagsinput@0.8.2/dist/bootstrap-tagsinput-typeahead.min
.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.
jsdelivr.net/npm/@adactive/bootstrap-tagsinput@0.8.2/dist/bootstrap-tagsinput.min.cs
s"
rel=
"stylesheet"
>
<link
href=
"https://cdn.
bootcdn.net/ajax/libs/switchery/0.8
.2/switchery.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.
bootcdn.net/ajax/libs/bootstrap-tagsinput/0.8.0/bootstrap-tagsinput-typeahead
.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.
bootcdn.net/ajax/libs/bootstrap-tagsinput/0.8.0/bootstrap-tagsinput.min.j
s"
rel=
"stylesheet"
>
<link
href=
"https://cdn.jsdelivr.net/npm/switchery-npm@0.8.2/index.min.css"
rel=
"stylesheet"
>
<
#--
<
link
href=
"https://cdnjs.cloudflare.com/ajax/libs/pnotify/3.2.1/pnotify.css"
rel=
"stylesheet"
>
...
...
blog-admin/src/main/resources/templates/layout/footer.ftl
浏览文件 @
da025d15
...
...
@@ -6,27 +6,28 @@
staticPath: '${config.staticWebSite}'
}
</script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jquery@1.11.1/dist/jquery.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/bootstrap@3.3.0/dist/js/bootstrap.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jquery-lazyload@1.9.3/jquery.lazyload.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jquery-confirm@3.3.2/dist/jquery-confirm.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jquery.fancybox@2.1.5/source/jquery.fancybox.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/mustache@2.3.0/mustache.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/xss@0.3.3/dist/xss.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/nprogress@0.2.0/nprogress.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/toastr@2.0.3/nuget/content/scripts/toastr.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/icheck@1.0.2/icheck.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.11.1/dist/bootstrap-table.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.11.1/dist/locale/bootstrap-table-zh-CN.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/daterangepicker@2.1.25/moment.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/daterangepicker@2.1.25/daterangepicker.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap-datetimepicker-npm@4.17.37-npm/build/js/bootstrap-datetimepicker.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap-progressbar@0.9.0/bootstrap-progressbar.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@ztree/ztree_v3@3.5.37/js/jquery.ztree.core.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@ztree/ztree_v3@3.5.37/js/jquery.ztree.excheck.min.js"></script>
<script type="text/javascript" src="https://cdn.staticfile.org/jquery/1.11.1/jquery.min.js"></script>
<script type="text/javascript" src="https://cdn.bootcdn.net/ajax/libs/twitter-bootstrap/3.3.5/js/bootstrap.min.js"></script>
<script type="text/javascript" src="https://cdn.staticfile.org/jquery_lazyload/1.9.3/jquery.lazyload.min.js"></script>
<script type="text/javascript" src="https://cdn.staticfile.org/jquery-confirm/3.3.2/jquery-confirm.min.js"></script>
<script type="text/javascript" src="https://cdn.staticfile.org/fancybox/2.1.5/jquery.fancybox.min.js"></script>
<script type="text/javascript" src="https://cdn.staticfile.org/mustache.js/2.3.0/mustache.min.js"></script>
<script type="text/javascript" src="https://cdn.staticfile.org/js-xss/0.3.3/xss.min.js"></script>
<script type="text/javascript" src="https://cdn.staticfile.org/nprogress/0.2.0/nprogress.min.js"></script>
<script src="https://cdn.staticfile.org/toastr.js/2.0.3/js/toastr.min.js"></script>
<script src="https://cdn.bootcdn.net/ajax/libs/iCheck/1.0.2/icheck.min.js"></script>
<script src="https://cdn.staticfile.org/bootstrap-table/1.11.1/bootstrap-table.min.js"></script>
<script src="https://cdn.staticfile.org/bootstrap-table/1.11.1/locale/bootstrap-table-zh-CN.min.js"></script>
<script src="https://cdn.bootcdn.net/ajax/libs/moment.js/2.1.0/moment.min.js"></script>
<script src="https://cdn.bootcdn.net/ajax/libs/bootstrap-daterangepicker/2.1.25/daterangepicker.min.js"></script>
<script src="https://cdn.bootcdn.net/ajax/libs/bootstrap-datetimepicker/4.17.37/js/bootstrap-datetimepicker.min.js"></script>
<script src="https://cdn.bootcdn.net/ajax/libs/bootstrap-progressbar/0.9.0/bootstrap-progressbar.min.js"></script>
<script src="https://cdn.bootcdn.net/ajax/libs/zTree.v3/3.5.37/js/jquery.ztree.core.min.js"></script>
<script src="https://cdn.bootcdn.net/ajax/libs/zTree.v3/3.5.37/js/jquery.ztree.excheck.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/switchery-npm@0.8.2/index.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/wangeditor@4.7.9/dist/wangEditor.min.js" type="text/javascript"></script>
<script src="https://cdn.
jsdelivr.net/npm/@adactive/bootstrap-tagsinput@0.8.2/dist/bootstrap-tagsinput
.min.js"></script>
<script src="https://cdn.
bootcdn.net/ajax/libs/bootstrap-tagsinput/0.8.0/bootstrap-tagsinput-angular
.min.js"></script>
<script src="https://www.layuicdn.com/layui/layui.js"></script>
<#--<script src="https://cdn.tiny.cloud/1/no-api-key/tinymce/5/tinymce.min.js"></script>-->
<#if config.tinyMCEKey?exists>
...
...
blog-admin/src/main/resources/templates/login.ftl
浏览文件 @
da025d15
...
...
@@ -7,10 +7,11 @@
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1"
>
<title>
${config.siteName}后台管理系统
</title>
<link
href=
"/assets/images/favicon.ico"
rel=
"icon"
>
<link
href=
"https://cdn.jsdelivr.net/npm/bootstrap@3.3.0/dist/css/bootstrap.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.jsdelivr.net/npm/font-awesome@4.7.0/css/font-awesome.min.css"
rel=
"stylesheet"
type=
"text/css"
>
<link
href=
"https://cdn.jsdelivr.net/npm/jquery-confirm@3.3.2/dist/jquery-confirm.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.jsdelivr.net/npm/nprogress@0.2.0/nprogress.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.bootcdn.net/ajax/libs/twitter-bootstrap/3.3.5/css/bootstrap.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.bootcdn.net/ajax/libs/twitter-bootstrap/3.3.5/js/bootstrap.min.js"
rel=
"stylesheet"
>
<link
href=
"https://cdn.bootcdn.net/ajax/libs/jquery-confirm/3.3.2/jquery-confirm.min.css"
rel=
"stylesheet"
>
<link
href=
"https://cdn.bootcdn.net/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"
rel=
"stylesheet"
type=
"text/css"
>
<link
href=
"https://cdn.bootcdn.net/ajax/libs/nprogress/0.2.0/nprogress.min.css"
rel=
"stylesheet"
>
<link
href=
"/assets/css/zhyd.core.css"
rel=
"stylesheet"
>
</head>
...
...
@@ -72,9 +73,9 @@
</div>
</body>
<script
type=
"text/javascript"
src=
"https://cdn.
jsdelivr.net/npm/jquery@1.11.1/dist/jquery
.min.js"
></script>
<script
type=
"text/javascript"
src=
"https://cdn.
jsdelivr.net/npm/bootstrap@3.3.0/dist/js/bootstrap
.min.js"
></script>
<script
type=
"text/javascript"
src=
"https://cdn.
jsdelivr.net/npm/jquery-confirm@3.3.2/dist
/jquery-confirm.min.js"
></script>
<script
type=
"text/javascript"
src=
"https://cdn.
bootcdn.net/ajax/libs/twitter-bootstrap/3.3.5/js/bootstrap
.min.js"
></script>
<script
type=
"text/javascript"
src=
"https://cdn.
staticfile.org/jquery/1.11.1/jquery
.min.js"
></script>
<script
type=
"text/javascript"
src=
"https://cdn.
staticfile.org/jquery-confirm/3.3.2
/jquery-confirm.min.js"
></script>
<script
src=
"/assets/js/zhyd.tool.js"
></script>
<script>
$
(
"
#modal
"
).
modal
(
'
show
'
);
...
...
blog-web/src/main/resources/templates/layout/footer.ftl
浏览文件 @
da025d15
...
...
@@ -159,15 +159,16 @@
</div>
</footer>
<a class="to-top" title="点击返回顶部" data-toggle="tooltip" data-placement="bottom"></a>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jquery@1.11.1/dist/jquery.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/bootstrap@3.3.0/dist/js/bootstrap.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jquery-lazyload@1.9.3/jquery.lazyload.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jquery-confirm@3.3.2/dist/jquery-confirm.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jquery.fancybox@2.1.5/source/jquery.fancybox.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/bootstrapvalidator@0.5.4/dist/js/bootstrapValidator.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/nprogress@0.2.0/nprogress.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/xss@0.3.3/dist/xss.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/mustache@2.3.0/mustache.min.js"></script>
<script type="text/javascript" src="https://cdn.staticfile.org/jquery.lazyload/1.9.1/jquery.lazyload.min.js"></script>
<script type="text/javascript" src="https://cdn.staticfile.org/bootstrap-validator/0.5.3/js/bootstrapValidator.min.js"></script>
<script type="text/javascript" src="https://cdn.staticfile.org/jquery/1.11.1/jquery.min.js"></script>
<script type="text/javascript" src="https://cdn.bootcdn.net/ajax/libs/twitter-bootstrap/3.3.5/js/bootstrap.min.js"></script>
<script type="text/javascript" src="https://cdn.staticfile.org/jquery_lazyload/1.9.3/jquery.lazyload.min.js"></script>
<script type="text/javascript" src="https://cdn.staticfile.org/jquery-confirm/3.3.2/jquery-confirm.min.js"></script>
<script type="text/javascript" src="https://cdn.staticfile.org/fancybox/2.1.5/jquery.fancybox.min.js"></script>
<script type="text/javascript" src="https://cdn.staticfile.org/mustache.js/2.3.0/mustache.min.js"></script>
<script type="text/javascript" src="https://cdn.staticfile.org/js-xss/0.3.3/xss.min.js"></script>
<script type="text/javascript" src="https://cdn.staticfile.org/nprogress/0.2.0/nprogress.min.js"></script>
<script type="text/javascript">
var appConfig = {
siteName: "${config.siteName}",
...
...
blog-web/src/main/resources/templates/layout/quote.ftl
浏览文件 @
da025d15
<link href="${config.siteFavicon}" rel="shortcut icon" type="image/x-icon">
<link href="https://cdn.jsdelivr.net/npm/font-awesome@4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@3.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/jquery-confirm@3.3.2/dist/jquery-confirm.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/jquery.fancybox@2.1.5/source/jquery.fancybox.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/bootstrapvalidator@0.5.4/dist/css/bootstrapValidator.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/nprogress@0.2.0/nprogress.min.css" rel="stylesheet">
<link href="https://cdn.bootcdn.net/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
<link href="https://cdn.bootcdn.net/ajax/libs/twitter-bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet">
<link href="https://cdn.bootcdn.net/ajax/libs/twitter-bootstrap/3.3.5/js/bootstrap.min.js" rel="stylesheet">
<link href="https://cdn.bootcdn.net/ajax/libs/jquery-confirm/3.3.2/jquery-confirm.min.css" rel="stylesheet">
<link href="https://cdn.bootcdn.net/ajax/libs/fancybox/2.1.5/jquery.fancybox.min.css" rel="stylesheet">
<link href="https://cdn.bootcdn.net/ajax/libs/jquery.bootstrapvalidator/0.5.3/css/bootstrapValidator.min.css" rel="stylesheet">
<link href="https://cdn.bootcdn.net/ajax/libs/nprogress/0.2.0/nprogress.min.css" rel="stylesheet">
<link href="${config.staticWebSite}/css/zhyd.core.css" rel="stylesheet" type="text/css">
<link href="${config.staticWebSite}/css/zhyd.comment.css" rel="stylesheet" type="text/css">
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录