kunapi 1.15__tar.gz → 1.16__tar.gz

kunapi-1.16/PKG-INFO

@@ -0,0 +1,30 @@
+Metadata-Version: 2.4
+Name: kunapi
+Version: 1.16
+Summary: kunapi
+Home-page: https://docs.kwebapp.cn/index/index/2
+Author: 百里-坤坤
+Author-email: fengkun01@qq.com
+Maintainer: 坤坤
+Maintainer-email: fengkun01@qq.com
+License: MIT License
+Keywords: kunapi1.16
+Requires-Dist: gunicorn==20.0.4
+Requires-Dist: waitress==3.0.0
+Requires-Dist: watchdog==4.0.0
+Requires-Dist: filetype==1.2.0
+Requires-Dist: psutil==5.9.4
+Requires-Dist: requests==2.32.4
+Requires-Dist: python-daemon==3.1.2
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: requires-dist
+Dynamic: summary
+
+kunapi

{kunapi-1.15 → kunapi-1.16}/kunapi/__init__.py

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

{kunapi-1.15 → kunapi-1.16}/kunapi/common/autoload.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-import time,hashlib,json,re,os,platform,shutil,requests,importlib,traceback,tarfile,zipfile,signal,psutil,random
+import time,json,re,os,platform,shutil,requests,importlib,traceback,tarfile,psutil,random
 from kunapi import config
 from . import globals
 import subprocess
@@ -139,6 +139,7 @@ def md5(strs):
 
     return String类型
     """
+    import hashlib
     m = hashlib.md5()
     b = strs.encode(encoding='utf-8')
     m.update(b)
@@ -191,7 +192,8 @@ def get_pid_info(pid,types='pid'):
     types info表示获取进程信息 否则判断进程号是否存在
     """
     if pid:
-        pid=int(pid)
+        try:pid=int(pid)
+        except:return False
         try:
             if types=='info':
                 p = psutil.Process(pid)
@@ -234,6 +236,7 @@ def kill_pid(pid,retry=60):
     pid 进程号
     """
     if pid:
+        import signal
         for i in range(retry):
             if 'Linux' in get_sysinfo()['platform']:
                 # os.system("kill -9 "+str(pid))
@@ -323,6 +326,7 @@ class kcwszip:
         return filename
     def packzip(src,dst):
         "压缩"
+        import zipfile
         filelist = []
         if os.path.isfile(src):
             filelist.append(src)
@@ -336,6 +340,7 @@ class kcwszip:
         zf.close()
     def unzip_file(dst, src,all=True):
         "解压"
+        import zipfile
         if all:
             zf = zipfile.ZipFile(dst)
             zf.extractall(src)
@@ -347,6 +352,7 @@ class kcwszip:
             zip_ref.close()
     def unzip(filename):
         "解压到文件所在目录"
+        import zipfile
         diswjj=''
         tarr=filename.split('.')
         i=0
@@ -649,7 +655,7 @@ class create:
         
         plug 插件名
         """
-        import pip
+        import pip,zipfile
         plug=str(plug)
         if os.path.exists(self.project+self.appname+"/"+self.modular+"/controller/"+plug) and not mandatory:
             return False,"该插件已存在"
@@ -718,6 +724,8 @@ class create:
                     if len(install_requires):
                         try:
                             install_requires.insert(0,"install")
+                            install_requires.append('-i')
+                            install_requires.append('https://mirrors.aliyun.com/pypi/simple/')
                             if 0 != pip.main(install_requires):
                                 shutil.rmtree(self.project+self.appname+"/"+self.modular+"/controller/"+plug)
                                 return False,"依赖包安装错误"
@@ -914,6 +922,8 @@ class create:
                                 if len(install_requires):
                                     try:
                                         install_requires.insert(0,"install")
+                                        install_requires.append('-i')
+                                        install_requires.append('https://mirrors.aliyun.com/pypi/simple/')
                                         if 0 != pip.main(install_requires):
                                             shutil.rmtree(self.project+self.appname+"/"+self.modular)
                                             return False,"模块依赖包安装错误"

{kunapi-1.15 → kunapi-1.16}/kunapi/kunapi.py

@@ -129,8 +129,6 @@ def get_cmd_par(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=''):
             print("\033[1;31;40m有关"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+"命令的详细信息，请键入 "+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+" help",e)
         return False
     else:
-        if not path:
-            path=os.getcwd()
         cmd_par={
             'server':server,
             'update':update,
@@ -140,43 +138,45 @@ def get_cmd_par(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=''):
         }
         if cmd_par['cmd']:
             if '&&' in cmd_par['cmd']:
