kunapi 1.12__tar.gz → 1.14__tar.gz

{kunapi-1.12 → kunapi-1.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kunapi
-Version: 1.12
+Version: 1.14
 Summary: kunapi
 Home-page: https://docs.kwebapp.cn/index/index/2
 Author: 百里-坤坤
@@ -8,6 +8,6 @@ Author-email: fengkun01@qq.com
 Maintainer: 坤坤
 Maintainer-email: fengkun01@qq.com
 License: MIT License
-Keywords: kunapi1.12
+Keywords: kunapi1.14
 
 kunapi

{kunapi-1.12 → kunapi-1.14}/kunapi/__init__.py

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

{kunapi-1.12 → kunapi-1.14}/kunapi/app.py

@@ -111,7 +111,7 @@ class web:
             #     filename=cmd[0]
             # else:
             #     filename=cmd[0][:-3]
-            if self.__config.app['app_debug']:
+            if config.app['app_debug']:
                 if 'eventlog' in cmd:
                     self.__impl(host=host,port=port)
                 else:

{kunapi-1.12 → kunapi-1.14}/kunapi/common/autoload.py

@@ -55,17 +55,30 @@ def timestampToDate(times,format="%Y-%m-%d %H:%M:%S"):
 def get_pid_by_port(port):
     """获取使用指定端口使用的进程号pid"""
     pid=[]
-    strs=subprocess.check_output(f'ss -tulnp | grep '+str(port), shell=True, text=True)
-    if strs:
-        if '-bash: ss' in strs:
-            raise Exception(strs)
-        arr=strs.split('pid=')
-        if len(arr)>1:
-            del arr[0]
+    if os.name == 'posix':
+        strs=subprocess.check_output(f'ss -tulnp | grep '+str(port), shell=True, text=True)
+        if strs:
+            if '-bash: ss' in strs:
+                raise Exception(strs)
+            arr=strs.split('pid=')
+            if len(arr)>1:
+                del arr[0]
+                for k in arr:
+                    pid.append(int(k.split(',')[0]))
+            else:
+                raise Exception(strs)
+    elif os.name == 'nt':
+        pi=subprocess.Popen(f'netstat -ano | findstr :'+str(port),shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT)
+        strs=pi.stdout.read().decode()
+        # print('strs',strs)
+        if strs:
+            if '-bash: ss' in strs:
+                raise Exception(strs)
+            arr=strs.split('\r\n')
             for k in arr:
-                pid.append(int(k.split(',')[0]))
-        else:
-            raise Exception(strs)
+                numbers = re.findall(r'\d+', k)
+                if numbers:
+                    pid.append(int(numbers[-1]))
     return pid
 
 def get_file(folder='./',is_folder=True,suffix="*",lists=[],append=False):
@@ -223,7 +236,10 @@ def kill_pid(pid,retry=60):
     if pid:
         for i in range(retry):
             if 'Linux' in get_sysinfo()['platform']:
-                os.system("kill -9 "+str(pid))
+                # os.system("kill -9 "+str(pid))
+                try:
+                    os.kill(int(pid), signal.SIGTERM)
+                except:pass
             else:
                 try:
                     os.kill(int(pid), signal.SIGTERM)
@@ -262,7 +278,7 @@ def save_route_cli_pid(route):
     f.write(str(pid))
     f.close()
 def kill_all_pid():
-    """结束kcws框架的所有子进程"""
+    """结束knuapi框架的所有子进程"""
     folder=get_folder()+"/pid"
     kcws_kill_path_pid(folder)
 if not os.path.exists(get_folder()+"/pid/"):

{kunapi-1.12 → kunapi-1.14}/kunapi/config/__init__.py

@@ -2,7 +2,7 @@
 # 应用配置
 import sys
 app={}
-app['app_debug']=True  #是否开启调试模式
+app['app_debug']=False  #是否开启调试模式
 app['tpl_folder']='./tpl'  #设置模板文件目录名 注意：不能配置目录路径
 app['before_request']=''  #设置请求前执行的函数
 app['after_request']=''    #设置请求后执行的函数  

{kunapi-1.12 → kunapi-1.14}/kunapi/kunapi.py

@@ -1,5 +1,7 @@
-from .common import *
-import getopt,site,sys
+
+import getopt,site,sys,os
+if os.name == 'posix':
+    import daemon
 PATH=os.getcwd()
 sys.path.append(PATH)
 fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1=''
@@ -11,7 +13,7 @@ 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
+    if os.name == 'posix' or os.name == 'nt':pass
     else:
         print("\033[1;31;40m "+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+"不支持当前操作系统 在linux或windows系统下运行")
         exit()
@@ -20,6 +22,7 @@ def get_cmd_par(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=''):
         "install","uninstall","pack","upload","cli"])
         # print("opts",opts)
         # print("args",args)
