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

V4 #768

Open
wants to merge 445 commits into
base: rm
Choose a base branch
from
Open

V4 #768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
445 commits
Select commit Hold shift + click to select a range
862e6ce
del unuseful code
monokoo Jul 16, 2016
af719e8
Merge pull request #1 from monokoo/dev
monokoo Jul 16, 2016
b305c2a
Revert "Dev"
monokoo Jul 16, 2016
d7c355c
Merge pull request #2 from monokoo/revert-1-dev
monokoo Jul 16, 2016
3c3abba
Merge branch 'master' of git://github.com/monokoo/ss-panel into monok…
orvice Jul 16, 2016
e3d9dbc
Merge branch 'monokoo-master' into dev #555
orvice Jul 16, 2016
540e4f8
fix redis
orvice Jul 16, 2016
6aa002f
update composer
orvice Jul 24, 2016
e46decf
Introduce SendCloud mail support.
fentensoft Aug 2, 2016
6081368
Send daily traffic email only to those who used in last 24 hours.
fentensoft Aug 1, 2016
c7f481e
Confirm when delete a user.
fentensoft Aug 1, 2016
8aedf21
Merge pull request #574 from fentensoft/upstream
orvice Aug 12, 2016
646320f
init multiple lang support
orvice Aug 24, 2016
1b85b84
init multiple lang support
orvice Aug 24, 2016
ad5ec18
translate nav,auth
orvice Aug 24, 2016
c02c3ff
add translate for login pages
orvice Aug 24, 2016
a8a5c4a
update download link
orvice Aug 24, 2016
0a8e843
translate for register
orvice Aug 24, 2016
83b8b58
update exception handler
orvice Aug 24, 2016
11a56da
improved exception handler
orvice Aug 25, 2016
a6ad59b
bug fixed
orvice Aug 25, 2016
13e42a1
try to fix testing db
orvice Aug 25, 2016
260c4f0
fix custom_rss field
orvice Aug 25, 2016
3cddc25
update translate and bump version
orvice Aug 25, 2016
da70d41
translate obfs
orvice Aug 25, 2016
62ccbba
init 4.x
orvice Nov 23, 2016
8d9bf24
update to LightFish v0.1.5
orvice Nov 26, 2016
ef19b8d
update default view
orvice Nov 29, 2016
d3c3298
update index
orvice Nov 29, 2016
92bb317
fix auth service
orvice Dec 31, 2016
0928528
update login pages
orvice Dec 31, 2016
3142e12
update register pages
orvice Dec 31, 2016
30920c3
update auth pages
orvice Dec 31, 2016
ac21ebe
update auth pages
orvice Dec 31, 2016
41d50de
add 500 error page
orvice Jan 1, 2017
e6f1ed7
update test case
orvice Jan 1, 2017
a95ce36
fix treateApp
orvice Jan 1, 2017
78f3f7e
fix login
orvice Jan 1, 2017
384a5a8
update auth
orvice Jan 1, 2017
f883c49
fix dashboard layout lang
orvice Jan 1, 2017
442c367
update user dashboard
orvice Jan 1, 2017
f73dd06
improve token, add get version func
orvice Jan 1, 2017
0ee161f
fix check in lang
orvice Jan 1, 2017
e88763a
update node list pages
orvice Jan 1, 2017
f003628
update app config
orvice Jan 1, 2017
28053fe
test
orvice Jan 1, 2017
904aace
test gpg
orvice Jan 1, 2017
937975d
test gpg
orvice Jan 2, 2017
0c00cd6
update composer.lock
orvice Jan 12, 2017
4ea3ba9
init docker support #658
orvice Jan 30, 2017
dc62c1f
update Dockerfile
orvice Jan 30, 2017
fa680b0
update Dockerfile
orvice Jan 30, 2017
df3c013
update docker
orvice Jan 30, 2017
65c41b7
update dockerfile
orvice Jan 30, 2017
c5f0acd
fix apache conf
orvice Jan 30, 2017
026616e
update Dockerfile
orvice Jan 30, 2017
aafe803
fix dockerfile
orvice Jan 30, 2017
0c937fc
update dockerfile
orvice Feb 5, 2017
53def94
update dockerfile
orvice Feb 5, 2017
0861e6a
fix dockerfile
orvice Feb 5, 2017
a93b647
update dockerfile
orvice Feb 5, 2017
21fa7fe
update dockerfile
orvice Feb 5, 2017
13f0d18
init gitlab ci
orvice Feb 5, 2017
5b38b49
update composer.json
orvice Feb 19, 2017
ae5d487
update Dockerfile
orvice Feb 23, 2017
f97af0f
add js resource
orvice Mar 2, 2017
e8696e6
update js
orvice Mar 2, 2017
55863d4
update composer.lock
orvice Mar 2, 2017
52311e1
Delete npm-debug.log
orvice Mar 2, 2017
c39a9e4
add login components
orvice Mar 3, 2017
fb65fb0
add VueCookie
orvice Mar 3, 2017
31236da
update login
orvice Mar 3, 2017
21a7d09
update token storage
orvice Mar 4, 2017
ce8f505
update token
orvice Mar 4, 2017
81b03f6
fix auth middleware
orvice Mar 4, 2017
9a6a48c
update user helper
orvice Mar 4, 2017
f152170
update api middleware
orvice Mar 4, 2017
fe07e8c
update auth
orvice Mar 4, 2017
0eb8dfc
update api
orvice Mar 8, 2017
cf6c2e9
store user id
orvice Mar 8, 2017
046db70
update ci
orvice Mar 20, 2017
dff87c1
update composer.lock
Jun 10, 2017
f21a208
add vue-i18n
Jun 10, 2017
fce47a1
remove old views
Jun 10, 2017
bd08835
Add now ui kit
Jun 10, 2017
ff88db3
Add vue-router
Jun 10, 2017
ce63858
Add codes api
Jun 11, 2017
0f0774e
Add error pages
Jun 11, 2017
292acbf
Update code
Jun 11, 2017
b25a694
Init config api
Jun 11, 2017
6af84aa
Fix mix
Jun 11, 2017
2603705
Update cfg
Jun 11, 2017
b7ace3b
Update home
Jun 12, 2017
97e0dc1
update components
Jun 14, 2017
80a6130
init ui kit with vue
Jun 14, 2017
15f480e
Update ci
Jun 15, 2017
0f6b012
Update js
Jun 15, 2017
118117a
Update components
Jun 15, 2017
05cfd0c
Fix router
Jun 15, 2017
70a6c09
Init res
Jun 15, 2017
080ebd0
Update components
Jun 16, 2017
7e2b0c2
Init uikit
Jun 19, 2017
b634c18
add login.vue
Jun 20, 2017
c4c2a8c
add vue-cookie
Jun 20, 2017
9db1fde
Fix low case
Jun 20, 2017
9a6890e
Update login.vue
Jun 21, 2017
2972814
Update Navbar
Jun 21, 2017
31ce565
Add logout
Jun 21, 2017
f695fa8
Format
Jun 21, 2017
e1dd08e
Fix api middleware
Jun 21, 2017
8dd4074
Update check token
Jun 21, 2017
595541e
Update check login logic
Jun 22, 2017
c8fa831
Add i18n generter
Jun 22, 2017
417d941
Fix i18n
Jun 24, 2017
d0a3542
Update lang
Jun 24, 2017
58e7017
Add switch lang support
Jun 24, 2017
ecd37e0
Update navbar
Jun 24, 2017
f4cf7da
Update router
Jun 25, 2017
c3866fd
Add vue-qrcode
Jun 25, 2017
dc28777
Support Bearer token
Jun 25, 2017
1267421
Add nodes
Jun 25, 2017
ed58f6e
Update leftbar
Jun 25, 2017
ac8d6e7
Add pagination support for traffic logs
Jun 25, 2017
3fd5083
Update traffic log data
Jun 25, 2017
bfd4d17
Format
Jun 25, 2017
00f74a9
Updat login
Jun 26, 2017
a909eee
Update http
Jun 27, 2017
1f433e5
Update dashboard UI
Jun 27, 2017
3bcc6ad
Add home template
Jun 27, 2017
f7952d4
Update gitlab ci
Jun 27, 2017
38c7126
Update index, login pages
Jun 28, 2017
1dbff87
Update auth ui
Jun 28, 2017
ed02aae
Add link icon
Jun 28, 2017
063309a
Update dashboard
Jun 28, 2017
59228a3
Add Connection Info
Jun 28, 2017
e8e3053
Add language switch
Jun 28, 2017
08cf144
Update Node Qr
Jun 29, 2017
5626a00
Add node qr code
Jun 29, 2017
fc5f0a8
Update checkIn
Jun 29, 2017
bcf44cf
Add setting page
Jun 29, 2017
d976e2b
Translate auth.php to Chinese
ziyaointl Jul 1, 2017
e364181
Merge pull request #732 from ziyaointl/dev
orvice Jul 1, 2017
2f3e6cc
Translate base.php to Chinese
ziyaointl Jul 1, 2017
a29580f
Merge pull request #733 from ziyaointl/dev
orvice Jul 1, 2017
0c59372
Translate user-index.php to Chinese
ziyaointl Jul 1, 2017
7bbeb1a
Merge pull request #734 from ziyaointl/dev
orvice Jul 1, 2017
7a04dce
Update i18n
Jul 1, 2017
60fbad6
Add db_config utils
Jul 1, 2017
6a54302
Finish password update
Jul 1, 2017
d1e949c
Finish ss info update
Jul 1, 2017
fb97bc9
Add profile page
Jul 1, 2017
238499d
Finish invite
Jul 1, 2017
9f090e3
Fix api middleware
Jul 2, 2017
e040c14
Update register handle
Jul 2, 2017
65b5ee8
Update admin middleware
Jul 2, 2017
70c9c1c
Init admin
Jul 2, 2017
f58c6a2
Update leftbar
Jul 2, 2017
86290d9
Try to fix Dockerfile
Jul 2, 2017
17350bb
Update Dockerfile
Jul 2, 2017
0db4b97
Update readme.md
Jul 2, 2017
1b3883c
Fix controller
Jul 2, 2017
3d42f48
Fix db config
Jul 2, 2017
63b404d
Update config manager
Jul 2, 2017
54a477d
Finish config manage
Jul 2, 2017
5624a5b
Finish register
Jul 2, 2017
b9f7a41
Update .env
Jul 3, 2017
6b45e11
Add more config
Jul 3, 2017
e372242
Update admin traffic logs
Jul 3, 2017
ea5ada7
Add node manage
orvice Jul 3, 2017
7b3cae1
Add delete node
orvice Jul 3, 2017
0f4f16c
Add invite code manage
orvice Jul 3, 2017
8da4376
Update docker-compose.yml
orvice Jul 3, 2017
6f29943
Update readme.md
orvice Jul 3, 2017
740a2a3
Update docker-compose.yml
orvice Jul 3, 2017
73f9287
update composer
orvice Jul 3, 2017
c8b320c
Init Migration
orvice Jul 6, 2017
b53bbc4
Init console
orvice Jul 6, 2017
ccbb70e
Init create admin command
orvice Jul 6, 2017
ce9b4c7
Remove unused files
orvice Jul 6, 2017
d359e81
Add admin env
orvice Jul 6, 2017
9adabe7
Update logo
orvice Jul 6, 2017
8a0e0c6
Update docker-entrypoint.sh
orvice Jul 6, 2017
8d79894
fix Migration
orvice Jul 6, 2017
94a198e
Add bcrypt hash support, change default hash to bcrypt
orvice Jul 6, 2017
54af773
Update Dockerfile
orvice Jul 6, 2017
3c46fd7
Fix docker-entrypoint.sh primission
orvice Jul 6, 2017
435673b
Fix docker-entrypoint.sh
orvice Jul 6, 2017
e5e1763
Update dockerfile
orvice Jul 6, 2017
4e2eeae
Fix checkin
orvice Jul 6, 2017
a75921c
Fix check traffic
orvice Jul 6, 2017
ca2b21c
Add mu key manage
orvice Jul 6, 2017
7531413
Update unused files
orvice Jul 6, 2017
fdb723e
Add default lang support
orvice Jul 7, 2017
3d006d1
Translate for zh_cn
orvice Jul 7, 2017
9d44883
Fix index layout
orvice Jul 7, 2017
dd37ddd
Fix leftbar
orvice Jul 7, 2017
ae2be1d
Add indexs
orvice Jul 7, 2017
df0553b
Update .env.testing
orvice Jul 7, 2017
3257da6
.env.testing -> .env.jenkins
orvice Jul 7, 2017
ec82ee5
Update tests
orvice Jul 7, 2017
788ccee
Update .travis.yml
orvice Jul 7, 2017
6804111
Code clean
orvice Jul 7, 2017
0b76721
Update home
orvice Jul 7, 2017
6d480d7
Add home message
orvice Jul 7, 2017
2e05405
Add Analytic
orvice Jul 7, 2017
6807528
Update home footer
orvice Jul 7, 2017
9eefa8b
clean
orvice Jul 7, 2017
9a88596
Clean sh
orvice Jul 7, 2017
d1b7995
file clean
orvice Jul 7, 2017
1f5cf4c
Fix
orvice Jul 7, 2017
4948219
Clean .env
orvice Jul 7, 2017
539b6c0
Add maingun config
orvice Jul 8, 2017
4e57314
Init swagger api doc,fix default lang for index
orvice Jul 8, 2017
2ebd15d
Fix default lang
orvice Jul 8, 2017
20347ed
Fix invite code link
orvice Jul 8, 2017
769196b
Fix qr bg
orvice Jul 8, 2017
57b8da0
Min js file
orvice Jul 8, 2017
af07ab8
Add password reset UI
orvice Jul 8, 2017
335ad67
Fix default traffic
orvice Jul 8, 2017
e4efb4d
Update pkgs
orvice Jul 8, 2017
c4b3cfc
Finish send reset mail
orvice Jul 8, 2017
dcf1408
Finish password reset
orvice Jul 8, 2017
1b4d5b3
Update for phpunit6
orvice Jul 8, 2017
ee16f61
Fix Analytic
orvice Jul 8, 2017
a50550c
#719
orvice Jul 8, 2017
ecb321e
Fix admin/config api
orvice Jul 8, 2017
ff19a1d
#551
orvice Jul 9, 2017
305063b
Add http utils
orvice Jul 9, 2017
f8dd4cb
Update utils
orvice Jul 9, 2017
cd81fc1
Init cors support
orvice Jul 9, 2017
8e86ea6
Update doc path
orvice Jul 9, 2017
8a84e56
Try to fix cors
orvice Jul 9, 2017
e3e00ab
Fix origin
orvice Jul 9, 2017
27fe321
#744
orvice Jul 9, 2017
7020949
Add api info
orvice Jul 9, 2017
c2f5b64
Add config doc
orvice Jul 9, 2017
9f43afe
Update doc
orvice Jul 9, 2017
8345d8c
Update mu doc
orvice Jul 9, 2017
30f1926
#746
orvice Jul 10, 2017
00b47ba
Update docker-compose.yml
orvice Jul 10, 2017
d2977da
Init users manage
orvice Jul 10, 2017
8ded0ab
correct DB_USERNAME
mofelee Jul 11, 2017
598ab1d
Merge pull request #749 from MofeLee/patch-1
orvice Aug 3, 2017
0b8f7c7
Update readme.md
orvice Aug 14, 2017
e25a1f4
Add paypal config
orvice Aug 19, 2017
1b81a23
Update composer.json
orvice Nov 18, 2017
d0765ea
Update php version
orvice Nov 18, 2017
dc57308
init v2ray support
orvice Nov 19, 2017
d98a490
v2ray support
orvice Nov 19, 2017
f96c0a0
Merge branch 'master' of github.com:orvice/ss-panel
orvice Nov 19, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 8 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"presets": [
["es2015", { "modules": false }]
],
"plugins": [
"transform-runtime"
]
}
93 changes: 18 additions & 75 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,81 +1,24 @@
// ss-panel v3 配置
//
// !!! 修改此key为随机字符串确保网站安全 !!!
key = 'randomKey'
env = 'prod' // 正式环境请保持env为prod确保安全
debug = 'false' // 正式环境请确保为false
appName = 'ss-panel3' //站点名称
baseUrl = 'https://www.google.com' // 站点地址
timeZone = 'PRC' // RPC 天朝时间 UTC 格林时间
pwdMethod = 'md5' // 密码加密 可选 md5,sha256
salt = '' // 密码加密用,从旧版升级请留空
theme = 'default' // 主题
// v3.4 后使用 session代替authDriver
// session,cache 可选 file/redis
session = 'file'
cache = 'file'
tokenDriver = 'db'
// mu key 用于校验ss-go mu的请求
muKey = ''
// 邮件
mailDriver = 'mailgun' // mailgun #smtp不在支持,仅供测试
// ss-panel v4 Config

