Skip to content

Commit

Permalink
1. 修正首页推送博客默认数量
Browse files Browse the repository at this point in the history 
2. 移除首页右侧最新推荐div
3. 修复博客详情页的更新时间为创建时间
4. 新增博客默认标识
5. 更新底部栏的个人数据
  • Loading branch information
Shaoxiong committed May 31, 2021
1 parent 50c0f6c commit abd2cee
Show file tree
Hide file tree
Showing 12 changed files with 52 additions and 151 deletions.
123 changes: 0 additions & 123 deletions blog.iml
View file

This file was deleted.

7 changes: 7 additions & 0 deletions pom.xml
View file
Expand Up @@ -36,6 +36,13 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>

<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.62</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/cn/shaoxiongdu/po/IpInfo.java
View file
@@ -0,0 +1,7 @@
package cn.shaoxiongdu.po;

public class IpInfo {



}
5 changes: 5 additions & 0 deletions src/main/java/cn/shaoxiongdu/service/BlogServiceImpl.java
View file
Expand Up @@ -126,6 +126,11 @@ public Long countBlog() {
@Override
public Blog saveBlog(Blog blog) {
if (blog.getId() == null) {

/*默认为原创*/
if(Objects.equals(null,blog.getFlag())){
blog.setFlag("原创");
}
blog.setCreateTime(new Date());
blog.setUpdateTime(new Date());
blog.setViews(0);
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/cn/shaoxiongdu/service/RecordServiceImpl.java
View file
Expand Up @@ -38,9 +38,9 @@ record = new Record();
record.setIp(ip);
record.setLastVisitTime(new Date());
record.setTotalNumberOfVisits(new Long(1));
String getAddressByIpRequestUrl = "https://www.maitube.com/ip/?ip="+record.getIp();

String result = HttpClient.doGet(getAddressByIpRequestUrl);
//获取IP地址位置信息
String result = HttpClient.doGet(record.getIp());

if(result != null){
record.setAddress(result.substring(result.indexOf(":")+1,result.length()-1));
Expand All @@ -64,6 +64,7 @@ record = new Record();

return;
}else {

record.setLastVisitTime(new Date());
record.setTotalNumberOfVisits(record.getTotalNumberOfVisits()+1);
recordRepository.save(record);
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/cn/shaoxiongdu/web/IndexController.java
View file
Expand Up @@ -45,14 +45,14 @@ public class IndexController {


@GetMapping("/")
public String index(@PageableDefault(size = 10, sort = {"createTime"}, direction = Sort.Direction.DESC) Pageable pageable,
public String index(@PageableDefault(size = 5, sort = {"createTime"}, direction = Sort.Direction.DESC) Pageable pageable,
Model model,
HttpSession session,
HttpServletRequest httpServletRequest) {
model.addAttribute("page",blogService.listBlog(pageable));
model.addAttribute("types", typeService.listType());
model.addAttribute("tags", tagService.listTag());
model.addAttribute("recommendBlogs", blogService.listRecommendBlogTop(5));
model.addAttribute("recommendBlogs", blogService.listRecommendBlogTop(6));
session.setAttribute("views",websiteInfoService.addOneForViews());
session.setAttribute("topTitle",websiteInfoService.getTopTitle());
model.addAttribute("friendLinks",friendLinkService.getAll());
Expand All @@ -69,7 +69,7 @@ public String search(@PageableDefault(size = 8, sort = {"createTime"}, direction
@RequestParam String query, Model model) {
model.addAttribute("page", blogService.listBlog("%"+query+"%", pageable));
model.addAttribute("query", query);
model.addAttribute("newblogs", blogService.listRecommendBlogTop(5));
model.addAttribute("newblogs", blogService.listRecommendBlogTop(6));
return "search";
}

Expand All @@ -81,7 +81,7 @@ public String blog(@PathVariable Long id,Model model) {

@GetMapping("/footer/newblog")
public String newblogs(Model model) {
model.addAttribute("newblogs", blogService.listRecommendBlogTop(5));
model.addAttribute("newblogs", blogService.listRecommendBlogTop(6));
return "_fragments :: newblogList";
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application-prod.yml
View file
Expand Up @@ -7,7 +7,7 @@ spring:
password: root
jpa:
hibernate:
ddl-auto: update
ddl-auto: none
show-sql: false

logging:
Expand Down
13 changes: 10 additions & 3 deletions src/main/resources/templates/_fragments.html
View file
Expand Up @@ -91,10 +91,17 @@ <h4 class="ui inverted header me-opacity-mini" >最新推荐</h4>
<div class="four wide column">
<h4 class="ui inverted header me-opacity-mini">联系作者</h4>
<div class="ui inverted list link">
<p class="item">QQ:740593369</p>
<p>
<a target="_blank" style="color: #888888" title="添加我的QQ" href="http://wpa.qq.com/msgrd?v=3&uin=740593369&site=qq&menu=yes" >QQ:740593369</a>
</p>
<p></p>
<p class="item">微信:15603430511</p>
<p class="item" >GitHub:shaoxiongdu</p>
<p class="item" >邮箱:shaoxiongdu.dev@gmail.com</p>
<p>
<a target="_blank" style="color: #888888" title="我的Github" href="https://github.com/shaoxiongdu" >GitHub:ShaoxiongDu</a>
</p>
<p>
<a target="_blank" style="color: #888888" title="给我发送邮件" href="mailto:dev@shaoxiongdu.cn" >邮箱:dev@shaoxiongdu.cn</a>
</p>
</div>
</div>

Expand Down
6 changes: 2 additions & 4 deletions src/main/resources/templates/about.html
View file
Expand Up @@ -52,7 +52,7 @@ <h2 class="ui teal header item">Blog</h2>

<!--联系-->
<div class="ui attached bottom segment center aligned">
<a target="_blank" title="Github开源地址" href="https://github.com/shaoxiongdu" class="ui icon circular button">
<a target="_blank" title="Github" href="https://github.com/shaoxiongdu" class="ui icon circular button">
<i class="github icon"></i>
</a>

Expand All @@ -68,9 +68,7 @@ <h2 class="ui teal header item">Blog</h2>
<i class="steam icon"></i>
</a>



<a target="_blank" title="给我发送邮件" href="mailto:shaoxiongdu.dev@gmail.com" class="ui icon circular button">
<a target="_blank" title="给我发送邮件" href="mailto:dev@shaoxiongdu.cn" class="ui icon circular button">
<i class="mail icon"></i>
</a>

Expand Down
3 changes: 1 addition & 2 deletions src/main/resources/templates/blog.html
View file
Expand Up @@ -48,7 +48,7 @@ <h2 class="ui teal header item">Blog</h2>
<div class="content"><a href="#" class="header" th:text="${blog.user.nickname}"></a></div>
</div>
<div class="item">
<i class="calendar icon"></i> <span th:text="${#dates.format(blog.updateTime,'yyyy-MM-dd')}"></span>
<i class="calendar icon"></i> <span th:text="${#dates.format(blog.createTime,'yyyy-MM-dd')}"></span>
</div>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<div class="item">
Expand Down Expand Up @@ -85,7 +85,6 @@ <h2 class="ui center aligned header" th:text="${blog.title}"></h2>
<li>作者：<span th:text="${blog.user.nickname}"></span><a href="#" th:href="@{/about}" target="_blank">（联系作者）</a></li>
<li>发表时间：<span th:text="${#dates.format(blog.createTime,'yyyy-MM-dd HH:mm')}"></span></li>
<li>版权声明：自由转载-非商用-非衍生-保持署名（创意共享3.0许可证）</li>
<li>公众号转载：请在文末添加文章链接 ---> </li>
</ui>
</div>

Expand Down
22 changes: 11 additions & 11 deletions src/main/resources/templates/index.html
View file
Expand Up @@ -60,7 +60,7 @@ <h3 class="ui teal header">博客列表</h3>
<div class="ui middle aligned mobile reversed stackable grid" >
<div class="eleven wide column">
<h3 class="ui header" ><a href="#" th:href="@{/blog/{id}(id=${blog.id})}" target="_blank" class="m-black" th:text="${blog.title}">?</a></h3>
<p th:text="|${blog.description}......|"></p>
<p th:text="|${blog.description}|"></p>
<div class="ui grid">
<div class="eleven wide column">
<div class="ui mini horizontal link list">
Expand Down Expand Up @@ -165,17 +165,17 @@ <h4>标签</h4>
</div>
</div>
</div>

<!--最新推荐-->
<div class="ui segments m-margin-top-large">
<div class="ui secondary segment ">
<h4>最新推荐</h4>
</div>
<div class="ui segment" th:each="blog : ${recommendBlogs}">
<a href="#" th:href="@{/blog/{id}(id=${blog.id})}" target="_blank" class="m-black m-text-thin" th:text="${blog.title}"></a>
<!--
&lt;!&ndash;最新推荐&ndash;&gt;
<div class="ui segments m-margin-top-large">
<div class="ui secondary segment ">
<h4>最新推荐</h4>
</div>
<div class="ui segment" th:each="blog : ${recommendBlogs}">
<a href="#" th:href="@{/blog/{id}(id=${blog.id})}" target="_blank" class="m-black m-text-thin" th:text="${blog.title}"></a>
</div>
</div>
</div>

-->
</div>

</div>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/tags.html
View file
Expand Up @@ -49,7 +49,7 @@ <h3 class="ui teal header">标签</h3>

<div class="ui attached segment m-padded-tb-large">
<a href="#" th:href="@{/tags/{id}(id=${tag.id})}" class="ui basic left pointing large label m-margin-tb-tiny" th:classappend="${tag.id==activeTagId} ? 'teal'" th:each="tag : ${tags}">
<span th:text="${tag.name}">方法论</span> <div class="detail" th:text="${#arrays.length(tag.blogs)}">23</div>
<span th:text="${tag.name}"></span> <div class="detail" th:text="${#arrays.length(tag.blogs)}"></div>
</a>
</div>

Expand Down

0 comments on commit abd2cee

Please sign in to comment.