Skip to content

Developer #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sxci merged 3 commits into from
Mar 15, 2019
Merged

Developer #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1edd40a
format [ci skip]
sxci Mar 15, 2019
b62692d
format [ci skip]
sxci Mar 15, 2019
0f64078
Merge pull request #421 from sxci/format2
sxci Mar 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 46 additions & 45 deletions src/main/java/com/qiniu/common/AutoRegion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
package com.qiniu.common;

import com.qiniu.http.Client;
import com.qiniu.http.Response;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

import com.qiniu.http.Client;
import com.qiniu.http.Response;

public class AutoRegion extends Region {
/**
* uc接口域名
*/

/**
* uc接口域名
*/
private final String ucServer;

/**
* 空间机房，域名信息缓存
*/
private Map<RegionIndex, RegionInfo> regions;

/**
* 根据API返回的上传域名推导出其他资源管理域名
*/
private Map<String, Region> inferDomainsMap;

/**
* 定义HTTP请求管理相关方法
*/
Expand Down Expand Up @@ -107,7 +107,7 @@ public RegionInfo queryRegionInfo(RegionReqInfo regionReqInfo) {
}
return null;
}

/**
* 获取源站直传域名
*/
Expand All @@ -118,7 +118,7 @@ public String getSrcUpHost(RegionReqInfo regionReqInfo) {
}
return info.srcUpHosts.get(0);
}

/**
* 获取加速上传域名
*/
Expand Down Expand Up @@ -193,48 +193,49 @@ public String getApiHost(RegionReqInfo regionReqInfo) {
* 从接口获取的域名信息
*/
static class RegionInfo {
final List<String> srcUpHosts;
final List<String> srcUpHosts;
final List<String> accUpHosts;
final String iovipHost;

protected RegionInfo(List<String> srcUpHosts, List<String> accUpHosts, String iovipHost) {
this.srcUpHosts = srcUpHosts;
this.accUpHosts = accUpHosts;
this.iovipHost = iovipHost;
this.srcUpHosts = srcUpHosts;
this.accUpHosts = accUpHosts;
this.iovipHost = iovipHost;
}

/**
{
"io": {"src": {"main": ["iovip.qbox.me"]}},
"up": {
"acc": {
"main": ["upload.qiniup.com"],
"backup": ["upload-jjh.qiniup.com", "upload-xs.qiniup.com"]
},
"src": {
"main": ["up.qiniup.com"],
"backup": ["up-jjh.qiniup.com", "up-xs.qiniup.com"]
}
}
}
* {
* "io": {"src": {"main": ["iovip.qbox.me"]}},
* "up": {
* "acc": {
* "main": ["upload.qiniup.com"],
* "backup": ["upload-jjh.qiniup.com", "upload-xs.qiniup.com"]
* },
* "src": {
* "main": ["up.qiniup.com"],
* "backup": ["up-jjh.qiniup.com", "up-xs.qiniup.com"]
* }
* }
* }
*
* @param ret
* @return
*/
static RegionInfo buildFromUcRet(UCRet ret) {
List<String> srcUpHosts = new ArrayList<>();
addAll(srcUpHosts, ret.up.src.get("main"));
addAll(srcUpHosts, ret.up.src.get("backup"));
List<String> accUpHosts = new ArrayList<>();
addAll(accUpHosts, ret.up.acc.get("main"));
addAll(accUpHosts, ret.up.acc.get("backup"));
String iovipHost = ret.io.src.get("main").get(0);
List<String> srcUpHosts = new ArrayList<>();
addAll(srcUpHosts, ret.up.src.get("main"));
addAll(srcUpHosts, ret.up.src.get("backup"));
List<String> accUpHosts = new ArrayList<>();
addAll(accUpHosts, ret.up.acc.get("main"));
addAll(accUpHosts, ret.up.acc.get("backup"));
String iovipHost = ret.io.src.get("main").get(0);
return new RegionInfo(srcUpHosts, accUpHosts, iovipHost);
}

static void addAll(List<String> s, List<String> p) {
if (p != null) {
s.addAll(p);
}
if (p != null) {
s.addAll(p);
}
}
}

Expand All @@ -261,14 +262,14 @@ private class UCRet {
UPRet up;
IORet io;
}

private class UPRet {
Map<String, List<String>> acc;
Map<String, List<String>> src;
Map<String, List<String>> acc;
Map<String, List<String>> src;
}

private class IORet {
Map<String, List<String>> src;
Map<String, List<String>> src;
}

}
Loading