// 注册限制,每天每个ip能注册的次数
ipDayLimit = '10'
ENV = 'prod'
DEBUG = 'false'

// 邮箱验证设置
emailVerifyEnabled = 'false' // 是否开启注册时邮箱验证 (true:开启 false:关闭)
emailVerifyCodeLength = '8' // 邮箱验证代码长度
emailVerifyTTL = '30' // 验证代码有效时间 单位分钟
// TimeZone
APP_TIMEZONE = 'PRC'

// 用户签到设置
checkinTime = '22' // 签到间隔时间 单位小时
checkinMin = '93' // 签到最少流量 单位MB
checkinMax = '97' // 签到最多流量
// Auth
AUTH_SALT=
AUTH_PASSWORD_ENCRYPTION_TYPE=bcrypt

//
defaultTraffic = '5' // 用户初始流量 单位GB
// 注册后获得的邀请码数量
inviteNum = '5'
// Database
DB_HOST=127.0.0.1
DB_PORT = '3306'
DB_DATABASE = 'sspanel'
DB_USERNAME = 'sspanel'
DB_PASSWORD = 'sspanel'

// 记录流量日志到dynamodb ,beta,请勿开启
log_traffic_dynamodb = 'false'
// Redis
REDIS_HOST = '127.0.0.1'
REDIS_PORT = '6379'
#REDIS_PASSWORD = ''

