kunapi 1.8__tar.gz → 1.10__tar.gz

{kunapi-1.8 → kunapi-1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kunapi
-Version: 1.8
+Version: 1.10
 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.8
+Keywords: kunapi1.10
 
 kunapi

{kunapi-1.8 → kunapi-1.10}/kunapi/__init__.py

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

{kunapi-1.8 → kunapi-1.10}/kunapi/common/request.py

@@ -113,9 +113,12 @@ class HEADER:
     def SERVER_PROTOCOL():
         return kcwsglobals.HEADER.SERVER_PROTOCOL
     def HTTP_HOST():
-        if kcwsglobals.HEADER.HTTP_HOST:
-            return kcwsglobals.HEADER.HTTP_HOST
-        else:
+        try:
+            if kcwsglobals.HEADER.HTTP_HOST:
+                return kcwsglobals.HEADER.HTTP_HOST
+            else:
+                return ''
+        except:
             return ''
     def HTTP_COOKIE():
         return kcwsglobals.HEADER.HTTP_COOKIE

{kunapi-1.8 → kunapi-1.10}/kunapi/kunapi.py

@@ -7,16 +7,16 @@ def get_cmd_par(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=''):
     global fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1
     if fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr:
         fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1=fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr
-    python_version=platform.python_version()
+    # python_version=platform.python_version()
     # 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系统下运行")
+        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=",
+        opts, args = getopt.getopt(sys.argv[1:], "h", ["project=","app=","modular=","plug=","user=","pwd=","host=","port=","timeout=","processcount=","cmd=","path=",
         "install","uninstall","pack","upload","cli"])
         # print("opts",opts)
         # print("args",args)
@@ -42,6 +42,8 @@ def get_cmd_par(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=''):
             port=39001
         timeout='600'
         processcount='4'
+        cmd=''
+        path=''
 
         install=False
         uninstall=False
@@ -73,6 +75,15 @@ def get_cmd_par(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=''):
                 timeout=data[1]
             elif '--processcount' == data[0]:
                 processcount=data[1]
+            elif '--cmd' == data[0]:
+                cmd=data[1]
+                # print('cmd',cmd)
+            elif '--path' == data[0]:
+                # print('path',data[1])
+                if data[1]:
+                    path=data[1]
+                    print('已切换工作目录',path)
+                    os.chdir(path)
             
             elif '--help' == data[0]:
                 help=True
@@ -105,13 +116,15 @@ def get_cmd_par(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=''):
             print("\033[1;31;40m有关"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+"命令的详细信息，请键入 "+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+" help",e)
         return False
     else:
-        return {
+        seawew={
             '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,
+            'help':help,'install':install,'uninstall':uninstall,'pack':pack,'upload':upload,'cli':cli,'cmd':cmd,'path':path,
             'index':i
         }
+        # print('seawew',seawew)
+        return seawew
 def temp_get_file(folder='./',lists=[]):
     lis=os.listdir(folder)
     for files in lis:
@@ -388,6 +401,19 @@ def cllfunction():
                 else:
                     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)
+                    os.system(cmds)
+            elif '||' in cmd_par['cmd']:
+                for cmds in cmd_par['cmd'].split('||'):
+                    print('执行命令',cmds)
+                    os.system(cmds)
+            else:
+                print('执行命令',cmd_par['cmd'])
+                os.system(cmd_par['cmd'])
         elif cmd_par['cli']:#通过命令行执行控制器的方法
             try:
                 obj=importlib.import_module(cmd_par['appname']+'.common')

{kunapi-1.8 → kunapi-1.10}/kunapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kunapi
-Version: 1.8
+Version: 1.10
 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.8
+Keywords: kunapi1.10
 
 kunapi

{kunapi-1.8 → kunapi-1.10}/kunapi.egg-info/SOURCES.txt

@@ -28,24 +28,4 @@ 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.8 → kunapi-1.10}/setup.py

@@ -1,5 +1,8 @@
 
-# 打包上传 python setup.py sdist upload
+# 打包 python setup.py sdist
+# 上传 twine upload dist/*
+
+
 # 安装 python setup.py install
 import os,sys
 from setuptools import setup