+        # exit()
         server=False
         if 'server' in args:
             server=True
@@ -29,6 +32,14 @@ def get_cmd_par(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=''):
         help=False
         if 'help' in args:
             help=True
+
+        daemonyun=False
+        if '-d' in args:
+            daemonyun=True
+
+        stop=False
+        if '-stop' in args:
+            stop=True
        
         project=fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1  #项目名称
         appname='app'  #应用名 目前是固定值 app
@@ -104,8 +115,10 @@ def get_cmd_par(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=''):
         except:
             gcs=''
         if gcs=='-v':
+            from . import config
             if fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1=='kunapi':
-                print(config.kcws['name']+"-"+config.kcws['version']) 
+                from . import kcwsinfo
+                print(kcwsinfo['name']+"-"+kcwsinfo['version']) 
             elif fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1=='kwebs':
                 from kwebs.config import kwebs
                 print(kwebs['name']+"-"+kwebs['version'])
@@ -116,15 +129,57 @@ def get_cmd_par(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=''):
             print("\033[1;31;40m有关"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+"命令的详细信息，请键入 "+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+" help",e)
         return False
     else:
-        seawew={
+        cmd_par={
             'server':server,
             'update':update,
             'project':project,'appname':appname,'modular':modular,'username':username,'password':password,'plug':plug,'host':host,'port':port,'timeout':timeout,'processcount':processcount,
-            'help':help,'install':install,'uninstall':uninstall,'pack':pack,'upload':upload,'cli':cli,'cmd':cmd,'path':path,
+            'help':help,'install':install,'uninstall':uninstall,'pack':pack,'upload':upload,'cli':cli,'cmd':cmd,'path':path,'daemonyun':daemonyun,'stop':stop,
             'index':i
         }
-        # print('seawew',seawew)
-        return seawew
+        if cmd_par['cmd']:
+            if '&&' in cmd_par['cmd']:
+                for cmds in cmd_par['cmd'].split('&&'):
+                    print('执行命令',cmds.strip())
+                    if cmds[0:3] == 'cd ':
+                        # os.system(cmds)
+                        print('已切换工作目录',cmds[3:])
+                        os.chdir(cmds[3:].strip())
+                    else:
+                        if os.name == 'posix':
+                            if cmd_par['daemonyun']:
+                                with daemon.DaemonContext():
+                                    os.system(cmds.strip())
+                            else:
+                                os.system(cmds.strip())
+                        else:
+                            os.system(cmds.strip())
+            elif '||' in cmd_par['cmd']:
+                for cmds in cmd_par['cmd'].split('||'):
+                    print('执行命令',cmds)
+                    if cmds[0:3] == 'cd ':
+                        print('已切换工作目录',cmds[3:])
+                        os.chdir(cmds[3:])
+                    else:
+                        if os.name == 'posix':
+                            if cmd_par['daemonyun']:
+                                with daemon.DaemonContext():
+                                    os.system(cmds)
+                            else:
+                                os.system(cmds)
+                        else:
+                            os.system(cmds)
+            else:
+                print('执行命令',cmd_par['cmd'].strip())
+                if os.name == 'posix':
+                    if cmd_par['daemonyun']:
+                        with daemon.DaemonContext():
+                            os.system(cmd_par['cmd'].strip())
+                    else:
+                        os.system(cmd_par['cmd'].strip())
+                else:
+                    os.system(cmd_par['cmd'].strip())
+            
+        return cmd_par
 def temp_get_file(folder='./',lists=[]):
     lis=os.listdir(folder)
     for files in lis:
@@ -138,6 +193,7 @@ def temp_get_file(folder='./',lists=[]):
             pass
     return lists
 def cllfunction():
+    
     global fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1
     cmd_par=get_cmd_par()
     if not cmd_par:
@@ -158,6 +214,7 @@ def cllfunction():
             print("\033[32m"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+" --host 0.0.0.0 --port 39001 server     启动web服务")
             print("\033[32mhost、port并不是必须的，如果要使用默认值，您可以使用下面简短的命令来启动服务")
             print("\033[32m"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+" server\n")
+            print("\033[32m"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+" server -d 表示后台运行\n")
         if 'modular' == cs:
             print("\033[32m"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+" --modular api --plug plug --install    进行安装")
             print("\033[1;31;40m初始化一个web应用示例,通常情况下modular、plug、install同时使用")
@@ -181,8 +238,8 @@ def cllfunction():
             print("\033[32m"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+" --modular api --uninstall                  卸载app/api模块")
             print("\033[32m"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+" --modular api --plug plug1 --uninstall     卸载app/api/plug1插件\n")
     else:
-        
-        
+        import requests,shutil,importlib,traceback
+        from .common import create,kcwszip,config,kill_route_cli,save_route_cli_pid,get_pid_by_port,kill_pid
         if cmd_par['update']:#更新kunapi包:
             # print(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1)
             # exit()
@@ -243,7 +300,9 @@ def cllfunction():
                 if bs==fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1:
                     break
         elif cmd_par['server']:#启动web服务
+            
             try:
+                
                 obj=importlib.import_module(cmd_par['appname']+'.common')
                 if obj.config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr!=fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1:
                     print("该项目只能使用"+obj.config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr+"开头的命令.")
@@ -252,7 +311,6 @@ def cllfunction():
                 print('项目不合法',traceback.format_exc())
                 exit()
             config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1
-            types=sys.argv[len(sys.argv)-1]
             if os.name == 'nt':
                 from kunapi import web
                 try:
@@ -268,19 +326,25 @@ def cllfunction():
                     if __name__ == 'kunapi.kunapi':
                         tar=len(sys.argv)
                         kill_route_cli('pid/'+str(sys.argv[tar-1])+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+'_server_pid')
-                        if types=='-stop':
+                        try:
+                            allpid=get_pid_by_port(cmd_par['port'])
+                        except:pass
+                        else:
+                            for kpid in allpid:
+                                kill_pid(kpid)
+                        if cmd_par['stop']:
                             pass
                         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']))
-            elif 'Linux' in get_sysinfo()['platform']:
+            elif os.name == 'posix':
                 pythonpath=site.getsitepackages()[0].replace('\\','/')
                 t=pythonpath.split('/')
                 tt='/'+t[-3]+'/'+t[-2]+'/'+t[-1]
                 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 __name__ == 'kunapi.kunapi':
                     kill_route_cli('pid/'+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+'_server_pid')
                     try:
@@ -289,15 +353,21 @@ def cllfunction():
                     else:
                         for kpid in allpid:
                             kill_pid(kpid)
-                    if types=='-stop':
+                    if cmd_par['stop']:
                         pass
                     else:
                         save_route_cli_pid('pid/'+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+'_server_pid')
                         from gunicorn.app.wsgiapp import run
+                        import re
                         sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$','',sys.argv[0])
                         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()
+                        if cmd_par['daemonyun']:
+                            with daemon.DaemonContext():
+                                sys.exit(run())
+                                exit()
+                        else:
+                            sys.exit(run())
+                            exit()
             else:
                 raise Exception('不支持该操作系统')
         elif cmd_par['install'] or cmd_par['pack'] or cmd_par['upload'] or cmd_par['uninstall']:
@@ -402,28 +472,7 @@ def cllfunction():
                     print("\033[1;31;40m卸载时 必须指定应该app和modular，参考命令： "+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+" --app app --modular api")
                     exit()
         elif cmd_par['cmd']:
-            
-            if '&&' in cmd_par['cmd']:
-                for cmds in cmd_par['cmd'].split('&&'):
-                    print('执行命令',cmds.strip())
-                    if cmds[0:3] == 'cd ':
-                        # os.system(cmds)
-                        print('已切换工作目录',cmds[3:])
-                        os.chdir(cmds[3:].strip())
-                    else:
-                        os.system(cmds.strip())
-            # elif '||' in cmd_par['cmd']:
-            #     for cmds in cmd_par['cmd'].split('||'):
-            #         print('执行命令',cmds)
-            #         if cmds[0:3] == 'cd ':
-            #             # os.system(cmds)
-            #             print('已切换工作目录',cmds[3:])
-            #             os.chdir(cmds[3:])
-            #         else:
-            #         os.system(cmds)
-            else:
-                print('执行命令',cmd_par['cmd'].strip())
-                os.system(cmd_par['cmd'].strip())
+            pass
         elif cmd_par['cli']:#通过命令行执行控制器的方法
             try:
                 obj=importlib.import_module(cmd_par['appname']+'.common')
@@ -451,7 +500,17 @@ def cllfunction():
                 else:
                     if RAW_URI=='--cli':
                         RAW_URI=''
-                    app.cli(RAW_URI)
+                    if cmd_par['stop']:
+                        kill_route_cli(RAW_URI)
+                        exit()
+                    if os.name == 'posix':
+                        if cmd_par['daemonyun']:
+                            with daemon.DaemonContext():
+                                app.cli(RAW_URI)
+                        else:
+                            app.cli(RAW_URI)
+                    else:
+                        app.cli(RAW_URI)
         else:#通过命令行执行控制器的方法
             try:
                 obj=importlib.import_module(cmd_par['appname']+'.common')
@@ -479,7 +538,17 @@ def cllfunction():
                 else:
                     if RAW_URI=='--cli':
                         RAW_URI=''
-                    app.cli(RAW_URI)
+                    if cmd_par['stop']:
+                        kill_route_cli(RAW_URI)
+                        exit()
+                    if os.name == 'posix':
+                        if cmd_par['daemonyun']:
+                            with daemon.DaemonContext():
+                                app.cli(RAW_URI)
+                        else:
+                            app.cli(RAW_URI)
+                    else:
+                        app.cli(RAW_URI)
 def cill_start(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr='kunapi'):
     "脚本入口"
     global fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1

{kunapi-1.12 → kunapi-1.14}/kunapi/tempfile/kunapi/app/config/app.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-
 from kunapi.config import *
-app['app_debug']=True  #是否开启调试模式
+app['app_debug']=False  #是否开启调试模式
 app['tpl_folder']='./app'  #设置模板文件目录名 注意：所有的配置目录都是以您的运行文件所在目录开始
 app['before_request']='before_request'  #设置请求前要执行的函数名
 app['after_request']='after_request'    #设置请求后要执行的函数名

{kunapi-1.12 → kunapi-1.14}/kunapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kunapi
-Version: 1.12
+Version: 1.14
 Summary: kunapi
 Home-page: https://docs.kwebapp.cn/index/index/2
 Author: 百里-坤坤
@@ -8,6 +8,6 @@ Author-email: fengkun01@qq.com
 Maintainer: 坤坤
 Maintainer-email: fengkun01@qq.com
 License: MIT License
-Keywords: kunapi1.12
+Keywords: kunapi1.14
 
 kunapi

{kunapi-1.12 → kunapi-1.14}/kunapi.egg-info/requires.txt

@@ -4,3 +4,4 @@ watchdog==4.0.0
 filetype==1.2.0
 psutil==5.9.4
 requests==2.32.4
+python-daemon==3.1.2

{kunapi-1.12 → kunapi-1.14}/setup.py

@@ -34,7 +34,7 @@ def start():
         maintainer_email = kcwsinfo["maintainer_email"],
         url=kcwsinfo['url'],
         packages =  b,
-        install_requires = ['gunicorn==20.0.4','waitress==3.0.0','watchdog==4.0.0','filetype==1.2.0','psutil==5.9.4','requests==2.32.4'], #第三方包
+        install_requires = ['gunicorn==20.0.4','waitress==3.0.0','watchdog==4.0.0','filetype==1.2.0','psutil==5.9.4','requests==2.32.4','python-daemon==3.1.2'], #第三方包
         package_data = {
             '': ['*.html', '*.js','*.css','*.jpg','*.png','*.gif'],
         },