kunapi 1.4__tar.gz → 1.5__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: kunapi
-Version: 1.4
+Version: 1.5
 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.4
+Keywords: kunapi1.5
 Platform: UNKNOWN

{kunapi-1.4 → kunapi-1.5}/kunapi/Events.py

@@ -67,8 +67,4 @@ class Events:
             while True:
                 time.sleep(0.1)
         except KeyboardInterrupt as e:
-            self.kill_process()
-            # observer.stop()
-        # observer.join()
-    
-# Events(['server.py'])  #执行server.py文件
+            self.kill_process()

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

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

{kunapi-1.4 → kunapi-1.5}/kunapi/common/autoload.py

@@ -834,58 +834,6 @@ class create:
         import pip
         if not os.path.exists(self.project+self.appname):
             raise Exception('项目不存在')
-            # if config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=='kwebsp':
-            #     r=requests.get(config.domain['kcwebsfile']+"/kunapi/kwebsp.zip")
-            #     f = open("./"+self.project+"k.zip", "wb")
-            #     for chunk in r.iter_content(chunk_size=512):
-            #         if chunk:
-            #             f.write(chunk)
-            #     f.close()
-            #     kcwszip.unzip_file("./"+self.project+"kwebsp.zip","./"+self.project+self.appname)
-            #     os.remove("./"+self.project+"kwebsp.zip")
-            # elif config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=='kwebs':
-            #     r=requests.get(config.domain['kcwebsfile']+"/kunapi/kwebs.zip")
-            #     f = open("./"+self.project+"kwebs.zip", "wb")
-            #     for chunk in r.iter_content(chunk_size=512):
-            #         if chunk:
-            #             f.write(chunk)
-            #     f.close()
-            #     kcwszip.unzip_file("./"+self.project+"kwebs.zip","./"+self.project+self.appname)
-            #     os.remove("./"+self.project+"kwebs.zip")
-            # elif config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=='kunapi':
-            #     r=requests.get(config.domain['kcwebsfile']+"/kapi/kapi.zip")
-            #     f = open("./"+self.project+"kapi.zip", "wb")
-            #     for chunk in r.iter_content(chunk_size=512):
-            #         if chunk:
-            #             f.write(chunk)
-            #     f.close()
-            #     kcwszip.unzip_file("./"+self.project+"kapi.zip","./"+self.project+self.appname)
-            #     os.remove("./"+self.project+"kapi.zip")
-            # else:
-            #     raise Exception('包名错误')
-            # if not os.path.isfile("./"+self.project+"server.py"):
-            #     # if "Windows" in platform.platform():
-            #     #     pythonname="python"
-            #     # else:
-            #     #     pythonname="python3.8"
-            #     servertext=('#项目运行文件，请务修改\n'+
-            #             'import kunapi,sys,'+self.appname+'\n'+
-            #             'app=kunapi.web(__name__,'+self.appname+')\n'+
-            #             'if __name__ == "__main__":\n'+
-            #             '    try:\n'+
-            #             '        route=sys.argv[1]\n'+
-            #             '        if "eventlog"==route:\n'+
-            #             '            raise Exception("")\n'+
-            #             '    except:\n'+
-            #             '        #host监听ip port端口 name python解释器名字 (windows一般是python  linux一般是python3) \n'+
-            #             '        app.run(host="0.0.0.0",port="39001",name="python3.8")\n'+
-            #             '    else:\n'+
-            #             '        app.cli(route)\n'
-            #             )
-            #     f=open("./"+self.project+"server.py","w+",encoding='utf-8')
-            #     f.write(servertext)
-            #     f.close()
-            # return True,"应用创建成功"
         else:
             if not os.path.isfile(self.project+self.appname+"/__init__.py") or not os.path.exists(self.project+self.appname+"/common"):
                 return False,self.appname+"不是kunapi应用"
@@ -1010,22 +958,6 @@ class create:
                                 f.close()
                         else:
                             return False,self.modular+"模块下载失败"
