Skip to content

Commit b711a2d

Browse files
zhangyd-czhangyd-c
committed
🔖 发布 2.3.4，增加 CDN 文件的后台配置
1 parent a4583e5 commit b711a2d

17 files changed

Lines changed: 396 additions & 141 deletions

File tree

‎blog-admin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>com.zyd</groupId>
1414
<artifactId>blog</artifactId>
15-
<version>2.3.3</version>
15+
<version>2.3.4</version>
1616
</parent>
1717

1818
<dependencies>

‎blog-admin/src/main/resources/templates/config.ftl‎

Lines changed: 298 additions & 66 deletions
Large diffs are not rendered by default.

‎blog-admin/src/main/resources/templates/include/macros.ftl‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,24 @@
99
<meta name="viewport" content="width=device-width, initial-scale=1">
1010
<title>${config.siteName}后台管理系统</title>
1111
<link href="/assets/images/favicon.ico" rel="shortcut icon" type="image/x-icon">
12-
<link href="https://cdn.bootcdn.net/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
13-
<link href="https://cdn.jsdelivr.net/npm/bootstrap@3.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
14-
<link href="https://cdn.bootcdn.net/ajax/libs/jquery-confirm/3.3.2/jquery-confirm.min.css" rel="stylesheet">
15-
<link href="https://cdn.bootcdn.net/ajax/libs/fancybox/2.1.5/jquery.fancybox.min.css" rel="stylesheet">
16-
<link href="https://cdn.bootcdn.net/ajax/libs/nprogress/0.2.0/nprogress.min.css" rel="stylesheet">
17-
<link href="https://cdn.bootcdn.net/ajax/libs/toastr.js/2.0.3/css/toastr.min.css" rel="stylesheet">
18-
<link href="https://cdn.jsdelivr.net/npm/icheck@1.0.2/skins/square/green.min.css" rel="stylesheet">
19-
<link href="https://cdn.bootcdn.net/ajax/libs/bootstrap-table/1.11.1/bootstrap-table.min.css" rel="stylesheet">
20-
<link href="https://cdn.bootcdn.net/ajax/libs/bootstrap-daterangepicker/2.1.25/daterangepicker.min.css" rel="stylesheet">
21-
<link href="https://cdn.bootcdn.net/ajax/libs/bootstrap-datetimepicker/4.17.37/css/bootstrap-datetimepicker.min.css" rel="stylesheet">
22-
<link href="https://cdn.jsdelivr.net/npm/@ztree/ztree_v3@3.5.37/css/metroStyle/metroStyle.min.css" rel="stylesheet">
23-
<link href="https://cdn.bootcdn.net/ajax/libs/switchery/0.8.2/switchery.min.css" rel="stylesheet">
24-
<link href="https://cdn.bootcdn.net/ajax/libs/bootstrap-tagsinput/0.8.0/bootstrap-tagsinput-typeahead.css" rel="stylesheet">
25-
<link href="https://cdn.jsdelivr.net/npm/@adactive/bootstrap-tagsinput@0.8.2/dist/bootstrap-tagsinput.min.css" rel="stylesheet">
26-
<link href="https://cdn.jsdelivr.net/npm/switchery-npm@0.8.2/index.min.css" rel="stylesheet">
27-
<#--
28-
<link href="https://cdnjs.cloudflare.com/ajax/libs/pnotify/3.2.1/pnotify.css" rel="stylesheet">
29-
<link href="https://cdnjs.cloudflare.com/ajax/libs/pnotify/3.2.1/pnotify.buttons.css" rel="stylesheet">
30-
<link href="https://cdnjs.cloudflare.com/ajax/libs/pnotify/3.2.1/pnotify.nonblock.css" rel="stylesheet">-->
31-
12+
<#if config.adminCssCdn?? && (config.adminCssCdn?length > 0)>
13+
${config.adminCssCdn!}
14+
<#else >
15+
<link href="https://cdn.bootcdn.net/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
16+
<link href="https://cdn.bootcdn.net/ajax/libs/twitter-bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet">
17+
<link href="https://cdn.bootcdn.net/ajax/libs/jquery-confirm/3.3.2/jquery-confirm.min.css" rel="stylesheet">
18+
<link href="https://cdn.bootcdn.net/ajax/libs/fancybox/2.1.5/jquery.fancybox.min.css" rel="stylesheet">
19+
<link href="https://cdn.bootcdn.net/ajax/libs/nprogress/0.2.0/nprogress.min.css" rel="stylesheet">
20+
<link href="https://cdn.bootcdn.net/ajax/libs/toastr.js/2.0.3/css/toastr.min.css" rel="stylesheet">
21+
<link href="https://cdn.bootcdn.net/ajax/libs/iCheck/1.0.2/skins/square/green.css" rel="stylesheet">
22+
<link href="https://cdn.bootcdn.net/ajax/libs/bootstrap-table/1.11.1/bootstrap-table.min.css" rel="stylesheet">
23+
<link href="https://cdn.bootcdn.net/ajax/libs/bootstrap-daterangepicker/2.1.25/daterangepicker.min.css" rel="stylesheet">
24+
<link href="https://cdn.bootcdn.net/ajax/libs/bootstrap-datetimepicker/4.17.37/css/bootstrap-datetimepicker.min.css" rel="stylesheet">
25+
<link href="https://cdn.bootcdn.net/ajax/libs/zTree.v3/3.5.29/css/metroStyle/metroStyle.min.css" rel="stylesheet">
26+
<link href="https://cdn.bootcdn.net/ajax/libs/switchery/0.8.2/switchery.min.css" rel="stylesheet">
27+
<link href="https://cdn.bootcdn.net/ajax/libs/bootstrap-tagsinput/0.8.0/bootstrap-tagsinput-typeahead.css" rel="stylesheet">
28+
<link href="https://cdn.bootcdn.net/ajax/libs/bootstrap-tagsinput/0.8.0/bootstrap-tagsinput.css" rel="stylesheet">
29+
</#if>
3230
<link href="/assets/css/bootstrap-treetable.css" rel="stylesheet" type="text/css" />
3331
<link href="/assets/css/zhyd.core.css" rel="stylesheet">
3432
<#nested>

