Skip to content
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.

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

When sega add 弱虫 back to 舞萌DX 2023 #90

Merged
merged 56 commits into from
Jul 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
9e25891
fix
Misaka-blog May 4, 2023
18d62ba
Bump google.golang.org/grpc from 1.54.0 to 1.55.0 (#40)
dependabot[bot] May 5, 2023
c9ac111
add
Misaka-blog May 5, 2023
5dbe351
Merge branch 'dev' of https://github.com/sing-web/x-ui into dev
Misaka-blog May 5, 2023
6a44fc4
warp
Misaka-blog May 5, 2023
bd71a67
fix
Misaka-blog May 5, 2023
0901b36
up
Misaka-blog May 5, 2023
a4efeb3
fix
Misaka-blog May 5, 2023
1dc0c23
Bump github.com/shirou/gopsutil/v3 from 3.23.3 to 3.23.4 (#43)
dependabot[bot] May 6, 2023
6a856d4
merge
Misaka-blog May 6, 2023
b9f4ac1
fix
Misaka-blog May 6, 2023
1c8967d
Merge branch 'main' into dev
Misaka-blog May 8, 2023
48b55b4
project info
Misaka-blog May 8, 2023
f1b0908
optimize
Misaka-blog May 8, 2023
87d7927
Bump gorm.io/gorm from 1.25.0 to 1.25.1 (#45)
dependabot[bot] May 9, 2023
dfff298
Show x-ui log on panel
Misaka-blog May 9, 2023
2eab63d
Merge branch 'main' into dev
Misaka-blog May 9, 2023
ded2812
add
Misaka-blog May 10, 2023
610a918
Merge branch 'main' into dev
Misaka-blog May 10, 2023
92ef609
Merge branch 'main' into dev
Misaka-blog May 12, 2023
c16af5b
change docker source
Misaka-blog May 12, 2023
8e6b26e
fix
Misaka-blog May 12, 2023
2e58ce0
show xray config
Misaka-blog May 12, 2023
c853898
Fix ciphersuites bug
Misaka-blog May 12, 2023
7b71b15
Merge branch 'main' into dev
Misaka-blog May 12, 2023
1de1214
fix
Misaka-blog May 15, 2023
b8ac1c4
modify
Misaka-blog May 15, 2023
f3c230b
Merge branch 'main' into dev
Misaka-blog May 15, 2023
2f45bae
Add 386 support
Misaka-blog May 15, 2023
60530c0
v0.3.3.10-test
Misaka-blog May 15, 2023
4053e5a
Merge branch 'main' into dev
Misaka-blog May 15, 2023
4a112bf
Merge branch 'main' into dev
Misaka-blog May 15, 2023
869dca4
import database
Misaka-blog May 15, 2023
7cedc51
Bump github.com/Workiva/go-datastructures from 1.0.53 to 1.1.0 (#60)
dependabot[bot] May 19, 2023
6f69be2
Merge branch 'main' into dev
Misaka-blog May 19, 2023
78db42f
Merge branch 'dev' of https://github.com/sing-web/x-ui into dev
Misaka-blog May 19, 2023
5d50d77
Bump gorm.io/driver/sqlite from 1.5.0 to 1.5.1 (#61)
dependabot[bot] May 22, 2023
57c9061
Fix OpenAI block account problem
Misaka-blog May 29, 2023
874dc2f
Merge branch 'dev' of https://github.com/sing-web/x-ui into dev
Misaka-blog May 29, 2023
a5b3de4
Merge branch 'main' into dev
Misaka-blog May 29, 2023
b1e9bd2
Bump github.com/BurntSushi/toml from 1.2.1 to 1.3.0 (#63)
dependabot[bot] Jun 1, 2023
4fbd6bf
Bump github.com/gin-gonic/gin from 1.9.0 to 1.9.1 (#65)
dependabot[bot] Jun 5, 2023
27dcf65
Bump github.com/shirou/gopsutil/v3 from 3.23.4 to 3.23.5 (#64)
dependabot[bot] Jun 5, 2023
4fb7ef2
Bump gorm.io/driver/sqlite from 1.5.1 to 1.5.2 (#74)
dependabot[bot] Jun 12, 2023
626c7f2
Bump github.com/BurntSushi/toml from 1.3.0 to 1.3.2 (#70)
dependabot[bot] Jun 12, 2023
91bde8f
Bump google.golang.org/grpc from 1.55.0 to 1.56.0 (#79)
dependabot[bot] Jun 17, 2023
3217348
Bump github.com/xtls/xray-core from 1.8.1 to 1.8.3 (#80)
dependabot[bot] Jun 21, 2023
51065d6
Merge branch 'dev' of https://github.com/sing-web/x-ui into dev
Misaka-blog Jun 21, 2023
ef9686b
Merge branch 'main' into dev
Misaka-blog Jun 21, 2023
7116ab4
Remove mtproto
Misaka-blog Jun 21, 2023
c089a6a
Bump gorm.io/gorm from 1.25.2-0.20230530020048-26663ab9bf55 to 1.25.2…
dependabot[bot] Jul 2, 2023
2b9b91d
Bump google.golang.org/grpc from 1.56.0 to 1.56.1 (#82)
dependabot[bot] Jul 2, 2023
db0cf86
Bump google.golang.org/grpc from 1.56.1 to 1.56.2 (#87)
dependabot[bot] Jul 15, 2023
0c26cd7
Bump github.com/shirou/gopsutil/v3 from 3.23.5 to 3.23.6 (#85)
dependabot[bot] Jul 15, 2023
0397528
Merge branch 'main' into dev
Misaka-blog Jul 15, 2023
cba5d05
When sega add 弱虫 back to 舞萌DX 2023
Misaka-blog Jul 15, 2023
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 config/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.3.3.13
v0.3.3.14
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ require (
github.com/nicksnyder/go-i18n/v2 v2.2.1
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
github.com/robfig/cron/v3 v3.0.1
github.com/shirou/gopsutil/v3 v3.23.5
github.com/shirou/gopsutil/v3 v3.23.6
github.com/xtls/xray-core v1.8.3
go.uber.org/atomic v1.11.0
golang.org/x/text v0.10.0
google.golang.org/grpc v1.56.0
golang.org/x/text v0.11.0
google.golang.org/grpc v1.56.2
gorm.io/driver/sqlite v1.5.2
gorm.io/gorm v1.25.2-0.20230530020048-26663ab9bf55
gorm.io/gorm v1.25.2
)

require (
Expand Down
18 changes: 9 additions & 9 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ github.com/sagernet/sing v0.2.5/go.mod h1:Ta8nHnDLAwqySzKhGoKk4ZIB+vJ3GTKj7UPrWY
github.com/sagernet/sing-shadowsocks v0.2.2 h1:ezSdVhrmIcwDXmCZF3bOJVMuVtTQWpda+1Op+Ie2TA4=
github.com/sagernet/wireguard-go v0.0.0-20221116151939-c99467f53f2c h1:vK2wyt9aWYHHvNLWniwijBu/n4pySypiKRhN32u/JGo=
github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb h1:XfLJSPIOUX+osiMraVgIrMR27uMXnRJWGm1+GL8/63U=
github.com/shirou/gopsutil/v3 v3.23.5 h1:5SgDCeQ0KW0S4N0znjeM/eFHXXOKyv2dVNgRq/c9P6Y=
github.com/shirou/gopsutil/v3 v3.23.5/go.mod h1:Ng3Maa27Q2KARVJ0SPZF5NdrQSC3XHKP8IIWrHgMeLY=
github.com/shirou/gopsutil/v3 v3.23.6 h1:5y46WPI9QBKBbK7EEccUPNXpJpNrvPuTD0O2zHEHT08=
github.com/shirou/gopsutil/v3 v3.23.6/go.mod h1:j7QX50DrXYggrpN30W0Mo+I4/8U2UUIQrnrhqUeWrAU=
github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
Expand All @@ -148,6 +148,7 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg=
github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=
github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI=
Expand Down Expand Up @@ -207,7 +208,6 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
Expand All @@ -217,8 +217,8 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58=
golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
Expand All @@ -231,8 +231,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A=
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
google.golang.org/grpc v1.56.0 h1:+y7Bs8rtMd07LeXmL3NxcTLn7mUkbKZqEpPhMNkwJEE=
google.golang.org/grpc v1.56.0/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
google.golang.org/grpc v1.56.2 h1:fVRFRnXvU+x6C4IlHZewvJOVHoOv1TUuQyoRsYnB4bI=
google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
Expand All @@ -248,8 +248,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gorm.io/driver/sqlite v1.5.2 h1:TpQ+/dqCY4uCigCFyrfnrJnrW9zjpelWVoEVNy5qJkc=
gorm.io/driver/sqlite v1.5.2/go.mod h1:qxAuCol+2r6PannQDpOP1FP6ag3mKi4esLnB/jHed+4=
gorm.io/gorm v1.25.2-0.20230530020048-26663ab9bf55 h1:sC1Xj4TYrLqg1n3AN10w871An7wJM0gzgcm8jkIkECQ=
gorm.io/gorm v1.25.2-0.20230530020048-26663ab9bf55/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
gorm.io/gorm v1.25.2 h1:gs1o6Vsa+oVKG/a9ElL3XgyGfghFfkKA2SInQaCyMho=
gorm.io/gorm v1.25.2/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
gvisor.dev/gvisor v0.0.0-20220901235040-6ca97ef2ce1c h1:m5lcgWnL3OElQNVyp3qcncItJ2c0sQlSGjYK2+nJTA4=
lukechampine.com/blake3 v1.2.1 h1:YuqqRuaqsGV71BV/nm9xlI0MKUv4QC54jQnBChWbGnI=
rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
4 changes: 2 additions & 2 deletions web/assets/js/model/xray.js
Original file line number Diff line number Diff line change
Expand Up @@ -594,10 +594,10 @@ TlsStreamSettings.Cert = class extends XrayCommonClass {
class RealityStreamSettings extends XrayCommonClass {
constructor(
show = false,
dest = "www.microsoft.com:443",
dest = "www.sega.com:443",
xver = 0,
fingerprint = UTLS_FINGERPRINT.UTLS_RANDOM,
serverNames = 'www.microsoft.com',
serverNames = 'www.sega.com',
privateKey = RandomUtil.randomX25519PrivateKey(),
publicKey = '',
minClientVer = "",
Expand Down