Skip to content

O
OneBlog

智布道 / OneBlog
8 个月 前同步成功

通知 11
Star 2
Fork 0
O
OneBlog

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

源分支
选择Git版本
...
目标分支
选择Git版本
 
Commits (5)
    https://gitcode.net/u011197448/oneblog/-/commit/e796adeca4e59dafd22569c22c476821b5db555f :bookmark: 升级版本 2.2.5 2021-06-06T21:46:09+08:00 yadong.zhang yadong.zhang0415@gmail.com https://gitcode.net/u011197448/oneblog/-/commit/edec4d37e534e87a4e7977e4a00aa8847d12cbec 添加本地云存储的 Nginx 配置文件的参考模板 2021-06-08T15:08:55+08:00 yadong.zhang yadong.zhang0415@gmail.com https://gitcode.net/u011197448/oneblog/-/commit/5201a3cea42c4d53966b0b3940c1a4218005f59a :arrow_up: 依赖升级，解决 blog-hunter 抓取不到文章的问题 2021-06-13T13:20:36+08:00 yadong.zhang yadong.zhang0415@gmail.com https://gitcode.net/u011197448/oneblog/-/commit/d4e21c2f194e41a9504f87b878c6cba63ef0005d :alien: Updating code 2021-06-13T13:25:20+08:00 yadong.zhang yadong.zhang0415@gmail.com https://gitcode.net/u011197448/oneblog/-/commit/845de8bfbb47b31123a83ab6f467c583ede7695e 部署上线时，会出现type_list字段找不到，修改SysConfigMapper文件中的type关键词为ty即可。（可能与数据库版本有关系，我用的是5.7） 2021-06-13T19:51:54+08:00 24519 2451999120@qq.com
