增加了配置文件hub_name

CGI_config.conf

@@ -1,5 +1,6 @@
 [server]
 server_pwd=111111
+hub_name=Hubstandardtest
 [redis]
 host=192.168.11.243
 port=6800

VPN_CGI/settings.py

@@ -1,120 +0,0 @@
-"""
-Django settings for VPN_CGI project.
-
-Generated by 'django-admin startproject' using Django 2.1.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/2.1/topics/settings/
-
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/2.1/ref/settings/
-"""
-
-import os
-
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
-
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/2.1/howto/deployment/checklist/
-
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 'tpnj_u$-4ymf6_#m9m+hecrsaa0@ouvr8&_!9xs#p2($mnp27!'
-
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
-
-ALLOWED_HOSTS = ['192.168.11.137', 'localhost', '127.0.0.1','192.168.10.220']
-
-
-# Application definition
-
-INSTALLED_APPS = [
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-]
-
-MIDDLEWARE = [
-    'django.middleware.security.SecurityMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
-]
-
-ROOT_URLCONF = 'VPN_CGI.urls'
-
-TEMPLATES = [
-    {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
-                'django.template.context_processors.debug',
-                'django.template.context_processors.request',
-                'django.contrib.auth.context_processors.auth',
-                'django.contrib.messages.context_processors.messages',
-            ],
-        },
-    },
-]
-
-WSGI_APPLICATION = 'VPN_CGI.wsgi.application'
-
-
-# Database
-# https://docs.djangoproject.com/en/2.1/ref/settings/#databases
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
-    }
-}
-
-
-# Password validation
-# https://docs.djangoproject.com/en/2.1/ref/settings/#auth-password-validators
-
-AUTH_PASSWORD_VALIDATORS = [
-    {
-        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
-    },
-]
-
-
-# Internationalization
-# https://docs.djangoproject.com/en/2.1/topics/i18n/
-
-LANGUAGE_CODE = 'en-us'
-
-TIME_ZONE = 'UTC'
-
-USE_I18N = True
-
-USE_L10N = True
-
-USE_TZ = True
-
-
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/2.1/howto/static-files/
-
-STATIC_URL = '/static/'

VPN_CGI/urls.py

@@ -1,21 +0,0 @@
-"""VPN_CGI URL Configuration
-
-The `urlpatterns` list routes URLs to views. For more information please see:
-    https://docs.djangoproject.com/en/2.1/topics/http/urls/
-Examples:
-Function views
-    1. Add an import:  from my_app import views
-    2. Add a URL to urlpatterns:  path('', views.home, name='home')
-Class-based views
-    1. Add an import:  from other_app.views import Home
-    2. Add a URL to urlpatterns:  path('', Home.as_view(), name='home')
-Including another URLconf
-    1. Import the include() function: from django.urls import include, path
-    2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
-"""
-from django.contrib import admin
-from django.urls import include, path 
-urlpatterns = [
-    path('command/', include('command.urls')),
-    path('admin/', admin.site.urls),
-]

VPN_CGI/wsgi.py

@@ -1,16 +0,0 @@
-"""
-WSGI config for VPN_CGI project.
-
-It exposes the WSGI callable as a module-level variable named ``application``.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/2.1/howto/deployment/wsgi/
-"""
-
-import os
-
-from django.core.wsgi import get_wsgi_application
-
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'VPN_CGI.settings')
-
-application = get_wsgi_application()

command/views.py

@@ -59,7 +59,7 @@ class Redis:
 # Create your views here.
 def command(request):
 	# if username == "" and password = "" :
-	server_pwd,host,port,index=readconfig()
+	server_pwd,host,port,index,hub_name=readconfig()
 	if request.method=='GET':
 		cmd_obj=request.GET.get('cmd_obj',default='server')
 		if cmd_obj=='server':		
@@ -166,7 +166,7 @@ def command(request):
 				# 	command=server_cmd+' '+command_dic['password']+password+' '+command_dic['adminhub']+' '+command_dic['password']+password+' '+\
 				# 	command_dic['csv']+' '+command_dic['cmd']+' '+command
 				server_pwd=request.GET.get('server_pwd',default=server_pwd)
-				hub_name=request.GET.get('hub_name',default='NewHub0')
+				hub_name=request.GET.get('hub_name',default=hub_name)
 				hub_pwd=request.GET.get('hub_pwd',default='111111')
 				hub_cmd=server_cmd+' '+command_dic['password']+server_pwd+' '+command_dic['hub']+hub_name+' '+command_dic['password']+hub_pwd+' '\
 					+command_dic['cmd']
@@ -289,6 +289,7 @@ def command(request):
 						return myresponse
 					else:
 						command=hub_cmd+' '+command+' '+user_name
+						print(command)
 						outs,rtn_code=mysubprocess(command)
 						if(rtn_code==0):
 							my_dict=dict()
@@ -535,10 +536,11 @@ def readconfig():
 	myconfig=configparser.ConfigParser()
 	myconfig.read("CGI_config.conf")
 	server_pwd=myconfig.get("server","server_pwd")
+	hub_name=myconfig.get("server","hub_name")
 	host=myconfig.get("redis","host")
 	port=myconfig.get("redis","port")
 	index=myconfig.get("redis","index")
-	return server_pwd,host,port,index
+	return server_pwd,host,port,index,hub_name
 
 def IpExist(host,port,candidate_ip,index):
 	P=Redis(host,port,index)