Skip to content

feat: 支持武汉region #511

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

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

feat: 支持武汉region #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ab1507
feat: 支持pvl
Jun 15, 2024
f2b0def
feat: 支持武汉地域 #to 55457249
Jul 26, 2024
4b06227
feat: 支持武汉地域 #to 55457249
Jul 26, 2024
8f74fe6
feat: 支持武汉地域 #to 55457249
Jul 26, 2024
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

VERSION=1.19.0
VERSION=1.20.0
NAME=oss-browser
CUSTOM=./custom

Expand Down
52 changes: 26 additions & 26 deletions all-releases.md
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions app/components/services/oss2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1992,6 +1992,13 @@ angular.module('web').factory('ossSvs2', [

function getOssEndpoint(region, bucket, eptpl) {
eptpl = eptpl || AuthInfo.get().eptpl || 'http://{region}.aliyuncs.com';
if (region === "oss-cn-wuhan") {
if ($rootScope.internalSupported) {
eptpl = "http:oss-cn-wuhan-lr-internal.aliyuncs.com";
} else {
eptpl = "http://oss-cn-wuhan-lr.aliyuncs.com";
}
}

// 通过bucket获取endpoint
if (bucket && $rootScope.bucketMap && $rootScope.bucketMap[bucket]) {
Expand Down
5 changes: 5 additions & 0 deletions app/const.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,11 @@ angular.module('web').factory('Const', [
label: '华东6(福州本地地域)',
storageClasses: getStorageClasses(3)
},
{
id: "oss-cn-wuhan",
label: "华中1（武汉-本地地域）",
storageClasses: getStorageClasses(3)
},
{
id: 'oss-cn-qingdao',
label: '华北1(青岛)',
Expand Down
1 change: 1 addition & 0 deletions node/i18n/zh-CN.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ module.exports = {
"region.oss-cn-shanghai": "华东2(上海)",
"region.oss-cn-nanjing": "华东5(南京本地地域)",
"region.oss-cn-fuzhou": "华东6(福州本地地域)",
"region.oss-cn-wuhan": "华中1(武汉-本地地域)",
"region.oss-cn-qingdao": "华北1(青岛)",
"region.oss-cn-beijing": "华北2(北京)",
"region.oss-cn-zhangjiakou": "华北3(张家口)",
Expand Down
8 changes: 6 additions & 2 deletions node/ossstore/lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,13 @@ function OssStore(config) {
localStorage.getItem("show-request-pay") === "YES" ? true : false,
});
} else {
const privateLink = localStorage.getItem("private-link");
const isPrivateLink = privateLink !== null;
this.oss = new ALYD.OSS({
accessKeyId: this._config.aliyunCredential.accessKeyId,
secretAccessKey: this._config.aliyunCredential.secretAccessKey,
endpoint: this._config.endpoint,
endpoint: isPrivateLink ? privateLink : this._config.endpoint,
sldEnable: isPrivateLink,
apiVersion: "2013-10-15",
maxRetries: 0,
httpOptions: {
Expand All @@ -84,7 +87,8 @@ function OssStore(config) {
this.aliOSS = new OSS({
accessKeyId: this._config.aliyunCredential.accessKeyId,
accessKeySecret: this._config.aliyunCredential.secretAccessKey,
endpoint: this._config.endpoint,
endpoint: isPrivateLink ? privateLink : this._config.endpoint,
sldEnable: isPrivateLink,
cname: this._config.cname,
timeout: TIMEOUT,
isRequestPay:
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "oss-browser",
"version": "1.19.0",
"version": "1.20.0",
"main": "dist/main.js",
"scripts": {
"test": "ava test",
Expand Down
2 changes: 1 addition & 1 deletion upgrade.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.19.0",
"version": "1.20.0",
"package_url": "https://oss-browser-attachment.oss-cn-hangzhou.aliyuncs.com/",
"package_urls": [
"https://oss-browser-attachment.oss-cn-hangzhou.aliyuncs.com/"
Expand Down