Skip to content
This repository was archived by the owner on Mar 27, 2025. It is now read-only.

Commit 56733f8

Browse files
Ehco1996Ehco1996
authored
Merge pull request #217 from Ehco1996/dev
dev2master
2 parents dac949d + ba9e06e commit 56733f8

Some content is hidden

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

69 files changed

+3378
-2808
lines changed

‎.flake8‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[flake8]
2+
ignore = E226,E302,E41
3+
max-line-length = 88

‎Dockerfile‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,18 @@
11

2-
FROM python:3.6-slim
2+
FROM python:3.6-alpine
33

4-
LABEL Name=django-sspanel Version=0.0.2
4+
LABEL Name=django-sspanel Version=0.0.3
55

6-
COPY . /src/django-sspanel
6+
COPY requirements.txt /tmp/requirements.txt
77

8-
WORKDIR /src/django-sspanel
8+
RUN apk update && apk add --no-cache gcc linux-headers \
9+
musl-dev python3-dev mariadb-dev jpeg-dev && \
10+
pip install --no-cache-dir -r /tmp/requirements.txt && \
11+
apk del gcc linux-headers \
12+
musl-dev python-dev jpeg-dev && \
13+
rm -Rf ~/.cache
914

10-
RUN apt-get update && \
11-
apt-get install -y --no-install-recommends \
12-
build-essential \
13-
python3-dev \
14-
default-libmysqlclient-dev && \
15-
pip install --no-cache-dir -r requirements.txt
16-
17-
EXPOSE 8080
18-
19-
# 如果是第一次运行需要手动exec进去执行如下命令
20-
# python3 manage.py collectstatic --no-input && \
21-
# python3 manage.py makemigrations && \
22-
# python3 manage.py migrate --run-syncdb && \
23-
24-
# server
25-
CMD uwsgi uwsgi.ini
15+
# # 如果是第一次运行需要手动exec进去执行如下命令
16+
# # python3 manage.py collectstatic --no-input && \
17+
# # python3 manage.py makemigrations && \
18+
# # python3 manage.py migrate --run-syncdb && \

‎Pipfile‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎Pipfile.lock‎

Lines changed: 0 additions & 455 deletions
This file was deleted.

‎README.md‎