# database 数据库配置
db_driver = 'mysql'
db_host = 'localhost'
db_port = '3306'
db_database = 'sspanel'
db_username = 'sspanel'
db_password = 'sspanel'
db_charset = 'utf8'
db_collation = 'utf8_general_ci'
db_prefix = ''

# redis
redis_scheme = 'tcp'
redis_host = '127.0.0.1'
redis_port = '6379'
redis_database = '0'
redis_pass = ''

# mailgun
mailgun_key = ''
mailgun_domain = ''
mailgun_sender = ''

# smtp
smtp_host = ''
smtp_username = ''
smtp_port = ''
smtp_name = ''
smtp_sender = ''
smtp_passsword = ''
smtp_ssl = 'true'

# aws
aws_access_key_id = ''
aws_secret_access_key = ''
aws_region = 'ap-northeast-1'
aws_ses_region = 'us-east-1'
aws_ses_sender = ''
79 changes: 0 additions & 79 deletions .env.jenkins

This file was deleted.

79 changes: 0 additions & 79 deletions .env.testing

This file was deleted.

25 changes: 25 additions & 0 deletions .env.travis
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// ss-panel v4 Config

ENV = 'prod'
DEBUG = 'false'

// TimeZone
APP_TIMEZONE = 'PRC'

// Auth
AUTH_SALT=
AUTH_PASSWORD_ENCRYPTION_TYPE=bcrypt


