Commits · a53cfbb2cf95d97a20d1c282be5b55154f608a0c · Administrator / browser-backend

09 May, 2020 10 commits
- Merge branch 'staging' into 'master' · a53cfbb2
  Administrator authored May 09, 2020
```
Staging

See merge request !71
```
  a53cfbb2
- Merge branch 'dev-zrj' into 'staging' · b6ddfece
  renjie authored May 09, 2020
```
自有专线bug

See merge request !70
```
  b6ddfece
- 自有专线bug · 60875b91
  renjie authored May 09, 2020
  
  60875b91
- Merge branch 'staging' into 'master' · c1ab3fae
  Administrator authored May 09, 2020
```
Staging

See merge request !68
```
  c1ab3fae
- Merge branch 'dev-zrj' into 'staging' · 977d42dd
  renjie authored May 09, 2020
```
注释

See merge request !69
```
  977d42dd
- 注释 · 400023d3
  renjie authored May 09, 2020
  
  400023d3
- Merge branch 'dev-zrj' into 'staging' · 90853001
  renjie authored May 09, 2020
```
Dev zrj

See merge request !67
```
  90853001
- 修改购买6,12个月续费bug · f39bbe7e
  renjie authored May 09, 2020
  
  f39bbe7e
- 修改购买6,12个月续费bug · 54bcb100
  renjie authored May 09, 2020
  
  54bcb100
- 修改购买6个月续费bug · 06d31065
  renjie authored May 09, 2020
  
  06d31065
08 May, 2020 9 commits
- Merge branch 'staging' into 'master' · 826c0694
  Administrator authored May 08, 2020
```
Staging

See merge request !66
```
  826c0694
- Merge branch 'dev-zrj' into 'staging' · 5845cc6a
  renjie authored May 08, 2020
```
修改ip延迟bug

See merge request !65
```
  5845cc6a
- 修改ip延迟bug · 6b500769
  renjie authored May 08, 2020
  
  6b500769
- Merge branch 'dev-zrj' into 'staging' · 026cc943
  renjie authored May 08, 2020
```
添加白名单

See merge request !64
```
  026cc943
- 添加白名单 · 26399948
  renjie authored May 08, 2020
  
  26399948
- Merge branch 'dev-zrj' into 'staging' · 005039b9
  renjie authored May 08, 2020
```
自有专线

See merge request !63
```
  005039b9
- 自有专线 · 47639313
  renjie authored May 08, 2020
  
  47639313
- Merge branch 'dev-zrj' into 'staging' · b360da96
  renjie authored May 08, 2020
```
自有专线

See merge request !62
```
  b360da96
- 自有专线 · 87168aac
  renjie authored May 08, 2020
  
  87168aac
07 May, 2020 21 commits
- Merge branch 'staging' into 'master' · d8b94347
  Administrator authored May 07, 2020
```
Staging

See merge request !61
```
  d8b94347
- Merge branch 'dev-zrj' into 'staging' · ec6afd2f
  renjie authored May 07, 2020
```
专线ip debug

See merge request !60
```
  ec6afd2f
- 专线ip debug · de723c1d
  renjie authored May 07, 2020
  
  de723c1d
- Merge branch 'dev-zrj' into 'staging' · a82ca288
  renjie authored May 07, 2020
```
专线ip debug

See merge request !59
```
  a82ca288
- 专线ip debug · d52056f5
  renjie authored May 07, 2020
  
  d52056f5
- Merge branch 'staging' into 'master' · 2e1fad5f
  Administrator authored May 07, 2020
```
Staging

See merge request !58
```
  2e1fad5f
- Merge branch 'dev-zrj' into 'staging' · 052f04c8
  renjie authored May 07, 2020
```
专线ip debug

See merge request !57
```
  052f04c8
- 专线ip debug · dd95dd0f
  renjie authored May 07, 2020
  
  dd95dd0f
- Merge branch 'staging' into 'master' · 0019c6bd
  Administrator authored May 07, 2020
```
Staging

See merge request !56
```
  0019c6bd
- Merge branch 'dev-zrj' into 'staging' · 7ceeece6
  renjie authored May 07, 2020
```
专线ip debug

See merge request !55
```
  7ceeece6
- 专线ip debug · 4a216de7
  renjie authored May 07, 2020
  
  4a216de7
- Merge branch 'staging' into 'master' · 0a91106a
  Administrator authored May 07, 2020
```
Staging

See merge request !54
```
  0a91106a
- Merge branch 'dev-zrj' into 'staging' · 35dab227
  renjie authored May 07, 2020
```
1.专线ip延迟显示

See merge request !53
```
  35dab227
- 1.专线ip延迟显示 · 2a8d6b16
  renjie authored May 07, 2020
```
2.自有ip查询修改
3.key修改
```
  2a8d6b16
- Merge branch 'staging' into 'master' · 9a8477e9
  Administrator authored May 07, 2020
```
Staging

See merge request !52
```
  9a8477e9
- Merge branch 'dev-zrj' into 'staging' · 8e6a858f
  renjie authored May 07, 2020
```
自有ip添加判断

See merge request !51
```
  8e6a858f
- 自有ip添加判断 · ec9f7e78
  renjie authored May 07, 2020
  
  ec9f7e78
- Merge branch 'dev-zrj' into 'staging' · 1169df93
  renjie authored May 07, 2020
```
1.生成3proxy配置文件

See merge request !50
```
  1169df93
- 1.生成3proxy配置文件 · d2c12f58
  renjie authored May 07, 2020
```
2.获取3proxy配置文件接口
```
  d2c12f58
- Merge branch 'dev-zrj' into 'staging' · 71f58f31
  renjie authored May 07, 2020
```
1.生成3proxy配置文件

See merge request !49
```
  71f58f31
- 1.生成3proxy配置文件 · 1452ec1b
  renjie authored May 07, 2020
```
2.获取3proxy配置文件接口
```
  1452ec1b