kunapi 1.5__tar.gz → 1.7__tar.gz

{kunapi-1.5 → kunapi-1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: kunapi
-Version: 1.5
+Version: 1.7
 Summary: kunapi
 Home-page: https://docs.kwebapp.cn/index/index/2
 Author: 百里-坤坤
@@ -9,5 +9,5 @@ Maintainer: 坤坤
 Maintainer-email: fengkun01@qq.com
 License: MIT License
 Description: kunapi
-Keywords: kunapi1.5
+Keywords: kunapi1.7
 Platform: UNKNOWN

{kunapi-1.5 → kunapi-1.7}/kunapi/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = '1.5'
+__version__ = '1.7'
 try:
     from .app import web
 except:pass

{kunapi-1.5 → kunapi-1.7}/kunapi/app.py

@@ -382,8 +382,21 @@ class web:
             body=data
         return body,status,resheader
     def __set_globals(self,header):
+
+
+        globals.VAR = threading.local()
+        globals.HEADER = threading.local()
+        globals.G = threading.local()
+
+        PATH_INFO=header['PATH_INFO'].split('/')
+        if PATH_INFO[0]==' ' or PATH_INFO[0]=='':
+            del PATH_INFO[0]
+        methods,modular,plug,files,funct,param=web.defaultroute(self,header,PATH_INFO)
+        globals.VAR.component=(methods,modular,plug,files,funct,param)
+        globals.VAR.defmodular=''
+        globals.VAR.defplug=''
+
         globals.HEADER.GET=header
-        # globals.HEADER.url_scheme=header['url_scheme']
         globals.HEADER.Method=header['REQUEST_METHOD']
         globals.HEADER.URL=header['RAW_URI']
         globals.HEADER.PATH_INFO=header['PATH_INFO']
@@ -405,20 +418,22 @@ class web:
             globals.HEADER.HTTP_USER_AGENT=header['HTTP_USER_AGENT']
         except:
             globals.HEADER.HTTP_USER_AGENT=None
-    def __del_globals():
-        globals.VAR = threading.local()
-        globals.HEADER = threading.local()
-        globals.G = threading.local()
+    def __del_globals(self):
+        # pass
+        globals.VAR = None
+        globals.HEADER = None
+        globals.G = None
     def __routes(self,header):
         body="这是一个http测试服务器"
         status="200 ok"
         resheader={"Content-Type":"application/json; charset=utf-8"}
         web.__set_globals(self,header)
-        PATH_INFO=header['PATH_INFO'].split('/')
-        if PATH_INFO[0]==' ' or PATH_INFO[0]=='':
-            del PATH_INFO[0]
-        methods,modular,plug,files,funct,param=web.defaultroute(self,header,PATH_INFO)
-        globals.VAR.component=(methods,modular,plug,files,funct,param)
+        # PATH_INFO=header['PATH_INFO'].split('/')
+        # if PATH_INFO[0]==' ' or PATH_INFO[0]=='':
+        #     del PATH_INFO[0]
+        # methods,modular,plug,files,funct,param=web.defaultroute(self,header,PATH_INFO)
+        # globals.VAR.component=(methods,modular,plug,files,funct,param)
+        methods,modular,plug,files,funct,param=globals.VAR.component
         if header['REQUEST_METHOD'] in methods:
             try:
                 obj=getattr(web.__appname,modular)
@@ -635,7 +650,7 @@ class web:
         resheaders=[]
         for key in resheader:
             resheaders.append((key,resheader[key]))
-        web.__del_globals()
+        web.__del_globals(self)
 
         
         if self.__config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=='kwebs' or self.__config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=='kwebsp':#请求后执行的函数
@@ -779,7 +794,7 @@ class web:
         else:
             print('\033[37m* 调试器：已关闭')
         from waitress import serve
-        serve(self.__application, host=host, port=port)
+        serve(self.__application, host=host, port=port,threads=1,channel_timeout=3600) #框架不支持多线程 所以 threads设为1
     def __http_wsgi(self,host,port,filename):
         "http——wsgi测试服务 windows建议使用Waitress‌"
         from wsgiref.simple_server import make_server

kunapi-1.7/kunapi/common/globals.py

@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+import threading
+##普通全局变量  请求结束后删除
+VAR = threading.local()
+HEADER = threading.local()
+G = threading.local()
+
+
+

{kunapi-1.5 → kunapi-1.7}/kunapi/common/request.py

@@ -113,7 +113,10 @@ class HEADER:
     def SERVER_PROTOCOL():
         return kcwsglobals.HEADER.SERVER_PROTOCOL
     def HTTP_HOST():
-        return kcwsglobals.HEADER.HTTP_HOST
+        if kcwsglobals.HEADER.HTTP_HOST:
+            return kcwsglobals.HEADER.HTTP_HOST
+        else:
+            return ''
     def HTTP_COOKIE():
         return kcwsglobals.HEADER.HTTP_COOKIE
     def HTTP_USER_AGENT():

{kunapi-1.5 → kunapi-1.7}/kunapi/kunapi.py

@@ -11,6 +11,10 @@ def get_cmd_par(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=''):
     if python_version[0:3]!='3.8':
         print("\033[1;31;40m "+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+"依赖python3.8，与你现在的python"+python_version+"不兼容")
         exit()
+    if 'Linux' in get_sysinfo()['platform'] or 'Windows' in get_sysinfo()['platform']:pass
+    else:
+        print("\033[1;31;40m "+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+"不支持当前操作系统 解压在linux或windows系统下运行")
+        exit()
     try:
         opts, args = getopt.getopt(sys.argv[1:], "h", ["project=","app=","modular=","plug=","user=","pwd=","host=","port=","timeout=","processcount=",
         "install","uninstall","pack","upload","cli"])
@@ -256,7 +260,7 @@ def cllfunction():
                         else:
                             save_route_cli_pid('pid/'+str(sys.argv[tar-1])+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+'_server_pid')
                             app.run(host=cmd_par['host'],port=int(cmd_par['port']))
-            else:
+            elif 'Linux' in get_sysinfo()['platform']:
                 pythonpath=site.getsitepackages()[0].replace('\\','/')
                 t=pythonpath.split('/')
                 tt='/'+t[-3]+'/'+t[-2]+'/'+t[-1]
@@ -281,7 +285,8 @@ def cllfunction():
                         sys.argv=[sys.argv[0], '-w', str(cmd_par['processcount']), '-b', cmd_par['host']+':'+str(cmd_par['port']),'-t',cmd_par['timeout'], 'server:'+cmd_par['appname']]
                         sys.exit(run())
                         exit()
-             
+            else:
+                raise Exception('不支持该操作系统')
         elif cmd_par['install'] or cmd_par['pack'] or cmd_par['upload'] or cmd_par['uninstall']:
             if cmd_par['install']:#插入 应用、模块、插件
                 if cmd_par['appname'] and cmd_par['modular']:

{kunapi-1.5 → kunapi-1.7}/kunapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: kunapi
-Version: 1.5
+Version: 1.7
 Summary: kunapi
 Home-page: https://docs.kwebapp.cn/index/index/2
 Author: 百里-坤坤
@@ -9,5 +9,5 @@ Maintainer: 坤坤
 Maintainer-email: fengkun01@qq.com
 License: MIT License
 Description: kunapi
-Keywords: kunapi1.5
+Keywords: kunapi1.7
 Platform: UNKNOWN

{kunapi-1.5 → kunapi-1.7}/kunapi.egg-info/SOURCES.txt

@@ -28,4 +28,24 @@ kunapi/tempfile/kunapi/app/index/controller/index/__init__.py
 kunapi/tempfile/kunapi/app/index/controller/index/index.py
 kunapi/tempfile/kunapi/app/index/controller/index/common/__init__.py
 kunapi/tempfile/kunapi/app/index/controller/index/common/autoload.py
+kunapi/tempfile/kunapi/app/index/controller/index/common/model.py
+kunapi/common/__init__.py
+kunapi/common/autoload.py
+kunapi/common/globals.py
+kunapi/common/request.py
+kunapi/config/__init__.py
+kunapi/tempfile/kunapi/app/__init__.py
+kunapi/tempfile/kunapi/app/common/__init__.py
+kunapi/tempfile/kunapi/app/common/autoload.py
+kunapi/tempfile/kunapi/app/common/model.py
+kunapi/tempfile/kunapi/app/config/__init__.py
+kunapi/tempfile/kunapi/app/config/app.py
+kunapi/tempfile/kunapi/app/index/__init__.py
+kunapi/tempfile/kunapi/app/index/common/__init__.py
+kunapi/tempfile/kunapi/app/index/common/autoload.py
+kunapi/tempfile/kunapi/app/index/controller/__init__.py
+kunapi/tempfile/kunapi/app/index/controller/index/__init__.py
+kunapi/tempfile/kunapi/app/index/controller/index/index.py
+kunapi/tempfile/kunapi/app/index/controller/index/common/__init__.py
+kunapi/tempfile/kunapi/app/index/controller/index/common/autoload.py
 kunapi/tempfile/kunapi/app/index/controller/index/common/model.py

kunapi-1.5/kunapi/common/globals.py

@@ -1,9 +0,0 @@
-# -*- coding: utf-8 -*-
-from threading import local
-##普通全局变量  请求结束后删除
-VAR = local()
-HEADER = local()
-G = local()
-
-
-