// Database
DB_HOST=127.0.0.1
DB_PORT = '3306'
DB_DATABASE = 'sspanel'
DB_USERNAME = 'root'
DB_PASSWORD = ''

// Redis
REDIS_HOST = '127.0.0.1'
REDIS_PORT = '6379'
#REDIS_PASSWORD = ''

4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@
.env
vendor/
composer.phar
build/
composer
node_modules/
npm-debug.log
20 changes: 20 additions & 0 deletions .gitlab-ci.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/bin/bash

# Install dependencies only for Docker.
[[ ! -e /.dockerinit ]] && exit 0
set -xe

# Update packages and install composer and PHP dependencies.
apt-get update -yqq
apt-get install git libcurl4-gnutls-dev libicu-dev libmcrypt-dev libvpx-dev libjpeg-dev libpng-dev libxpm-dev zlib1g-dev libfreetype6-dev libxml2-dev libexpat1-dev libbz2-dev libgmp3-dev libldap2-dev unixodbc-dev libpq-dev libsqlite3-dev libaspell-dev libsnmp-dev libpcre3-dev libtidy-dev -yqq

# Compile PHP, include these extensions.
docker-php-ext-install mbstring mcrypt pdo_mysql curl json intl gd xml zip bz2 opcache

# Install Composer and project dependencies.
curl -sS https://getcomposer.org/installer | php
php composer.phar install