‎blog-admin/src/main/resources/templates/layout/footer.ftl‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,33 @@
66
staticPath: '${config.staticWebSite}'
77
}
88
</script>
9-
<script type="text/javascript" src="https://cdn.staticfile.org/jquery/1.11.1/jquery.min.js"></script>
10-
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/bootstrap@3.3.0/dist/js/bootstrap.min.js"></script>
11-
<script type="text/javascript" src="https://cdn.staticfile.org/jquery_lazyload/1.9.3/jquery.lazyload.min.js"></script>
12-
<script type="text/javascript" src="https://cdn.staticfile.org/jquery-confirm/3.3.2/jquery-confirm.min.js"></script>
13-
<script type="text/javascript" src="https://cdn.staticfile.org/fancybox/2.1.5/jquery.fancybox.min.js"></script>
14-
<script type="text/javascript" src="https://cdn.staticfile.org/mustache.js/2.3.0/mustache.min.js"></script>
15-
<script type="text/javascript" src="https://cdn.staticfile.org/js-xss/0.3.3/xss.min.js"></script>
16-
<script type="text/javascript" src="https://cdn.staticfile.org/nprogress/0.2.0/nprogress.min.js"></script>
17-
<script src="https://cdn.staticfile.org/toastr.js/2.0.3/js/toastr.min.js"></script>
18-
<script src="https://cdn.bootcdn.net/ajax/libs/iCheck/1.0.2/icheck.min.js"></script>
19-
<script src="https://cdn.staticfile.org/bootstrap-table/1.11.1/bootstrap-table.min.js"></script>
20-
<script src="https://cdn.staticfile.org/bootstrap-table/1.11.1/locale/bootstrap-table-zh-CN.min.js"></script>
21-
22-
<script src="https://cdn.jsdelivr.net/npm/daterangepicker@2.1.25/moment.min.js"></script>
23-
<script src="https://cdn.bootcdn.net/ajax/libs/bootstrap-daterangepicker/2.1.25/daterangepicker.min.js"></script>
24-
<script src="https://cdn.bootcdn.net/ajax/libs/bootstrap-datetimepicker/4.17.37/js/bootstrap-datetimepicker.min.js"></script>
25-
<script src="https://cdn.bootcdn.net/ajax/libs/bootstrap-progressbar/0.9.0/bootstrap-progressbar.min.js"></script>
26-
<script src="https://cdn.bootcdn.net/ajax/libs/zTree.v3/3.5.37/js/jquery.ztree.core.min.js"></script>
27-
<script src="https://cdn.bootcdn.net/ajax/libs/zTree.v3/3.5.37/js/jquery.ztree.excheck.min.js"></script>
28-
<script src="https://cdn.jsdelivr.net/npm/switchery-npm@0.8.2/index.min.js"></script>
29-
<script src="https://cdn.jsdelivr.net/npm/wangeditor@4.7.9/dist/wangEditor.min.js" type="text/javascript"></script>
30-
<script src="https://cdn.jsdelivr.net/npm/@adactive/bootstrap-tagsinput@0.8.2/dist/bootstrap-tagsinput.min.js"></script>
9+
<#if config.adminJsCdn?? && (config.adminJsCdn?length > 0)>
10+
${config.adminJsCdn!}
11+
<#else >
12+
<script type="text/javascript" src="https://cdn.staticfile.org/jquery/1.11.1/jquery.min.js"></script>
13+
<script type="text/javascript" src="https://cdn.bootcdn.net/ajax/libs/twitter-bootstrap/3.3.5/js/bootstrap.min.js"></script>
14+
<script type="text/javascript" src="https://cdn.staticfile.org/jquery.lazyload/1.9.1/jquery.lazyload.min.js"></script>
15+
<script type="text/javascript" src="https://cdn.staticfile.org/jquery-confirm/3.3.2/jquery-confirm.min.js"></script>
16+
<script type="text/javascript" src="https://cdn.staticfile.org/fancybox/2.1.5/jquery.fancybox.min.js"></script>
17+
<script type="text/javascript" src="https://cdn.staticfile.org/mustache.js/2.3.0/mustache.min.js"></script>
18+
<script type="text/javascript" src="https://cdn.staticfile.org/js-xss/0.3.3/xss.min.js"></script>
19+
<script type="text/javascript" src="https://cdn.staticfile.org/nprogress/0.2.0/nprogress.min.js"></script>
20+
<script type="text/javascript" src="https://cdn.staticfile.org/toastr.js/2.0.3/js/toastr.min.js"></script>
21+
<script type="text/javascript" src="https://cdn.bootcdn.net/ajax/libs/iCheck/1.0.2/icheck.min.js"></script>
22+
<script type="text/javascript" src="https://cdn.staticfile.org/bootstrap-table/1.11.1/bootstrap-table.min.js"></script>
23+
<script type="text/javascript" src="https://cdn.staticfile.org/bootstrap-table/1.11.1/locale/bootstrap-table-zh-CN.min.js"></script>
3124