隐藏空白更改
内联 并排
Showing with 68 addition and 23 deletion
blog-admin/pom.xml
浏览文件 @ 845de8bf
......@@ -12,7 +12,7 @@
<parent>
<groupId>com.zyd</groupId>
<artifactId>blog</artifactId>
<version>2.2.4</version>
<version>2.2.5</version>
</parent>
<dependencies>
......
blog-admin/src/main/resources/templates/laboratory/remover.ftl
浏览文件 @ 845de8bf
......@@ -98,10 +98,10 @@
<label class="control-label col-md-3 col-sm-3 col-xs-3"></label>
<div class="col-md-9 col-sm-9 col-xs-9 tips">
<i class="fa fa-exclamation-circle"></i> 获取方式：
<a href="javascript:;" data-toggle="modal" data-target="#helpModal" data-img="/assets/images/spider/uid/imooc.png" data-title="慕课网“用户ID”获取方式">慕课网</a> |
<a href="javascript:;" data-toggle="modal" data-target="#helpModal" data-img="/assets/images/spider/uid/csdn.png" data-title="CSDN“用户ID”获取方式">CSDN</a> |
<a href="javascript:;" data-toggle="modal" data-target="#helpModal" data-img="/assets/images/spider/uid/iteye.png" data-title="ITeye“用户ID”获取方式">ITeye</a> |
<a href="javascript:;" data-toggle="modal" data-target="#helpModal" data-img="/assets/images/spider/uid/cnblogs.png" data-title="博客园“用户ID”获取方式">博客园</a>
<a href="javascript:void(0);" data-toggle="modal" data-target="#helpModal" data-img="/assets/images/spider/uid/imooc.png" data-title="慕课网“用户ID”获取方式">慕课网</a> |
<a href="javascript:void(0);" data-toggle="modal" data-target="#helpModal" data-img="/assets/images/spider/uid/csdn.png" data-title="CSDN“用户ID”获取方式">CSDN</a> |
<a href="javascript:void(0);" data-toggle="modal" data-target="#helpModal" data-img="/assets/images/spider/uid/iteye.png" data-title="ITeye“用户ID”获取方式">ITeye</a> |
<a href="javascript:void(0);" data-toggle="modal" data-target="#helpModal" data-img="/assets/images/spider/uid/cnblogs.png" data-title="博客园“用户ID”获取方式">博客园</a>
</div>
</div>
<div class="item form-group">
......@@ -529,4 +529,4 @@
}
});
</script>
</@footer>
\ No newline at end of file
</@footer>
blog-core/pom.xml
浏览文件 @ 845de8bf
......@@ -12,7 +12,7 @@
<parent>
<groupId>com.zyd</groupId>
<artifactId>blog</artifactId>
<version>2.2.4</version>
<version>2.2.5</version>
</parent>
<dependencies>
......@@ -207,7 +207,6 @@
<dependency>
<groupId>com.zyd</groupId>
<artifactId>blog-file</artifactId>
<version>${oneblog.version}</version>
<exclusions>
<exclusion>
<artifactId>okhttp</artifactId>
......
blog-core/src/main/resources/mybatis/SysConfigMapper.xml
浏览文件 @ 845de8bf
......@@ -15,7 +15,7 @@
SELECT
a.article_count AS articleCount,
t.tag_count AS tagCount,
type.type_count AS typeCount,
ty.type_count AS typeCount,
c.comment_count AS commentCount
FROM
(
......@@ -39,7 +39,7 @@
biz_type
WHERE
available = 1
) type,
) ty,
(
SELECT
COUNT(1) AS comment_count
......
blog-file/pom.xml
浏览文件 @ 845de8bf
......@@ -12,7 +12,7 @@
<parent>
<groupId>com.zyd</groupId>
<artifactId>blog</artifactId>
<version>2.2.4</version>
<version>2.2.5</version>
</parent>
<properties>
......
blog-web/pom.xml
浏览文件 @ 845de8bf
......@@ -12,7 +12,7 @@
<parent>
<groupId>com.zyd</groupId>
<artifactId>blog</artifactId>
<version>2.2.4</version>
<version>2.2.5</version>
</parent>
<dependencies>
......
docs/nginx/nginx-local-file-storage-443.conf 0 → 100644
浏览文件 @ 845de8bf
server {
listen 80;
server_name 改成自己的域名;
rewrite ^(.*)$ https://$host$1 permanent;
}
server {
listen 443 ssl http2;
server_name 改成自己的域名;
root 改成自己的文件目录;
ssl_certificate 改成自己的证书文件.pem;
ssl_certificate_key 改成自己的证书文件.key;
ssl_session_cache shared:SSL:10m;
ssl_session_timeout 10m;
ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;
ssl_stapling on;
ssl_ciphers "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA";
ssl_prefer_server_ciphers on;
add_header Strict-Transport-Security "max-age=63072000; includeSubdomains; preload";
location / {
try_files $uri $uri/ /index.html;
proxy_set_header Cookie $http_cookie;
}
}
docs/nginx/nginx-local-file-storage-80.conf 0 → 100644
浏览文件 @ 845de8bf
server {
listen 80;
server_name 改成自己的域名;
root 改成自己的文件目录;;
location ^~ / {
try_files $uri $uri/ /index.html;
proxy_set_header Cookie $http_cookie;
proxy_set_header Host $host:$server_port;
}
}
pom.xml
浏览文件 @ 845de8bf
......@@ -5,7 +5,7 @@
<groupId>com.zyd</groupId>
<artifactId>blog</artifactId>
<version>2.2.4</version>
<version>2.2.5</version>
<packaging>pom</packaging>
<modules>
<module>blog-core</module>
......@@ -39,7 +39,7 @@
<mapper.version>2.1.0</mapper.version>
<pagehelper.version>1.2.3</pagehelper.version>
<druid.version>1.1.10</druid.version>
<fastjson.version>1.2.73</fastjson.version>
<fastjson.version>1.2.76</fastjson.version>
<shiro.spring.version>1.7.1</shiro.spring.version>
<shiro.redis.version>2.4.2.1-RELEASE</shiro.redis.version>
<shiro.freemarker.tags.version>0.1</shiro.freemarker.tags.version>
......@@ -49,8 +49,7 @@
<hutool.version>5.5.7</hutool.version>
<spring.web.version>5.1.4.RELEASE</spring.web.version>
<aliyun.oss.version>2.8.3</aliyun.oss.version>
<oneblog.version>2.2.4</oneblog.version>
<blog-hunter.version>1.0.1</blog-hunter.version>
<blog-hunter.version>1.0.4</blog-hunter.version>
<jap.version>1.0.2</jap.version>
</properties>
......@@ -59,7 +58,22 @@
<dependency>
<groupId>com.zyd</groupId>
<artifactId>blog-core</artifactId>
<version>${project.version}</version>
<version>2.2.5</version>
</dependency>
<dependency>
<groupId>com.zyd</groupId>
<artifactId>blog-admin</artifactId>
<version>2.2.5</version>
</dependency>
<dependency>
<groupId>com.zyd</groupId>
<artifactId>blog-web</artifactId>
<version>2.2.5</version>
</dependency>
<dependency>
<groupId>com.zyd</groupId>
<artifactId>blog-file</artifactId>
<version>2.2.5</version>
</dependency>
</dependencies>
</dependencyManagement>
......@@ -87,12 +101,6 @@
<version>${hutool.version}</version>
<scope>compile</scope>
</dependency>
<!--仅用于升级springboot版本时，提供配置迁移建议-->
<!--<dependency>-->
<!--<groupId>org.springframework.boot</groupId>-->
<!--<artifactId>spring-boot-properties-migrator</artifactId>-->
<!--<optional>true</optional>-->
<!--</dependency>-->
</dependencies>
<!-- Maven控制Spring Profile -->
......