kunapi 1.5__tar.gz → 1.6__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: kunapi
-Version: 1.5
+Version: 1.6
 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.6
 Platform: UNKNOWN

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

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

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

@@ -73,7 +73,7 @@ class web:
                         env['url_scheme']=env['HTTP_X_REAL_IP']
                     except:
                         env['url_scheme']=env['wsgi.url_scheme'],
-                    status,resheader,body=self.__routes(self,env)
+                    status,resheader,body=self.__routes(env)
                     if type(body) is bytes:
                         pass
                     else:
@@ -248,9 +248,9 @@ class web:
         globals.VAR.defmodular=''
         globals.VAR.defplug=''
         route=self.__config.route
-        modular=web.__get_modular(self,header)
+        modular=self.__get_modular(header)
         if route['plug']:
-            getplug=web.__get_plug(self,header)
+            getplug=self.__get_plug(header)
         else:
             getplug=''
         routedefault=route['default']
@@ -270,8 +270,7 @@ class web:
             #     plug=route['plug']
             if getplug:
                 plug=getplug
-                routedefault,PATH_INFO=web.__getconfigroute(
-                    self,
+                routedefault,PATH_INFO=self.__getconfigroute(
                     PATH_INFO,
                     header
                 )
@@ -288,8 +287,7 @@ class web:
                                 param.append(urllib.parse.unquote(path))
                         i+=1
             else:                  #配置模块没有配置插件
-                routedefault,PATH_INFO=web.__getconfigroute(
-                    self,
+                routedefault,PATH_INFO=self.__getconfigroute(
                     PATH_INFO,
                     header
                 )
@@ -312,8 +310,7 @@ class web:
         #     plug=route['plug']
         elif getplug:
             plug=getplug
-            routedefault,PATH_INFO=web.__getconfigroute(
-                self,
+            routedefault,PATH_INFO=self.__getconfigroute(
                 PATH_INFO,
                 header
             )
@@ -333,7 +330,7 @@ class web:
                             param.append(urllib.parse.unquote(path))
                     i+=1
         else: #完全默认
-            routedefault,PATH_INFO=web.__getconfigroute(self,PATH_INFO,header)
+            routedefault,PATH_INFO=self.__getconfigroute(PATH_INFO,header)
             if routedefault: #使用默认路由
                 for path in PATH_INFO:
                     if path:
@@ -382,8 +379,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=self.defaultroute(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,26 +415,23 @@ 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)
+        self.__set_globals(header)
+        methods,modular,plug,files,funct,param=globals.VAR.component
         if header['REQUEST_METHOD'] in methods:
             try:
-                obj=getattr(web.__appname,modular)
+                obj=getattr(self.__appname,modular)
             except (AttributeError,UnboundLocalError):
                 status="500 Internal Server Error"
-                body=web.__tpl(
+                body=self.__tpl(
                     title = status,
                     e=status,
                     data="路由不存在："+str(modular)+"/"
@@ -434,7 +441,7 @@ class web:
                     obj=getattr(obj,"controller")
                 except (AttributeError,UnboundLocalError):
                     status="404 Not Found"
-                    body=web.__tpl(
+                    body=self.__tpl(
                         title = status,
                         e=status,
                         data="路由不存在："+str(modular)+"/controller/"
@@ -446,15 +453,14 @@ class web:
                         con="无法找到目录："+str(modular)+"/controller/"+str(plug)+"/"
                         try:
                             data=getattr(obj,"error")(e,con)
-                            body,status,resheader=web.__tran(
-                                self,
+                            body,status,resheader=self.__tran(
                                 data,
                                 status,
                                 resheader
                             )
                         except (AttributeError,UnboundLocalError):
                             status="404 Not Found"
-                            body=web.__tpl(
+                            body=self.__tpl(
                                 title = status,
                                 e=status,data=con
                             )
@@ -464,7 +470,7 @@ class web:
                             if self.__config.app['app_debug']:
                                 print(traceback.format_exc())
                                 errms=traceback.format_exc().split("\n")
-                            body=web.__tpl(
+                            body=self.__tpl(
                                 title = status,
                                 data=errms,e=e
                             )
@@ -475,15 +481,14 @@ class web:
                             con="无法找到文件："+str(modular)+"/controller/"+str(plug)+"/"+str(files)+".py"
                             try:
                                 data=getattr(obj,"error")(e,con)
-                                body,status,resheader=web.__tran(
-                                    self
-                                    ,data
+                                body,status,resheader=self.__tran(
+                                    data
                                     ,status
                                     ,resheader
                                 )
                             except (AttributeError,UnboundLocalError):
                                 status="404 Not Found"
-                                body=web.__tpl(
+                                body=self.__tpl(
                                     title = status
                                     ,data=con
                                     ,e=status)
@@ -493,7 +498,7 @@ class web:
                                 if self.__config.app['app_debug']:
                                     print(traceback.format_exc())
                                     errms=traceback.format_exc().split("\n")
-                                body=web.__tpl(
+                                body=self.__tpl(
                                     title = status,
                                     data=errms,
                                     e=e
@@ -505,8 +510,8 @@ class web:
                                     try:
                                         data=getattr(obj,self.__config.app['before_request'])()
                                         if data:
-                                            body,status,resheader=web.__tran(
-                                                self,data,
+                                            body,status,resheader=self.__tran(
+                                                data,
                                                 status,
                                                 resheader
                                             )
@@ -516,8 +521,8 @@ class web:
                                     except Exception as e:
                                         try:
                                             data=getattr(obj,"error")(e,traceback.format_exc().split("\n"))
-                                            body,status,resheader=web.__tran(
-                                                self,data,
+                                            body,status,resheader=self.__tran(
+                                                data,
                                                 status,
                                                 resheader
                                             )
@@ -527,7 +532,7 @@ class web:
                                             errms=status
                                             if self.__config.app['app_debug']:
                                                 errms=traceback.format_exc().split("\n")
-                                            body=web.__tpl(
+                                            body=self.__tpl(
                                                 title = status,
                                                 data=errms,e=e
                                             )
@@ -538,7 +543,7 @@ class web:
                                             if self.__config.app['app_debug']:
                                                 print(traceback.format_exc())
                                                 errms=traceback.format_exc().split("\n")
-                                            body=web.__tpl(
+                                            body=self.__tpl(
                                                 title = status,
                                                 data=errms,e=e
                                             )
@@ -549,16 +554,16 @@ class web:
                                         data=getattr(obj,funct)(*param) #兼容性之前的控制器
                                     else:
                                         data=getattr(objclass,funct)(*param)
-                                    body,status,resheader=web.__tran(
-                                        self,data,
+                                    body,status,resheader=self.__tran(
+                                        data,
                                         status,
                                         resheader
                                     )
                             except Exception as e:
                                 try:
                                     data=getattr(obj,"error")(e,traceback.format_exc().split("\n"))
-                                    body,status,resheader=web.__tran(
-                                        self,data,
+                                    body,status,resheader=self.__tran(
+                                        data,
                                         status,
                                         resheader
                                     )
@@ -568,7 +573,7 @@ class web:
                                     if self.__config.app['app_debug']:
                                         print(traceback.format_exc())
                                         errms=traceback.format_exc().split("\n")
-                                    body=web.__tpl(
+                                    body=self.__tpl(
                                         title = status,
                                         data=errms,
                                         e=e
@@ -579,14 +584,14 @@ class web:
                                     if self.__config.app['app_debug']:
                                         print(traceback.format_exc())
                                         errms=traceback.format_exc().split("\n")
-                                    body=web.__tpl(
+                                    body=self.__tpl(
                                         title = status,
                                         data=errms,
                                         e=e
                                     )
         else:
             status="405 Method Not Allowed"
-            body=web.__tpl(
+            body=self.__tpl(
                 title = status,
                 data='405 Method Not Allowed',
                 e=''
@@ -600,13 +605,13 @@ class web:
             try:
                 data=getattr(obj,self.__config.app['after_request'])(body,status,resheader)
                 if data:
-                    body,status,resheader=web.__tran(self,data,status,resheader)
+                    body,status,resheader=self.__tran(data,status,resheader)
             except (AttributeError,UnboundLocalError):pass
             except Exception as e:
                 try:
                     data=getattr(obj,"error")(e,traceback.format_exc().split("\n"))
-                    body,status,resheader=web.__tran(
-                        self,data,
+                    body,status,resheader=self.__tran(
+                        data,
                         status,
                         resheader
                     )
@@ -616,7 +621,7 @@ class web:
                     if self.__config.app['app_debug']:
                         print(traceback.format_exc())
                         errms=traceback.format_exc().split("\n")
-                    body=web.__tpl(
+                    body=self.__tpl(
                         title = status
                         ,data=errms,
                         e=e
@@ -627,7 +632,7 @@ class web:
                     if self.__config.app['app_debug']:
                         print(traceback.format_exc())
                         errms=traceback.format_exc().split("\n")
-                    body=web.__tpl(
+                    body=self.__tpl(
                         title = status,
                         data=errms,
                         e=""
@@ -635,15 +640,12 @@ class web:
         resheaders=[]
         for key in resheader:
             resheaders.append((key,resheader[key]))
-        web.__del_globals()
-
-        
         if self.__config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=='kwebs' or self.__config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=='kwebsp':#请求后执行的函数
             try:
                 getattr(obj,"rfdsgeagesegdsfdsfdrrsebskwebsafterrequest")() #关闭数据库相关连接
             except:pass
 
-
+        self.__del_globals()
         if isinstance(resheaders,list):
             if not body:
                 body=''
@@ -653,15 +655,15 @@ class web:
                 body=str(body)
             return str(status),resheaders,body
         else:
-            raise Exception()
-    def __tpl(**context):
+            raise
+    def __tpl(self,**context):
         arr=json_encode({
             'title':context['title'],
             'msg':str(context['e']),
             'error':context['data']
         })
         return arr
-    # def __tpl(**context):
+    # def __tpl(__tpl,**context):
     #     title,status,error=context
     #     arr=json_encode({
     #         'title':title,
@@ -728,6 +730,7 @@ class web:
             'HTTP_X_REAL_IP':env.get('HTTP_X_REAL_IP'),
             'files':files
         }
+        
         p=(config.app['staticpath']+reqheader['RAW_URI'].replace(' ',''))
         status='200 ok'
         if os.path.isfile(p):
@@ -760,7 +763,7 @@ class web:
             resheader.append(("Last-Modified",otherStyleTime))
             resheader.append(("ETag",ETag))
         else:
-            status,resheader,body=web.__routes(self,reqheader)
+            status,resheader,body=self.__routes(reqheader)
             from kunapi import __version__
             resheader.append(('Server', "kunapi-"+__version__))
             if type(body) is bytes:
@@ -769,7 +772,7 @@ class web:
                 body=bytes(body, encoding='utf-8')
         start_response(status,resheader)
         return [body]
-    def __waitress(self,host,port):
+    def __waitress(self,host,port,threads=1):
         if host=='0.0.0.0':
             print("\033[32m* （CTRL+单击打开）http://127.0.0.1:"+str(port)+"（按CTRL+C退出）")
         else:
@@ -779,8 +782,8 @@ class web:
         else:
             print('\033[37m* 调试器：已关闭')
         from waitress import serve
-        serve(self.__application, host=host, port=port)
-    def __http_wsgi(self,host,port,filename):
+        serve(self.__application, host=host, port=port,threads=threads,channel_timeout=3600) #框架不支持多线程 所以 threads设为1
+    def __http_wsgi(self,host,port):
         "http——wsgi测试服务 windows建议使用Waitress‌"
         from wsgiref.simple_server import make_server
         print("* \033[1;31;40m! 警告：\033[0m这是一个wsgiref开发服务器。不要在生产环境中部署使用它")

kunapi-1.6/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.6}/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.6}/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.6}/kunapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: kunapi
-Version: 1.5
+Version: 1.6
 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.6
 Platform: UNKNOWN

{kunapi-1.5 → kunapi-1.6}/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()
-
-
-