GuanM/XrayR
1
0
Fork 0
mirror of https://github.com/XrayR-project/XrayR.git synced 2025-06-08 13:29:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
390 Commits 8 Branches 16 Tags
Commit Graph

390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
thank243
d320aadb54
fix: global limit will failure on some situation (#124) 
fix: typo
 2022-11-28 11:16:27 +08:00
thank243
40ae48f507
update: refactor the global limit (#121) 
fix: some log prefix

It an enhance device limit. Redis just use to sync local ipMap.
If global limit is enabled. The online report will faliure. All enabled nodes will report the device from redis.
 2022-11-27 10:12:30 +08:00
pocketW
d1bc36782b add timeout 2022-11-26 21:44:14 +11:00
AikoCute
c04330d0bf Merge branch 'master' of https://github.com/Github-Aiko/XrayR-Real 2022-11-26 16:14:06 +07:00
AikoCute
872eb12d35 Check Connect Redis Server 2022-11-26 16:13:45 +07:00
pocketW
e1d4428d98
Merge pull request #118 from amin550/master 
fix: ssPanel Report Node Status
 2022-11-26 17:41:00 +11:00
pocketW
0fef3cf278 update config example 2022-11-26 17:30:20 +11:00
Amin
a4ca37b1de Fix sspanel ReportNodeStatus 2022-11-26 00:52:30 +03:30
Senis Y
74f3a75682 fix: delete unused struct 2022-11-25 00:25:39 +08:00
Senis Y
183b1be519 feature: add support v2board new API 
update: add eTag on fetch users for save resources
update: split cert monitor service
update: refactor log format
update: add support shadowsocks_2022

The cert monitor period = UpdatePeriodic * 60

The xray-core official is not implementation of proxy.UserManager feature. So it may change in the future.
 2022-11-24 15:11:01 +08:00
pocketW
2f10c3f6b8 revert error format 2022-11-20 14:57:20 +11:00
AikoCute
86324ff1ae Logs for GlobalDeviceLimit 2022-11-20 10:10:03 +07:00
pocketW
1897404c9d
Merge pull request #104 from XrayR-project/dependabot/go_modules/golang.org/x/crypto-0.3.0 
build(deps): bump golang.org/x/crypto from 0.2.0 to 0.3.0
 2022-11-18 17:25:38 +11:00
dependabot[bot]
ee53e746c5
build(deps): bump golang.org/x/crypto from 0.2.0 to 0.3.0 
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.2.0 to 0.3.0.
- [Release notes](https://github.com/golang/crypto/releases)
- [Commits](https://github.com/golang/crypto/compare/v0.2.0...v0.3.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-17 15:15:59 +00:00
pocketW
656df61c17
Merge pull request #101 from thank243/master 
fix: http mode not working
fix: use "email|uid" for global limit user identify
update: tls alpn challenge for apply certificate
 2022-11-17 12:42:53 +11:00
Senis
e0237f5c54 fix: http mode not working 
fix: use "email|uid" for global limit user identify
update: tls alpn challenge for apply certificate
 2022-11-16 12:59:44 +08:00
pocketW
e16d94fb4a
Merge pull request #97 from XrayR-project/dependabot/go_modules/github.com/xtls/xray-core-1.6.4 
build(deps): bump github.com/xtls/xray-core from 1.6.3 to 1.6.4
 2022-11-15 11:25:59 +11:00
dependabot[bot]
e357fc438f
build(deps): bump github.com/xtls/xray-core from 1.6.3 to 1.6.4 
Bumps [github.com/xtls/xray-core](https://github.com/xtls/xray-core) from 1.6.3 to 1.6.4.
- [Release notes](https://github.com/xtls/xray-core/releases)
- [Commits](https://github.com/xtls/xray-core/compare/v1.6.3...v1.6.4)

---
updated-dependencies:
- dependency-name: github.com/xtls/xray-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-14 15:12:52 +00:00
pocketW
cb1638ac21 update to v0.8.6 v0.8.6 2022-11-13 13:08:12 +11:00
pocketW
de0da25c21 chore: update dependence 2022-11-12 21:22:13 +11:00
pocketW
faec840c23
Merge pull request #90 from XrayR-project/dependabot/go_modules/golang.org/x/crypto-0.2.0 
build(deps): bump golang.org/x/crypto from 0.1.0 to 0.2.0
 2022-11-12 02:26:08 +11:00
pocketW
a6a1baf70c
Merge pull request #89 from thank243/master 
fix: adding the issuers certificate to the new certificate
 2022-11-12 02:25:54 +11:00
pocketW
4013f71e4c fix: update global device limit 2022-11-12 02:22:53 +11:00
dependabot[bot]
c8f0981b0e
build(deps): bump golang.org/x/crypto from 0.1.0 to 0.2.0 
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.1.0 to 0.2.0.
- [Release notes](https://github.com/golang/crypto/releases)
- [Commits](https://github.com/golang/crypto/compare/v0.1.0...v0.2.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-11 15:16:31 +00:00
Senis
5274edf657 fix: adding the issuers certificate to the new certificate 2022-11-11 22:42:31 +08:00
pocketW
e6232c1852
Merge pull request #88 from XrayR-project/dependabot/go_modules/golang.org/x/net-0.2.0 
build(deps): bump golang.org/x/net from 0.1.0 to 0.2.0
 2022-11-11 23:59:47 +11:00
dependabot[bot]
e0688fc609
build(deps): bump golang.org/x/net from 0.1.0 to 0.2.0 
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.1.0 to 0.2.0.
- [Release notes](https://github.com/golang/net/releases)
- [Commits](https://github.com/golang/net/compare/v0.1.0...v0.2.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-11 12:58:43 +00:00
pocketW
ffa444f2ab
Merge pull request #86 from XrayR-project/dependabot/go_modules/github.com/spf13/viper-1.14.0 
build(deps): bump github.com/spf13/viper from 1.13.0 to 1.14.0
 2022-11-11 23:57:06 +11:00
dependabot[bot]
81ba4ebb43
build(deps): bump github.com/spf13/viper from 1.13.0 to 1.14.0 
Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.13.0 to 1.14.0.
- [Release notes](https://github.com/spf13/viper/releases)
- [Commits](https://github.com/spf13/viper/compare/v1.13.0...v1.14.0)

---
updated-dependencies:
- dependency-name: github.com/spf13/viper
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-11 12:56:11 +00:00
pocketW
f50c61c782 fix: fix cert storage path 2022-11-11 23:44:43 +11:00
Senis
9c356cd28c Merge remote-tracking branch 'origin/master' 2022-11-08 17:50:53 +08:00
Senis
310353f344 fix: Redundant character escape 2022-11-08 17:50:03 +08:00
thank243
808b5ecc3c
Merge branch 'master' into master 2022-11-08 14:48:44 +08:00
Senis
c4ef5bb843 update: xray-core v1.6.3 2022-11-08 14:46:06 +08:00
Senis
ddce3fa86d fix: typo 2022-11-08 11:57:06 +08:00
Senis
209f5a17d6 update: rebuild the implementation of legocmd 2022-11-08 11:13:27 +08:00
pocketW
af3fae9cdb
Merge pull request #82 from thank243/master 
fix: on some circumstance, periodic will run twice
 2022-11-07 23:30:32 +11:00
Senis
3b96b352cb fix: on some circumstance, periodic will run twice 2022-11-07 15:55:30 +08:00
pocketW
398c3133d3
Merge pull request #79 from thank243/master 
feat: add global user ip limit
 2022-11-06 14:31:22 +11:00
Senis
a397af5d73 fix: init global limit 2022-11-04 14:36:34 +08:00
Senis
b47954ea64 fix: minor bugs 2022-11-04 08:58:41 +08:00
Senis
9a2188cb0c update: Global User IP limit. 2022-11-04 08:26:56 +08:00
pocketW
c7af43fc49
Merge pull request #75 from XrayR-project/dependabot/go_modules/github.com/shirou/gopsutil/v3-3.22.10 
build(deps): bump github.com/shirou/gopsutil/v3 from 3.22.9 to 3.22.10
 2022-11-03 22:49:11 +11:00
pocketW
87aa855154
Merge pull request #74 from XrayR-project/dependabot/go_modules/github.com/xtls/xray-core-1.6.2 
build(deps): bump github.com/xtls/xray-core from 1.6.1 to 1.6.2
 2022-11-03 22:48:58 +11:00
dependabot[bot]
37eff6755c
build(deps): bump github.com/shirou/gopsutil/v3 from 3.22.9 to 3.22.10 
Bumps [github.com/shirou/gopsutil/v3](https://github.com/shirou/gopsutil) from 3.22.9 to 3.22.10.
- [Release notes](https://github.com/shirou/gopsutil/releases)
- [Commits](https://github.com/shirou/gopsutil/compare/v3.22.9...v3.22.10)

---
updated-dependencies:
- dependency-name: github.com/shirou/gopsutil/v3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-01 15:53:37 +00:00
dependabot[bot]
5e346ddfee
build(deps): bump github.com/xtls/xray-core from 1.6.1 to 1.6.2 
Bumps [github.com/xtls/xray-core](https://github.com/xtls/xray-core) from 1.6.1 to 1.6.2.
- [Release notes](https://github.com/xtls/xray-core/releases)
- [Commits](https://github.com/xtls/xray-core/compare/v1.6.1...v1.6.2)

---
updated-dependencies:
- dependency-name: github.com/xtls/xray-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-31 16:00:54 +00:00
Senis
838c667a87 fix: typo 2022-10-27 08:26:23 +08:00
pocketW
057f4156bf
Merge pull request #71 from XrayR-project/dependabot/go_modules/github.com/stretchr/testify-1.8.1 
build(deps): bump github.com/stretchr/testify from 1.8.0 to 1.8.1
 2022-10-26 13:40:42 +11:00
pocketW
1f59a7cd7a
Merge pull request #70 from XrayR-project/dependabot/go_modules/github.com/xtls/xray-core-1.6.1 
build(deps): bump github.com/xtls/xray-core from 1.6.0 to 1.6.1
 2022-10-26 13:40:30 +11:00
dependabot[bot]
2b5fa4feee
build(deps): bump github.com/stretchr/testify from 1.8.0 to 1.8.1 
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.0 to 1.8.1.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](https://github.com/stretchr/testify/compare/v1.8.0...v1.8.1)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-24 16:02:42 +00:00