25+
<script type="text/javascript" src="https://cdn.bootcdn.net/ajax/libs/bootstrap-daterangepicker/2.1.25/moment.min.js"></script>
26+
<script type="text/javascript" src="https://cdn.bootcdn.net/ajax/libs/bootstrap-daterangepicker/2.1.25/daterangepicker.min.js"></script>
27+
<script type="text/javascript" src="https://cdn.bootcdn.net/ajax/libs/bootstrap-datetimepicker/4.17.37/js/bootstrap-datetimepicker.min.js"></script>
28+
<script type="text/javascript" src="https://cdn.bootcdn.net/ajax/libs/bootstrap-progressbar/0.9.0/bootstrap-progressbar.min.js"></script>
29+
<script type="text/javascript" src="https://cdn.bootcdn.net/ajax/libs/zTree.v3/3.5.37/js/jquery.ztree.core.min.js"></script>
30+
<script type="text/javascript" src="https://cdn.bootcdn.net/ajax/libs/zTree.v3/3.5.37/js/jquery.ztree.excheck.min.js"></script>
31+
<script type="text/javascript" src="https://cdn.bootcdn.net/ajax/libs/switchery/0.8.2/switchery.min.js"></script>
32+
<script type="text/javascript" src="https://unpkg.com/wangeditor@4.7.9/dist/wangEditor.min.js"></script>
33+
<script type="text/javascript" src="https://cdn.bootcdn.net/ajax/libs/bootstrap-tagsinput/0.8.0/bootstrap-tagsinput.min.js"></script>
34+
</#if>
3235
<script src="https://www.layuicdn.com/layui/layui.js"></script>
33-
<#--<script src="https://cdn.tiny.cloud/1/no-api-key/tinymce/5/tinymce.min.js"></script>-->
3436
<#if config.tinyMCEKey?exists>
3537
<script src="https://cdn.tiny.cloud/1/${config.tinyMCEKey!}/tinymce/5/tinymce.min.js" referrerpolicy="origin"></script>
3638
<#else>

