Skip to content

Commit a498da7

Browse files
authored
Merge pull request #1887 from seefs001/fix/stripe
feat: allow stripe promotion code
2 parents 79859a3 + ad72500 commit a498da7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1638
-276
lines changed

.github/workflows/linux-release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,21 @@ jobs:
3838
- name: Build Backend (amd64)
3939
run: |
4040
go mod download
41-
go build -ldflags "-s -w -X 'one-api/common.Version=$(git describe --tags)' -extldflags '-static'" -o one-api
41+
go build -ldflags "-s -w -X 'one-api/common.Version=$(git describe --tags)' -extldflags '-static'" -o new-api
4242
4343
- name: Build Backend (arm64)
4444
run: |
4545
sudo apt-get update
4646
DEBIAN_FRONTEND=noninteractive sudo apt-get install -y gcc-aarch64-linux-gnu
47-
CC=aarch64-linux-gnu-gcc CGO_ENABLED=1 GOOS=linux GOARCH=arm64 go build -ldflags "-s -w -X 'one-api/common.Version=$(git describe --tags)' -extldflags '-static'" -o one-api-arm64
47+
CC=aarch64-linux-gnu-gcc CGO_ENABLED=1 GOOS=linux GOARCH=arm64 go build -ldflags "-s -w -X 'one-api/common.Version=$(git describe --tags)' -extldflags '-static'" -o new-api-arm64
4848
4949
- name: Release
5050
uses: softprops/action-gh-release@v1
5151
if: startsWith(github.ref, 'refs/tags/')
5252
with:
5353
files: |
54-
one-api
55-
one-api-arm64
54+
new-api
55+
new-api-arm64
5656
draft: true
5757
generate_release_notes: true
5858
env:

.github/workflows/macos-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ jobs:
3939
- name: Build Backend
4040
run: |
4141
go mod download
42-
go build -ldflags "-X 'one-api/common.Version=$(git describe --tags)'" -o one-api-macos
42+
go build -ldflags "-X 'one-api/common.Version=$(git describe --tags)'" -o new-api-macos
4343
- name: Release
4444
uses: softprops/action-gh-release@v1
4545
if: startsWith(github.ref, 'refs/tags/')
4646
with:
47-
files: one-api-macos
47+
files: new-api-macos
4848
draft: true
4949
generate_release_notes: true
5050
env:

.github/workflows/windows-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ jobs:
4141
- name: Build Backend
4242
run: |
4343
go mod download
44-
go build -ldflags "-s -w -X 'one-api/common.Version=$(git describe --tags)'" -o one-api.exe
44+
go build -ldflags "-s -w -X 'one-api/common.Version=$(git describe --tags)'" -o new-api.exe
4545
- name: Release
4646
uses: softprops/action-gh-release@v1
4747
if: startsWith(github.ref, 'refs/tags/')
4848
with:
49-
files: one-api.exe
49+
files: new-api.exe
5050
draft: true
5151
generate_release_notes: true
5252
env:

common/ip.go

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package common
2+
3+
import "net"
4+
5+
func IsPrivateIP(ip net.IP) bool {
6+
if ip.IsLoopback() || ip.IsLinkLocalUnicast() || ip.IsLinkLocalMulticast() {
7+
return true
8+
}
9+
10+
private := []net.IPNet{
11+
{IP: net.IPv4(10, 0, 0, 0), Mask: net.CIDRMask(8, 32)},
12+
{IP: net.IPv4(172, 16, 0, 0), Mask: net.CIDRMask(12, 32)},
13+
{IP: net.IPv4(192, 168, 0, 0), Mask: net.CIDRMask(16, 32)},
14+
}
15+
16+
for _, privateNet := range private {
17+
if privateNet.Contains(ip) {
18+
return true
19+
}
20+
}
21+
return false
22+
}

0 commit comments

Comments
 (0)