fanxb/bookmark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Compare commits

base: fanxb:405a2e05edeaf2f39cb3156ab5ce9c00ebb962f1
Branches Tags
fanxb:master
fanxb:dev
fanxb:1.4
fanxb:1.3
fanxb:1.2
fanxb:1.1.1
fanxb:1.1
fanxb:1.0
..
compare: fanxb:42a28298477865a9ff108e175fd01e8f510d3f1c
Branches Tags
fanxb:master
fanxb:dev
fanxb:1.4
fanxb:1.3
fanxb:1.2
fanxb:1.1.1
fanxb:1.1
fanxb:1.0

No commits in common. "405a2e05edeaf2f39cb3156ab5ce9c00ebb962f1" and "42a28298477865a9ff108e175fd01e8f510d3f1c" have entirely different histories.
405a2e05ed ... 42a2829847

2 changed files with 6 additions and 18 deletions
Show Stats Expand all files Collapse all files

2
README.md
View File

@ -4,7 +4,7 @@
在线使用地址(长期提供服务):[bm.fleyx.com](https://bm.fleyx.com)，
**为获得更好的体验，建议将主页设置为 bm.fleyx.com,并安装浏览器拓展,[点击查看如何安装](https://blog.fleyx.com/blog/detail/20220329/#%e6%b5%8f%e8%a7%88%e5%99%a8%e6%8f%92%e4%bb%b6)**
**为获得更好的体验，建议将主页设置为 fleyx.com,并安装浏览器拓展,[点击查看如何安装](https://blog.fleyx.com/blog/detail/20220329/#%e6%b5%8f%e8%a7%88%e5%99%a8%e6%8f%92%e4%bb%b6)**
也可自己部署搭建，教程见：[docker-compose 部署](https://github.com/FleyX/bookmark/blob/master/DEPLOY.md)

22
bookMarkService/common/src/main/java/com/fanxb/bookmark/common/service/impl/ConfigServiceImpl.java
View File

@ -2,11 +2,8 @@ package com.fanxb.bookmark.common.service.impl;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.fanxb.bookmark.common.constant.CommonConstant;
import com.fanxb.bookmark.common.constant.NumberConstant;
import com.fanxb.bookmark.common.constant.RedisConstant;
import com.fanxb.bookmark.common.dao.GlobalConfigDao;
@ -15,16 +12,11 @@ import com.fanxb.bookmark.common.entity.vo.GlobalConfigVo;
import com.fanxb.bookmark.common.service.ConfigService;
import com.fanxb.bookmark.common.util.HttpUtil;
import lombok.extern.slf4j.Slf4j;
import okhttp3.Request;
import okhttp3.Response;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.StandardOpenOption;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@ -76,18 +68,14 @@ public class ConfigServiceImpl implements ConfigService {
}
private String getBingImg() {
JSONObject bingObj = HttpUtil.getObj(bingHost + bingUrl, null, false);
String path = bingObj.getJSONArray("images").getJSONObject(0).getString("url");
String picUrl = bingHost + path;
Request request = new Request.Builder().url(picUrl).build();
try (Response res = HttpUtil.getClient(false).newCall(request).execute()) {
byte[] bytes = res.body().bytes();
String filePath = CommonConstant.fileSavePath + "/files/public/bing.jpg";
FileUtil.writeBytes(bytes, filePath);
try {
JSONObject bingObj = HttpUtil.getObj(bingHost + bingUrl, null, false);
String path = bingObj.getJSONArray("images").getJSONObject(0).getString("url");
return bingHost + path;
} catch (Exception e) {
log.error("获取bing每日一图错误：{}", e.getLocalizedMessage(), e);
}
return "/files/public/bing.jpg";
return null;
}