‎blog-codegen/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>com.zyd</groupId>
1414
<artifactId>blog</artifactId>
15-
<version>2.3.3</version>
15+
<version>2.3.4</version>
1616
</parent>
1717

1818
<dependencies>

‎blog-core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>com.zyd</groupId>
1414
<artifactId>blog</artifactId>
15-
<version>2.3.3</version>
15+
<version>2.3.4</version>
1616
</parent>
1717

1818
<dependencies>

‎blog-core/src/main/java/com/zyd/blog/framework/runner/BlogApplicationRunner.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ public void run(ApplicationArguments applicationArguments) {
4949

5050
@Override
5151
public void contextInitialized(ServletContextEvent event) {
52-
log.info("博客关键配置信息：");
53-
log.info("current version：{}", appProperties.getVersion());
52+
log.info("current oneblog version：{}", appProperties.getVersion());
5453
if (appProperties.isEnabledPrintConfig()) {
54+
log.info("博客关键配置信息：");
5555
String[] activeProfiles = configurableApplicationContext.getEnvironment().getActiveProfiles();
5656
if (ObjectUtils.isEmpty(activeProfiles)) {
5757
String[] defaultProfiles = configurableApplicationContext.getEnvironment().getDefaultProfiles();

‎blog-core/src/main/resources/config/application-center.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ spring:
44
druid:
55
connection-init-sqls: set names utf8mb4
66
driver-class-name: com.mysql.cj.jdbc.Driver
7+
test-while-idle: false
78
type: com.alibaba.druid.pool.DruidDataSource
89
url: jdbc:mysql://${ONEBLOG_DATASOURCE_HOST:127.0.0.1}:${ONEBLOG_DATASOURCE_PORT:3306}/${ONEBLOG_DATASOURCE_DATABASE_NAME:dblog}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&allowPublicKeyRetrieval=true&useLegacyDatetimeCode=false
910
username: ${ONEBLOG_DATASOURCE_USERNAME:root}
@@ -86,5 +87,5 @@ pagehelper:
8687
params: count=countSql
8788

8889
app:
89-
version: v2.3.3
90+
version: v2.3.4
9091
enableRedisCache: ${ONEBLOG_ENABLE_REDIS_CACHE:false}

‎blog-core/src/test/java/com/zyd/blog/util/PasswordUtilTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public void passwordTest() throws Exception {
2121
public void encryptTest(String password, String salt) throws Exception {
2222
String encrypt = PasswordUtil.encrypt(password, salt);
2323
System.out.println(encrypt);
24-
String decrypt = PasswordUtil.decrypt("VpavsFi6DaRqF5o3nziCgw==", "root");
24+
String decrypt = PasswordUtil.decrypt("CGUx1FN++xS+4wNDFeN6DA==", "root");
2525
System.out.println(decrypt);
2626
}
2727

‎blog-file/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>com.zyd</groupId>
1414
<artifactId>blog</artifactId>
15-
<version>2.3.3</version>
15+
<version>2.3.4</version>
1616
</parent>
1717

1818
<properties>

0 commit comments

Comments
 (0)