kcws 3.50__tar.gz → 3.52__tar.gz

{kcws-3.50 → kcws-3.52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: kcws
-Version: 3.50
+Version: 3.52
 Summary: kcwebs作为web开发而设计的高性能框架
 Home-page: https://docs.kwebapp.cn/index/index/2
 Author: 百里-坤坤
@@ -9,5 +9,5 @@ Maintainer: 坤坤
 Maintainer-email: fk1402936534@qq.com
 License: MIT License
 Description: kcwebs作为web开发而设计的高性能框架，采用全新的架构思想，注重易用性。遵循MIT开源许可协议发布，意味着个人和企业可以免费使用kcwebs，甚至允许把你基于kcwebs开发的应用开源或商业产品发布或销售。完整文档请访问：https://docs.kwebapp.cn/index/index/2
-Keywords: kcws3.50
+Keywords: kcws3.52
 Platform: UNKNOWN

{kcws-3.50 → kcws-3.52}/kcws/__init__.py

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

kcws-3.52/kcws/common/__init__.py

@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+from . autoload import *
+from . import globals
+from . import request
+G=globals.G

{kcws-3.50 → kcws-3.52}/kcws/common/autoload.py

@@ -1,8 +1,57 @@
 # -*- coding: utf-8 -*-
-import time,hashlib,json,re,os,platform,shutil,requests,importlib,traceback,tarfile,zipfile,signal,psutil
+import time,hashlib,json,re,os,platform,shutil,requests,importlib,traceback,tarfile,zipfile,signal,psutil,random
 from kcws import config
 from . import globals
 import subprocess
+def is_index(params,index):
+    """判断列表或字典里的索引是否存在
+
+    params  列表或字典
+
+    index   索引值
+
+    return Boolean类型
+    """
+    try:
+        params[index]
+    except KeyError:
+        return False
+    except IndexError:
+        return False
+    else:
+        return True
+def randoms(lens=6,types=1):
+    """生成随机字符串
+    
+    lens 长度
+
+    types 1数字 2字母 3字母加数字
+    """
+    strs="0123456789qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM,!@#$%^&*()_+=-;',./:<>?"
+    if types==1:
+        strs="0123456789"
+    elif types==2:
+        strs="qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM"
+    elif types==3:
+        strs="0123456789qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM"
+    k=''
+    i=0
+    while i < lens:
+        k+=random.choice(strs)
+        i+=1
+    return k
+
+def timestampToDate(times,format="%Y-%m-%d %H:%M:%S"):
+    """时间戳转换时间
+
+    times 10位时间戳
+
+    format 日期格式 如%Y-%m-%d %H:%M:%S
+    """
+    timeArray = time.localtime(int(times))
+    return time.strftime(format.encode('unicode-escape').decode(),timeArray).encode().decode('unicode-escape')
+
+
 def get_pid_by_port(port):
     """获取使用指定端口使用的进程号pid"""
     pid=[]
@@ -18,164 +67,6 @@ def get_pid_by_port(port):
         else:
             raise Exception(strs)
     return pid
-class kcwszip:
-    def __clean_filename(filename):
-        # 移除或替换非法字符
-        filename =re.sub(r'[<>:"/\\|?*]', '', filename)
-        filename=filename.replace('\t','')
-        # print('filenamefilenamefilenamefilename',filename)
-        return filename
-    def packzip(src,dst):
-        "压缩"
-        filelist = []
-        if os.path.isfile(src):
-            filelist.append(src)
-        for root, dirs, files in os.walk(src):
-            for name in files:
-                filelist.append(os.path.join(root, name))
-        zf = zipfile.ZipFile(dst, "w", zipfile.zlib.DEFLATED)
-        for tar in filelist:
-            arcname = tar[len(src):]
-            zf.write(tar,arcname)
-        zf.close()
-    def unzip_file(dst, src,all=True):
-        "解压"
-        if all:
-            zf = zipfile.ZipFile(dst)
-            zf.extractall(src)
-            zf.close()
-        else:
-            zip_ref=zipfile.ZipFile(dst)
-            for item in zip_ref.infolist():
-                zip_ref.extract(item, src)
-            zip_ref.close()
-    def unzip(filename):
-        "解压到文件所在目录"
-        diswjj=''
-        tarr=filename.split('.')
-        i=0
-        while i<len(tarr)-1:
-            if i<=len(tarr)-3:
-                diswjj+=tarr[i]+'.'
-            else:
-                diswjj+=tarr[i]
-            i+=1
-        # if not os.path.exists(diswjj):
-        #     os.makedirs(diswjj,exist_ok=True)
-        try:
-            zip_ref=zipfile.ZipFile(filename, 'r')
-            for item in zip_ref.infolist():
-                try:
-                    item.filename = item.filename.encode('cp437').decode('gbk')
-                except:pass
-                try:
-                    item.filename = item.filename.replace('\t','').replace('\n','').replace('\b','')
-                except:pass
-                # print("item.filename",item.filename)
-                try:
-                    zip_ref.extract(item, diswjj)
-                except Exception as e:
-                    stre=str(e)
-                    if 'Bad CRC-32 for fil' in stre:#文件损坏
-                        print('压缩文件文件损坏',stre)
-                        pass
-                    elif '[Errno 2] No such file or directory: ' in stre:
-                        print('不是有效文件',stre)
-                        pass
-                    elif '[WinError 3] 系统找不到指定的路径' in stre:
-                        print('系统找不到指定的路径',stre)
-                        pass
-                    elif '文件名或扩展名太长' in stre:
-                        if os.path.exists(diswjj):
-                            try:
-                                shutil.rmtree(diswjj)
-                            except:pass
-                        try:
-                            zip_ref.close()
-                        except:pass
-                        if os.name == 'nt':
-                            if not os.path.exists("c:/temp"):
-                                os.makedirs("c:/temp", exist_ok=True)
-                            newspath="c:/temp/"+md5(filename)
-                            print('文件名或扩展名太长,正在复制到 '+newspath+' 重试')
-                            tempname=newspath+'.zip'
-                            if not os.path.exists(newspath):
-                                os.makedirs(newspath, exist_ok=True)
-                            shutil.copy(filename, tempname)
-                            return kcwszip.unzip(tempname)
-                        else:
-                            print('stre',stre,filename)
-                            raise Exception(e)
-                    else:
-                        if os.path.exists(diswjj):
-                            try:
-                                shutil.rmtree(diswjj)
-                            except:pass
-                        try:
-                            zip_ref.close()
-                        except:pass
-                        print('stre',stre,filename)
-                        raise Exception(e)
-            zip_ref.close()
-        except Exception as e:
-            stre=str(e)
-            print('zip解压异常',stre)
-            raise Exception(e)
-            # if 'File is not a zip file' in stre or 'Bad CRC-32 for fil' in stre:
-            #     if os.path.exists(diswjj):
-            #         try:
-            #             shutil.rmtree(diswjj)
-            #         except:pass
-            #     return False
-            # else:
-            #     if os.path.exists(diswjj):
-            #         shutil.rmtree(diswjj)
-            #     raise Exception(e)
-        #处理中文乱码
-        arr=get_file(diswjj,is_folder=False)
-        for kkk in arr:
-            new_name=kkk['path'].split('/')
-            try:
-                new_name=kkk['path'].replace(new_name[len(new_name)-1],kkk['name'].encode('cp437').decode("gbk"))
-            except:
-                # print(kkk['name'],'编码无需要解码')
-                pass
-            else:
-                try:
-                    os.rename(kkk['path'], new_name)
-                except Exception as e:
-                    stre=str(e)
-                    if '当文件已存在时，无法创建该文件' in stre:
-                        pass
-                    else:
-                        if os.path.exists(diswjj):
-                            shutil.rmtree(diswjj)
-                        raise Exception(e)
-        return diswjj
-class kcwstar:
-    def targz(src,dst):
-        """
-        打包目录为tar.gz
-        :param src: 需要打包的目录
-        :param dst: 压缩文件名
-        :return: bool
-        """
-        with tarfile.open(dst, "w:gz") as tar:
-            tar.add(src, arcname=os.path.basename(src))
-        return True
-    def untar(dst, src):
-        """
-        解压tar.gz文件
-        :param dst: 压缩文件名
-        :param src: 解压后的存放路径
-        :return: bool
-        """
-        try:
-            t = tarfile.open(dst)
-            t.extractall(path = src)
-            return True
-        except Exception as e:
-            return False
 
 def get_file(folder='./',is_folder=True,suffix="*",lists=[],append=False):
     """获取文件夹下所有文件夹和文件
@@ -239,10 +130,12 @@ def md5(strs):
     b = strs.encode(encoding='utf-8')
     m.update(b)
     return m.hexdigest()
-def kcws_kill_path_pid(folder):
+def kcws_kill_path_pid(folder,retry=60):
     """结束指定目录pid
     
     folder 目录
+
+    retry 重试次数
     """
     if os.path.exists(folder):
         lis=os.listdir(folder)
@@ -251,7 +144,7 @@ def kcws_kill_path_pid(folder):
                 f=open(folder+"/"+files,'r')
                 pid=f.read()
                 f.close()
-                kill_pid(pid)
+                kill_pid(pid,retry=retry)
                 os.remove(folder+"/"+files)
 
 def kcws_save_folder_pid(folder,pid):
@@ -322,13 +215,13 @@ def get_kcws_cli_info(route,types='pid'):
     pid=get_kcws_cli_pid(route)
     return get_pid_info(pid=pid,types=types)
 
-def kill_pid(pid):
+def kill_pid(pid,retry=60):
     """通过进程结束进程
     
     pid 进程号
     """
     if pid:
-        for i in range(60):
+        for i in range(retry):
             if 'Linux' in get_sysinfo()['platform']:
                 os.system("kill -9 "+str(pid))
             else:
@@ -342,14 +235,16 @@ def kill_pid(pid):
             # if i>60:
             #     raise Exception('kill_pid error：pid='+str(pid))
     return True
-def kill_route_cli(route):
+def kill_route_cli(route,retry=60):
     """通过路由结束进程
     
     route 路由地址
+
+    retry 重试次数
     """
     pid=get_kcws_cli_pid(route)
     if pid:
-        if kill_pid(pid):
+        if kill_pid(pid,retry=retry):
             try:
                 os.remove(get_folder()+"/pid/"+md5(route)+"_cli_pid")
             except:pass
@@ -402,6 +297,242 @@ def get_sysinfo():
             # platform.python_version()
             # platform.python_version_tuple()
     return sysinfo
+
+class kcwszip:
+    def __clean_filename(filename):
+        # 移除或替换非法字符
+        filename =re.sub(r'[<>:"/\\|?*]', '', filename)
+        filename=filename.replace('\t','')
+        # print('filenamefilenamefilenamefilename',filename)
+        return filename
+    def packzip(src,dst):
+        "压缩"
+        filelist = []
+        if os.path.isfile(src):
+            filelist.append(src)
+        for root, dirs, files in os.walk(src):
+            for name in files:
+                filelist.append(os.path.join(root, name))
+        zf = zipfile.ZipFile(dst, "w", zipfile.zlib.DEFLATED)
+        for tar in filelist:
+            arcname = tar[len(src):]
+            zf.write(tar,arcname)
+        zf.close()
+    def unzip_file(dst, src,all=True):
+        "解压"
+        if all:
+            zf = zipfile.ZipFile(dst)
+            zf.extractall(src)
+            zf.close()
+        else:
+            zip_ref=zipfile.ZipFile(dst)
+            for item in zip_ref.infolist():
+                zip_ref.extract(item, src)
+            zip_ref.close()
+    def unzip(filename):
+        "解压到文件所在目录"
+        diswjj=''
+        tarr=filename.split('.')
+        i=0
+        while i<len(tarr)-1:
+            if i<=len(tarr)-3:
+                diswjj+=tarr[i]+'.'
+            else:
+                diswjj+=tarr[i]
+            i+=1
+        # if not os.path.exists(diswjj):
+        #     os.makedirs(diswjj,exist_ok=True)
+        try:
+            zip_ref=zipfile.ZipFile(filename, 'r')
+            for item in zip_ref.infolist():
+                try:
+                    item.filename = item.filename.encode('cp437').decode('gbk')
+                except:pass
+                try:
+                    item.filename = item.filename.replace('\t','').replace('\n','').replace('\b','')
+                except:pass
+                # print("item.filename",item.filename)
+                try:
+                    zip_ref.extract(item, diswjj)
+                except Exception as e:
+                    stre=str(e)
+                    if 'Bad CRC-32 for fil' in stre:#文件损坏
+                        print('压缩文件文件损坏',stre)
+                        pass
+                    elif '[Errno 2] No such file or directory: ' in stre:
+                        print('不是有效文件',stre)
+                        pass
+                    elif '[WinError 3] 系统找不到指定的路径' in stre:
+                        print('系统找不到指定的路径',stre)
+                        pass
+                    elif '文件名或扩展名太长' in stre:
+                        if os.path.exists(diswjj):
+                            try:
+                                shutil.rmtree(diswjj)
+                            except:pass
+                        try:
+                            zip_ref.close()
+                        except:pass
+                        if os.name == 'nt':
+                            if not os.path.exists("c:/temp"):
+                                os.makedirs("c:/temp", exist_ok=True)
+                            newspath="c:/temp/"+md5(filename)
+                            print('文件名或扩展名太长,正在复制到 '+newspath+' 重试')
+                            tempname=newspath+'.zip'
+                            if not os.path.exists(newspath):
+                                os.makedirs(newspath, exist_ok=True)
+                            shutil.copy(filename, tempname)
+                            return kcwszip.unzip(tempname)
+                        else:
+                            print('stre',stre,filename)
+                            raise Exception(e)
+                    else:
+                        if os.path.exists(diswjj):
+                            try:
+                                shutil.rmtree(diswjj)
+                            except:pass
+                        try:
+                            zip_ref.close()
+                        except:pass
+                        print('stre',stre,filename)
+                        raise Exception(e)
+            zip_ref.close()
+        except Exception as e:
+            stre=str(e)
+            print('zip解压异常',stre)
+            raise Exception(e)
+            # if 'File is not a zip file' in stre or 'Bad CRC-32 for fil' in stre:
+            #     if os.path.exists(diswjj):
+            #         try:
+            #             shutil.rmtree(diswjj)
+            #         except:pass
+            #     return False
+            # else:
+            #     if os.path.exists(diswjj):
+            #         shutil.rmtree(diswjj)
+            #     raise Exception(e)
+        #处理中文乱码
+        arr=get_file(diswjj,is_folder=False)
+        for kkk in arr:
+            new_name=kkk['path'].split('/')
+            try:
+                new_name=kkk['path'].replace(new_name[len(new_name)-1],kkk['name'].encode('cp437').decode("gbk"))
+            except:
+                # print(kkk['name'],'编码无需要解码')
+                pass
+            else:
+                try:
+                    os.rename(kkk['path'], new_name)
+                except Exception as e:
+                    stre=str(e)
+                    if '当文件已存在时，无法创建该文件' in stre:
+                        pass
+                    else:
+                        if os.path.exists(diswjj):
+                            shutil.rmtree(diswjj)
+                        raise Exception(e)
+        return diswjj
+class kcwstar:
+    def targz(src,dst):
+        """
+        打包目录为tar.gz
+        :param src: 需要打包的目录
+        :param dst: 压缩文件名
+        :return: bool
+        """
+        with tarfile.open(dst, "w:gz") as tar:
+            tar.add(src, arcname=os.path.basename(src))
+        return True
+    def untar(dst, src):
+        """
+        解压tar.gz文件
+        :param dst: 压缩文件名
+        :param src: 解压后的存放路径
+        :return: bool
+        """
+        try:
+            t = tarfile.open(dst)
+            t.extractall(path = src)
+            return True
+        except Exception as e:
+            return False
+
+class kcwsign:
+    verifres={}
+    def verifsign(params,validity=30):
+        """验证签名
+        
+        params 验证的参数
+
+        validity 时间戳超过多少秒失败
+        """
+        kcwsign.verifres={}
+        if not is_index(params,'time') or not is_index(params,'rands') or not is_index(params,'sign'):
+            kcwsign.verifres['code']=-16
+            kcwsign.verifres['msg']='缺少验证参数'
+            return False
+        if not params['time'] or not params['rands'] or not params['sign']:
+            kcwsign.verifres['code']=-16
+            kcwsign.verifres['msg']='验证参数不存在'
+            return False
+        sign=params['sign']
+        del params['sign']
+        sjc=int(time.time())-int(params['time'])
+        if(sjc>validity or sjc<-validity):
+            kcwsign.verifres['code']=-14
+            kcwsign.verifres['msg']='时间错误，请调整设备时间，您的设备时间是：'+timestampToDate(params['time'])
+            return False
+        mysign=kcwsign.getsign(params)
+        if mysign==sign:
+            kcwsign.verifres['code']=1
+            kcwsign.verifres['msg']='验证成功'
+            return True
+        else:
+            if is_index(params,'appkey'):
+                params['appkey']='开发者提供的appkey'
+            if is_index(params,'paympassword'):
+                params['paympassword']='支付密码'
+            if is_index(params,'paypwd'):
+                params['paypwd']='支付密码'
+            if is_index(params,'password'):
+                params['password']='密码'
+            content=kcwsign.getSignContent(params)
+            kcwsign.verifres['code']=-15
+            kcwsign.verifres['msg']='签名错误，签名内容可参考:md5('+content+')'
+            return False
+    def getsign(params):
+        """获取签名"""
+        if is_index(params,'sign'):
+            del params['sign']
+        content=kcwsign.getSignContent(params)
+        return md5(content)
+    def exsignpra(params):
+        "生成签名参数"
+        params['time']=times()
+        params['rands']=randoms()
+        params['sign']=kcwsign.getsign(params)
+        return params
+    def getSignContent(params):
+        "字典排序"
+        param={}
+        for i in sorted (params):
+            param[i]=params[i]
+        i=0
+        strs=""
+        for k in param:
+            if k:
+                if isinstance(k,dict):
+                    k=json_encode(k)
+                    k=k.replace('"', '')
+                    k=k.replace("'", '')
+                if param[k]:
+                    if i==0:
+                        strs+=str(k)+"="+str(param[k])
+                    else:
+                        strs+="&"+str(k)+"="+str(param[k])
+            i+=1
+        return strs
+
 class create:
     project=''
     appname=None

{kcws-3.50 → kcws-3.52}/kcws.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: kcws
-Version: 3.50
+Version: 3.52
 Summary: kcwebs作为web开发而设计的高性能框架
 Home-page: https://docs.kwebapp.cn/index/index/2
 Author: 百里-坤坤
@@ -9,5 +9,5 @@ Maintainer: 坤坤
 Maintainer-email: fk1402936534@qq.com
 License: MIT License
 Description: kcwebs作为web开发而设计的高性能框架，采用全新的架构思想，注重易用性。遵循MIT开源许可协议发布，意味着个人和企业可以免费使用kcwebs，甚至允许把你基于kcwebs开发的应用开源或商业产品发布或销售。完整文档请访问：https://docs.kwebapp.cn/index/index/2
-Keywords: kcws3.50
+Keywords: kcws3.52
 Platform: UNKNOWN

kcws-3.50/kcws/common/__init__.py

@@ -1,5 +0,0 @@
-# -*- coding: utf-8 -*-
-from . autoload import *
-from . import globals
-from . import request
-G=globals.G #5.328之后的版本将G作为框架用户全局变量 与之前的“globals.G”功能相同