Lines changed: 9 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -7,92 +7,49 @@ Telegram group : [invite link](https://t.me/Ehcobreakwa11)
77

88
Wiki: [Wiki](https://github.com/Ehco1996/django-sspanel/wiki)
99

10-
**欢迎老板捐赠**
11-
12-
![](http://opj9lh0x4.bkt.clouddn.com/17-12-20/62343859.jpg)
13-
14-
## 重大升级说明
15-
如果要升级到dev最新的代码
16-
请按wiki里的步骤升级
17-
18-
https://github.com/Ehco1996/django-sspanel/wiki/%E9%87%8D%E5%A4%A7%E6%9B%B4%E6%96%B0%E6%AD%A5%E9%AA%A4
1910

2011
## 项目说明
2112

22-
该项目是用django作为后端框架，开发的一个shadowsocks多人用户面板，具有以下特点：
23-
24-
* 轻量级css框架
25-
* 最新版本的Django作为后端
2613
* 后端支援（shadowsocksr/shadowsocks）
2714
* 注册采用邀请系统，告别不良用户
28-
* 完善的商品购买逻辑
2915
* 统一完善的后台管理界面
16+
* 完善的商品购买逻辑
3017
* 支付宝当面付模块
3118
* 邀请返利系统
32-
* 更多特性等待开发和探索....
19+
* ...
3320

3421
## 预览图
3522

3623
**用户界面：**
3724

3825
* 注册界面:
3926

40-
![](http://opj9lh0x4.bkt.clouddn.com/18-1-20/21920210.jpg)
27+
![](https://user-images.githubusercontent.com/24697284/53059324-5dfaf000-34f1-11e9-9454-a828237b263d.png)
4128

4229
* 用户首页:
4330

44-
![](http://opj9lh0x4.bkt.clouddn.com/18-1-20/44962964.jpg)
31+
![](https://user-images.githubusercontent.com/24697284/53059228-12e0dd00-34f1-11e9-8b15-e832c182d010.png)
4532

4633

47-
* 支持多种主题切换:
48-
49-
![](http://opj9lh0x4.bkt.clouddn.com/18-4-7/37704064.jpg)
50-
5134
* 节点信息：
5235

53-
![](http://opj9lh0x4.bkt.clouddn.com/18-10-15/57273903.jpg)
36+
![](https://user-images.githubusercontent.com/24697284/53059231-13797380-34f1-11e9-8702-39c9063dd049.png)
5437

5538
* 流量查询:
5639

57-
![](http://opj9lh0x4.bkt.clouddn.com/18-1-20/23097796.jpg)
58-
59-
60-
* 充值捐增:
61-
62-
![](http://opj9lh0x4.bkt.clouddn.com/18-1-20/84610707.jpg)
63-
40+
![](https://user-images.githubusercontent.com/24697284/53059233-14120a00-34f1-11e9-94f3-b2ca2ab88882.png)
6441

6542

6643
**后台界面:**
6744

68-
* 后台首页：
69-
70-
![](http://opj9lh0x4.bkt.clouddn.com/17-10-25/23766206.jpg)
71-
72-
* 商品管理：
73-
74-
![](http://opj9lh0x4.bkt.clouddn.com/17-9-17/76575609.jpg)
75-
7645
* 节点管理：
7746

78-
![](http://opj9lh0x4.bkt.clouddn.com/17-9-17/12003054.jpg)
47+
![](https://user-images.githubusercontent.com/24697284/53059234-14120a00-34f1-11e9-8937-ea56cf4077ed.png)
7948

8049

8150
* Django-jet 后台:
8251

83-
![](http://opj9lh0x4.bkt.clouddn.com/18-4-7/67402906.jpg)
84-
85-
## 项目组件
86-
87-
#### 前端相关：
88-
89-
* BULMA(布玛) <http://bulma.io/>
90-
91-
* SweetAlert(通知功能) <http://t4t5.github.io/sweetalert/>
92-
93-
#### 后端框架：
94-
95-
* Django <https://www.djangoproject.com/>
52+
![](https://user-images.githubusercontent.com/24697284/53059235-14120a00-34f1-11e9-81ea-69bbb2e445d2.png)
9653

9754

9855
## 部署教程：
@@ -101,4 +58,4 @@ https://github.com/Ehco1996/django-sspanel/wiki/%E9%87%8D%E5%A4%A7%E6%9B%B4%E6%9
10158

10259
萌新版: [部署教程](https://github.com/Ehco1996/django-sspanel/wiki/%E9%9D%A2%E6%9D%BF%E5%AE%89%E8%A3%85%E6%95%99%E7%A8%8B-%E8%90%8C%E6%96%B0%E7%89%88)
10360

104-
Docker版: [部署教程](https://github.com/Ehco1996/django-sspanel/wiki/%E5%88%A9%E7%94%A8Dokcer-%E4%B8%80%E9%94%AE%E5%AE%89%E8%A3%85)
61+
Docker版: [部署教程](https://github.com/Ehco1996/django-sspanel/wiki/Docker-%E4%B8%80%E9%94%AE%E5%AE%89%E8%A3%85)

‎apps/api/apps.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33

44
class ApiConfig(AppConfig):
5-
name = 'api'
5+
name = "api"

‎apps/api/urls.py‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,24 @@
33

44
app_name = "api"
55
urlpatterns = [
6-
path('user/data/', views.userData, name='userdata'),
7-
path('node/data/', views.nodeData, name='nodedata'),
8-
path('donate/data/', views.donateData, name='donatedata'),
9-
path('random/port/', views.change_ss_port, name='changessport'),
10-
path('gen/invitecode/', views.gen_invite_code, name='geninvitecode'),
11-
path('shop/', views.purchase, name='purchase'),
12-
path('pay/request/', views.pay_request, name='pay_request'),
13-
path('pay/query/', views.pay_query, name='pay_query'),
14-
path('traffic/query/', views.traffic_query, name='traffic_query'),
15-
path('change/theme/', views.change_theme, name='change_theme'),
16-
path('checkin/', views.checkin, name='checkin'),
6+
path("user/data/", views.userData, name="userdata"),
7+
path("node/data/", views.nodeData, name="nodedata"),
8+
path("donate/data/", views.donateData, name="donatedata"),
9+
path("random/port/", views.change_ss_port, name="changessport"),
10+
path("gen/invitecode/", views.gen_invite_code, name="geninvitecode"),
11+
path("shop/", views.purchase, name="purchase"),
12+
path("traffic/query/", views.traffic_query, name="traffic_query"),
13+
path("change/theme/", views.change_theme, name="change_theme"),
14+
path("checkin/", views.checkin, name="checkin"),
1715
# 邀请码接口
18-
path('get/invitecode/', views.get_invitecode, name='get_invitecode'),
16+
path("get/invitecode/", views.get_invitecode, name="get_invitecode"),
1917
# web api 接口
20-
path('nodes/<int:node_id>', views.node_api, name='get_node_info'),
21-
path('nodes/online', views.node_online_api, name='post_onlineip'),
22-
path('users/nodes/<int:node_id>', views.user_api, name='get_userinfo'),
23-
path('traffic/upload', views.traffic_api, name='post_traffic'),
24-
path('nodes/aliveip', views.alive_ip_api, name='post_aliveip'),
18+
path("nodes/<int:node_id>", views.node_api, name="get_node_info"),
19+
path("nodes/online", views.node_online_api, name="post_onlineip"),
20+
path("users/nodes/<int:node_id>", views.user_api, name="get_userinfo"),
21+
path("traffic/upload", views.traffic_api, name="post_traffic"),
22+
path("nodes/aliveip", views.alive_ip_api, name="post_aliveip"),
23+
# 支付
24+
path("orders", views.OrderView.as_view(), name="order"),
25+
path("callback/alipay", views.ailpay_callback, name="alipay_callback"),
2526
]

0 commit comments

Comments
 (0)