-                if os.name == 'posix' and cmd_par['daemonyun']:
-                    with daemon.DaemonContext():
-                        os.chdir(cmd_par['path'])
-                        for cmds in cmd_par['cmd'].split('&&'):
-                            print('执行命令',cmds.strip())
-                            if cmds[0:3] == 'cd ':
-                                print('已切换工作目录',cmds[3:])
-                                os.chdir(cmds[3:].strip())
+                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:
-                    if os.name == 'posix' and cmd_par['daemonyun']:
-                        with daemon.DaemonContext():
-                            os.chdir(cmd_par['path'])
-                            for cmds in cmd_par['cmd'].split('&&'):
-                                print('执行命令',cmds.strip())
-                                if cmds[0:3] == 'cd ':
-                                    print('已切换工作目录',cmds[3:])
-                                    os.chdir(cmds[3:].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:
-                        for cmds in cmd_par['cmd'].split('&&'):
-                            print('执行命令',cmds.strip())
-                            if cmds[0:3] == 'cd ':
-                                print('已切换工作目录',cmds[3:])
-                                os.chdir(cmds[3:].strip())
+                        if os.name == 'posix':
+                            if cmd_par['daemonyun']:
+                                with daemon.DaemonContext():
+                                    os.system(cmds)
                             else:
-                                os.system(cmds.strip())
+                                os.system(cmds)
+                        else:
+                            os.system(cmds)
             else:
-                if os.name == 'posix' and cmd_par['daemonyun']:
-                    with daemon.DaemonContext():
-                        os.chdir(cmd_par['path'])
-                        print('执行命令',cmd_par['cmd'].strip())
+                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:
-                    print('执行命令',cmd_par['cmd'].strip())
                     os.system(cmd_par['cmd'].strip())
             
         return cmd_par
@@ -358,12 +358,10 @@ def cllfunction():
                     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']]
                         if cmd_par['daemonyun']:
                             with daemon.DaemonContext():
-                                os.chdir(cmd_par['path'])
                                 sys.exit(run())
                                 exit()
                         else:
@@ -475,6 +473,7 @@ def cllfunction():
         elif cmd_par['cmd']:
             pass
         elif cmd_par['cli']:#通过命令行执行控制器的方法
+            config.app['cli']=True
             try:
                 obj=importlib.import_module(cmd_par['appname']+'.common')
                 if obj.config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr!=fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1:
@@ -507,13 +506,13 @@ def cllfunction():
                     if os.name == 'posix':
                         if cmd_par['daemonyun']:
                             with daemon.DaemonContext():
-                                os.chdir(cmd_par['path'])
                                 app.cli(RAW_URI)
                         else:
                             app.cli(RAW_URI)
                     else:
                         app.cli(RAW_URI)
         else:#通过命令行执行控制器的方法
+            config.app['cli']=True
             try:
                 obj=importlib.import_module(cmd_par['appname']+'.common')
                 if obj.config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr!=fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1:
@@ -546,7 +545,6 @@ def cllfunction():
                     if os.name == 'posix':
                         if cmd_par['daemonyun']:
                             with daemon.DaemonContext():
-                                os.chdir(cmd_par['path'])
                                 app.cli(RAW_URI)
                         else:
                             app.cli(RAW_URI)

kunapi-1.16/kunapi.egg-info/PKG-INFO

@@ -0,0 +1,30 @@
+Metadata-Version: 2.4
+Name: kunapi
+Version: 1.16
+Summary: kunapi
+Home-page: https://docs.kwebapp.cn/index/index/2
+Author: 百里-坤坤
+Author-email: fengkun01@qq.com
+Maintainer: 坤坤
+Maintainer-email: fengkun01@qq.com
+License: MIT License
+Keywords: kunapi1.16
+Requires-Dist: gunicorn==20.0.4
+Requires-Dist: waitress==3.0.0
+Requires-Dist: watchdog==4.0.0
+Requires-Dist: filetype==1.2.0
+Requires-Dist: psutil==5.9.4
+Requires-Dist: requests==2.32.4
+Requires-Dist: python-daemon==3.1.2
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: requires-dist
+Dynamic: summary
+
+kunapi

kunapi-1.15/PKG-INFO

@@ -1,13 +0,0 @@
-Metadata-Version: 2.1
-Name: kunapi
-Version: 1.15
-Summary: kunapi
-Home-page: https://docs.kwebapp.cn/index/index/2
-Author: 百里-坤坤
-Author-email: fengkun01@qq.com
-Maintainer: 坤坤
-Maintainer-email: fengkun01@qq.com
-License: MIT License
-Keywords: kunapi1.15
-
-kunapi

kunapi-1.15/kunapi.egg-info/PKG-INFO

@@ -1,13 +0,0 @@
-Metadata-Version: 2.1
-Name: kunapi
-Version: 1.15
-Summary: kunapi
-Home-page: https://docs.kwebapp.cn/index/index/2
-Author: 百里-坤坤
-Author-email: fengkun01@qq.com
-Maintainer: 坤坤
-Maintainer-email: fengkun01@qq.com
-License: MIT License
-Keywords: kunapi1.15
-
-kunapi