-                        if not os.path.isfile("./server.py"):
-                            if "Windows" in platform.platform():
-                                pythonname="python"
-                            else:
-                                pythonname="python3"
-                            # sys.argv[0]=re.sub('.py','',sys.argv[0])
-                            servertext=('# -*- coding: utf-8 -*-\n#gunicorn -b 0.0.0.0:39010 '+self.appname+':app\n'+
-                                    'from kunapi import web\n'+
-                                    'import '+self.appname+' as application\n'+
-                                    'app=web(__name__,application)\n'+
-                                    'if __name__ == "__main__":\n'+
-                                    '    #host监听ip port端口 name python解释器名字 (windows一般是python  linux一般是python3)\n'+
-                                    '    app.run(host="0.0.0.0",port="39001",name="'+pythonname+'")')
-                            f=open("./"+self.project+"server.py","w+",encoding='utf-8')
-                            f.write(servertext)
-                            f.close()
                         return True,"安装成功"
                     else:
                         

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

@@ -236,7 +236,7 @@ def cllfunction():
                 exit()
             config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1
             types=sys.argv[len(sys.argv)-1]
-            if True:# os.name == 'nt':
+            if os.name == 'nt':
                 from kunapi import web
                 try:
                     import app as application
@@ -263,18 +263,7 @@ def cllfunction():
                 pythonpath=pythonpath.replace(tt,'')
                 if not os.path.exists('/usr/bin/'+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1) and os.path.isfile(pythonpath+'/bin/'+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1):
                     os.system("ln -s "+pythonpath+"/bin/"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+" /usr/bin/"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1)
-                # if types=='-stop' or types=='-start':
-                #     pass
-                # else:
-                #     print("启动参数错误，支持 -start和-stop")
-                #     exit()
-                # try:
-                #     f=open("pid",'r')
-                #     pid=f.read()
-                #     f.close()
-                #     if pid:
-                #         os.system("kill "+pid)
-                # except:pass
+      
                 if __name__ == 'kunapi.kunapi':
                     kill_route_cli('pid/'+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+'_server_pid')
                     try:
@@ -308,13 +297,13 @@ def cllfunction():
                     remppath=os.path.split(os.path.realpath(__file__))[0]
                     if not os.path.exists(cmd_par['project']+'/'+cmd_par['appname']) and not os.path.exists(cmd_par['appname']):
                         shutil.copytree(remppath+'/tempfile/kunapi',cmd_par['project'])
-                        if get_sysinfo()['uname'][0]=='Linux':
+                        if os.name == 'nt':
                             try:
-                                os.remove(cmd_par['project']+"/server.bat")
+                                os.remove(cmd_par['project']+"/server.sh")
                             except:pass
-                        elif get_sysinfo()['uname'][0]=='Windows':
+                        else:
                             try:
-                                os.remove(cmd_par['project']+"/server.sh")
+                                os.remove(cmd_par['project']+"/server.bat")
                             except:pass
                         print('kunapi项目创建成功')
                         exit()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: kunapi
-Version: 1.4
+Version: 1.5
 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.4
+Keywords: kunapi1.5
 Platform: UNKNOWN

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

@@ -14,30 +14,6 @@ kunapi/common/autoload.py
 kunapi/common/globals.py
 kunapi/common/request.py
 kunapi/config/__init__.py
-kunapi/tempfile/__init__.py
-kunapi/tempfile/kunapi/server.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/common/__init__.py
-kunapi/common/autoload.py
-kunapi/common/globals.py
-kunapi/common/request.py
-kunapi/config/__init__.py
-kunapi/tempfile/__init__.py
-kunapi/tempfile/kunapi/server.py
 kunapi/tempfile/kunapi/app/__init__.py
 kunapi/tempfile/kunapi/app/common/__init__.py
 kunapi/tempfile/kunapi/app/common/autoload.py

kunapi-1.4/kunapi/tempfile/kunapi/app/__init__.py

@@ -1,3 +0,0 @@
-# -*- coding: utf-8 -*-
-# #导入模块
-from . import index

kunapi-1.4/kunapi/tempfile/kunapi/server.py

@@ -1,13 +0,0 @@
-#项目运行文件，请务修改
-import kunapi,sys,app
-app=kunapi.web(__name__,app)
-if __name__ == "__main__":
-    try:
-        route=sys.argv[1]
-        if "eventlog"==route:
-            raise Exception("")
-    except:
-        #host监听ip port端口 name python解释器名字 (windows一般是python  linux一般是python3) 
-        app.run(host="0.0.0.0",port="3000",name="python3.8")
-    else:
-        app.cli(route)