# Copy over testing configuration.
# cp .env.testing .env

24 changes: 24 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# This file is a template, and might need editing before it works on your project.
# Official docker image.
image: docker:latest
services:
- docker:dind
stages:
- build
- build_front

build:
stage: build
image: gitlab/dind
script:
- export IMAGE_TAG=$(echo -en $CI_BUILD_REF_NAME | tr -c '[:alnum:]_.-' '-')
- docker login -u "$CI_BUILD_USER" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
- docker build --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" .
- docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG"

build_front:
stage: build_front
image: node:latest
script:
- npm install
- npm run prod
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,16 @@ php:
- 5.5
- 5.6
- 7.0
- 7.1
- hhvm
- nightly

matrix:
allow_failures:
- php: 5.5
- php: 5.6
- php: 7.0
- php: hhvm
- php: nightly


Expand All @@ -23,9 +27,9 @@ install:
before_script:
- "mysql -e 'create database `sspanel`;'"
- mysql -u root sspanel < db-testing.sql
- cp .env.testing .env
- if [[ "$TRAVIS_PHP_VERSION" == '5.6' ]]; then composer require satooshi/php-coveralls:dev-master squizlabs/php_codesniffer:2.* -n ; fi
- if [[ "$TRAVIS_PHP_VERSION" != '5.6' ]]; then composer install -n ; fi
- cp .env.travis .env
- if [[ "$TRAVIS_PHP_VERSION" == '7.0' ]]; then composer require satooshi/php-coveralls:dev-master squizlabs/php_codesniffer:2.* -n ; fi
- if [[ "$TRAVIS_PHP_VERSION" != '7.0' ]]; then composer install -n ; fi


script:
Expand Down
Loading