Skip to content

Commit

Permalink
修复BUG
Browse files Browse the repository at this point in the history
  • Loading branch information
@luckymorning
luckymorning committed Mar 7, 2020
1 parent 5121798 commit 33d51a4
Show file tree
Hide file tree
Showing 14 changed files with 172 additions and 233 deletions.
2 changes: 1 addition & 1 deletion ...-AnalysisNovels/src/main/java/com/cn/lucky/morning/model/analysis/BookSourceAnalysis.java
View file
Expand Up @@ -249,7 +249,7 @@ public Future<MvcResult> loadBookInfo(String url, BookSource bookSource) {
Element hrefElem = catalogItem.selectFirst(bookSource.getBookDetailCatalogItemLinkSelector());
if (hrefElem != null) {
href = hrefElem.attr("href");
if (!href.startsWith("http://") || !href.startsWith("https://")) {
if (!href.startsWith("//") && !href.startsWith("http://") && !href.startsWith("https://") && !href.contains(bookSource.getBaseUrl())) {
href = bookSource.getBaseUrl() + href;
}
} else {
Expand Down
97 changes: 26 additions & 71 deletions Model-Common/src/main/java/com/cn/lucky/morning/model/common/network/NetWorkUtil.java
View file
Expand Up @@ -17,7 +17,6 @@
public class NetWorkUtil {
private static final int CONNECT_TIMEOUT = 1;
private static final TimeUnit timeUnit = TimeUnit.SECONDS;
public static OkHttpClient client;


/**
Expand All @@ -35,24 +34,14 @@ public static Call get(String url,Headers headers, boolean isUseStaticClient, Ca
requestBuilder.headers(headers);
}
Request request = requestBuilder.build();
if(isUseStaticClient){
if(client == null){
OkHttpClient.Builder builder = new OkHttpClient.Builder();
builder.connectTimeout(CONNECT_TIMEOUT, timeUnit);
client = builder.build();
}
Call call=client.newCall(request);
call.enqueue(callback);
return call;
}else{

OkHttpClient.Builder builder = new OkHttpClient.Builder();
builder.connectTimeout(CONNECT_TIMEOUT, timeUnit);
OkHttpClient okHttpClient = builder.build();;
Call call=okHttpClient.newCall(request);
call.enqueue(callback);
return call;
}


OkHttpClient.Builder builder = new OkHttpClient.Builder();
builder.connectTimeout(CONNECT_TIMEOUT, timeUnit);
OkHttpClient okHttpClient = builder.build();;
Call call=okHttpClient.newCall(request);
call.enqueue(callback);
return call;
}

/**
Expand Down Expand Up @@ -83,23 +72,12 @@ public static Call post(String url, Map<String,String> params, Headers headers,
requestBuilder.post(post);
Request request = requestBuilder.build();

if(isUseStaticClient){
if(client == null){
OkHttpClient.Builder clientbuilder = new OkHttpClient.Builder();
clientbuilder.connectTimeout(CONNECT_TIMEOUT, timeUnit);
client = clientbuilder.build();
}
Call call=client.newCall(request);
call.enqueue(callback);
return call;
}else{
OkHttpClient.Builder clientbuilder = new OkHttpClient.Builder();
clientbuilder.connectTimeout(CONNECT_TIMEOUT, timeUnit);
OkHttpClient okHttpClient = clientbuilder.build();
Call call=okHttpClient.newCall(request);
call.enqueue(callback);
return call;
}
OkHttpClient.Builder clientbuilder = new OkHttpClient.Builder();
clientbuilder.connectTimeout(CONNECT_TIMEOUT, timeUnit);
OkHttpClient okHttpClient = clientbuilder.build();
Call call=okHttpClient.newCall(request);
call.enqueue(callback);
return call;
}

/**
Expand All @@ -117,24 +95,12 @@ public static Response get(String url,Headers headers, boolean isUseStaticClient
}
requestBuilder.url(url);
Request request = requestBuilder.build();
if(isUseStaticClient){
if(client == null){
OkHttpClient.Builder clientbuilder = new OkHttpClient.Builder();
clientbuilder.connectTimeout(CONNECT_TIMEOUT, timeUnit);
client = clientbuilder.build();
}
Call call=client.newCall(request);
Response response = call.execute();
return response;
}else{

OkHttpClient.Builder clientbuilder = new OkHttpClient.Builder();
clientbuilder.connectTimeout(CONNECT_TIMEOUT, timeUnit);
OkHttpClient okHttpClient = clientbuilder.build();
Call call=okHttpClient.newCall(request);
Response response = call.execute();
return response;
}
OkHttpClient.Builder clientbuilder = new OkHttpClient.Builder();
clientbuilder.connectTimeout(CONNECT_TIMEOUT, timeUnit);
OkHttpClient okHttpClient = clientbuilder.build();
Call call=okHttpClient.newCall(request);
Response response = call.execute();
return response;
}

/**
Expand Down Expand Up @@ -162,22 +128,11 @@ public static Response post(String url, Map<String,String> params, Headers heade
requestBuilder.post(post);
Request request = requestBuilder.build();

if(isUseStaticClient){
if(client == null){
OkHttpClient.Builder clientbuilder = new OkHttpClient.Builder();
clientbuilder.connectTimeout(CONNECT_TIMEOUT, timeUnit);
client = clientbuilder.build();
}
Call call=client.newCall(request);
Response response = call.execute();
return response;
}else{
OkHttpClient.Builder clientbuilder = new OkHttpClient.Builder();
clientbuilder.connectTimeout(CONNECT_TIMEOUT, timeUnit);
OkHttpClient okHttpClient = clientbuilder.build();
Call call=okHttpClient.newCall(request);
Response response = call.execute();
return response;
}
OkHttpClient.Builder clientbuilder = new OkHttpClient.Builder();
clientbuilder.connectTimeout(CONNECT_TIMEOUT, timeUnit);
OkHttpClient okHttpClient = clientbuilder.build();
Call call=okHttpClient.newCall(request);
Response response = call.execute();
return response;
}
}
64 changes: 33 additions & 31 deletions ...ervice/src/main/java/com/cn/lucky/morning/model/service/impl/BookAnalysisServiceImpl.java
View file
Expand Up @@ -123,42 +123,44 @@ public MvcResult loadBookDetail(String url) {

@Override
public MvcResult loadBookContent(String url) {
MvcResult result = MvcResult.create();
if (StringUtils.isBlank(url)) {
result.setSuccess(false);
result.setMessage("解析地址不能为空");
} else {
try {
Future<MvcResult> future;
List<BookSource> bookSources = bookSourceService.getAll();
if (bookSources== null || bookSources.size() == 0){
result.setSuccess(false);
result.setMessage("请添加书源");
}else {
boolean isNotFound = true;
for (BookSource bookSource : bookSources){
if (url.contains(bookSource.getBaseUrl())){
isNotFound = false;
future = bookSourceAnalysis.loadContent(url,bookSource);
result = future.get();
break;
}
}
if (isNotFound){
synchronized (url){
MvcResult result = MvcResult.create();
if (StringUtils.isBlank(url)) {
result.setSuccess(false);
result.setMessage("解析地址不能为空");
} else {
try {
Future<MvcResult> future;
List<BookSource> bookSources = bookSourceService.getAll();
if (bookSources== null || bookSources.size() == 0){
result.setSuccess(false);
result.setMessage("未知解析源，请直接访问 【" + url + "】");
result.setMessage("请添加书源");
}else {
boolean isNotFound = true;
for (BookSource bookSource : bookSources){
if (url.contains(bookSource.getBaseUrl())){
isNotFound = false;
future = bookSourceAnalysis.loadContent(url,bookSource);
result = future.get();
break;
}
}
if (isNotFound){
result.setSuccess(false);
result.setMessage("未知解析源，请直接访问 【" + url + "】");
}
}
} catch (Exception e) {
result.setSuccess(false);
result.setMessage("解析章节内容出错（" + e.getMessage() + "），请刷新重试，或直接访问【" + url + "】");
logger.error("解析章节内容【" + url + "】出错", e);
}
} catch (Exception e) {
result.setSuccess(false);
result.setMessage("解析章节内容出错（" + e.getMessage() + "），请刷新重试，或直接访问【" + url + "】");
logger.error("解析章节内容【" + url + "】出错", e);
}
if (result.isSuccess()) {
loadNextCatalogContent(result.getVal("nextCatalog"));
}
return result;
}
if (result.isSuccess()) {
loadNextCatalogContent(result.getVal("nextCatalog"));
}
return result;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion Model-Web/pom.xml
View file
Expand Up @@ -9,7 +9,7 @@
</parent>

<groupId>Model-Web</groupId>
<artifactId>DouBiNovel</artifactId>
<artifactId>Model-Web</artifactId>
<version>0.0.3-SNAPSHOT</version>
<name>Model-Web</name>
<packaging>war</packaging>
Expand Down

0 comments on commit 33d51a4

Please sign in to comment.