kcws 1.1__tar.gz → 1.3__tar.gz

{kcws-1.1 → kcws-1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: kcws
-Version: 1.1
+Version: 1.3
 Summary: 超轻量级http框架
 Home-page: https://docs.kwebapp.cn/index/index/1
 Author: 百里-坤坤
@@ -9,5 +9,5 @@ Maintainer: 坤坤
 Maintainer-email: fk1402936534@qq.com
 License: MIT License
 Description: kcws是一个由kcwebs抽象出来的超轻量级http框架
-Keywords: kcws1.1
+Keywords: kcws1.3
 Platform: UNKNOWN

{kcws-1.1 → kcws-1.3}/kcws/Events.py

@@ -36,7 +36,7 @@ class Events:
     def kill_process(self):
         "关闭"
         if self.process:
-            if 'kcws'==self.command[0] or 'kcwebs'==self.command[0] or 'kcwebps2'==self.command[0]:
+            if 'kcws'==self.command[0] or 'kcwebs'==self.command[0] or 'kcwebps'==self.command[0]:
                 try:
                     process = psutil.Process(self.process.pid)
                 except:pass

{kcws-1.1 → kcws-1.3}/kcws/app.py

@@ -11,7 +11,7 @@ class web:
     def __new__(self,name,appname=None):
         self.__name=name
         self.__appname=appname
-        if self.__name == '__main__' or self.__name=='kcws.kcws' or self.__name=='kcwebs.kcwebs' or self.__name=='kcwebps2.kcwebps2':
+        if self.__name == '__main__' or self.__name=='kcws.kcws' or self.__name=='kcwebs.kcwebs' or self.__name=='kcwebps.kcwebps':
             # print("web__new__",self.__name)
             return super().__new__(self)
         else:
@@ -101,8 +101,8 @@ class web:
         config.app['cli']=False
         if 'eventlog' in cmd or len(cmd)==1 or (len(cmd)>=2 and cmd[len(cmd)-1]=='server'):
             # config.app['cli']=False
-            if 'kcwebps2' in cmd[0]: #基于新版本4.13.32之后 kcwebps2 server运行
-                cmd[0]='kcwebps2'
+            if 'kcwebps' in cmd[0]: #基于新版本4.13.32之后 kcwebps server运行
+                cmd[0]='kcwebps'
                 filename=cmd[0]
             elif 'kcwebs' in cmd[0]: #基于新版本4.13.32之后 kcwebs server运行
                 cmd[0]='kcwebs'
@@ -662,7 +662,7 @@ class web:
         web.__del_globals()
 
         
-        if self.__config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=='kcwebs' or self.__config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=='kcwebps2':#请求后执行的函数
+        if self.__config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=='kcwebs' or self.__config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=='kcwebps':#请求后执行的函数
             try:
                 getattr(obj,"rfdsgeagesegdsfdsfdrrsebskcwebsafterrequest")() #关闭数据库相关连接
             except:pass

{kcws-1.1 → kcws-1.3}/kcws/common/autoload.py

@@ -635,15 +635,15 @@ class create:
     def installmodular(self,token='',cli=False):
         "创建模块，如果应用不存，则创建默认应用，如果在您的应用目录下没有模块包，则创建默认模块文件"
         if not os.path.exists(self.project+self.appname):
-            if config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=='kcwebps2':
-                r=requests.get(config.domain['kcwebsfile']+"/kcwebs/kcwebps2.zip")
-                f = open("./"+self.project+"kcwebps2.zip", "wb")
+            if config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=='kcwebps':
+                r=requests.get(config.domain['kcwebsfile']+"/kcwebs/kcwebps.zip")
+                f = open("./"+self.project+"kcwebps.zip", "wb")
                 for chunk in r.iter_content(chunk_size=512):
                     if chunk:
                         f.write(chunk)
                 f.close()
-                kcwszip.unzip_file("./"+self.project+"kcwebps2.zip","./"+self.project+self.appname)
-                os.remove("./"+self.project+"kcwebps2.zip")
+                kcwszip.unzip_file("./"+self.project+"kcwebps.zip","./"+self.project+self.appname)
+                os.remove("./"+self.project+"kcwebps.zip")
             elif config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=='kcwebs':
                 r=requests.get(config.domain['kcwebsfile']+"/kcwebs/kcwebs.zip")
                 f = open("./"+self.project+"kcwebs.zip", "wb")

{kcws-1.1 → kcws-1.3}/kcws/config/__init__.py

@@ -27,7 +27,7 @@ route['children']=[]
 
 kcws={}
 kcws['name']='kcws'                             #项目的名称
-kcws['version']='1.1'							#项目版本
+kcws['version']='1.3'							#项目版本
 kcws['description']='超轻量级http框架'       #项目的简单描述
 kcws['long_description']='kcws是一个由kcwebs抽象出来的超轻量级http框架'     #项目详细描述
 kcws['license']='MIT License'                    #开源协议   mit开源

{kcws-1.1 → kcws-1.3}/kcws/kcws.py

@@ -34,7 +34,7 @@ def get_cmd_par(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=''):
         password=''
         host='0.0.0.0'
         port=30000
-        if fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1=='kcwebps2':
+        if fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1=='kcwebps':
             port=39001
         timeout='600'
         processcount='4'
@@ -94,9 +94,9 @@ def get_cmd_par(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=''):
             elif fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1=='kcwebs':
                 from kcwebs.config import kcwebs
                 print(kcwebs['name']+"-"+kcwebs['version'])
-            elif fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1=='kcwebps2':
-                from kcwebps2.config import kcwebps2
-                print(kcwebps2['name']+"-"+kcwebps2['version']) 
+            elif fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1=='kcwebps':
+                from kcwebps.config import kcwebps
+                print(kcwebps['name']+"-"+kcwebps['version']) 
         else:
             print("\033[1;31;40m有关"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+"命令的详细信息，请键入 "+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+" help",e)
         return False
@@ -195,7 +195,7 @@ def cllfunction():
         elif cmd_par['update']:#更新kcws包:
             # print(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1)
             # exit()
-            serall=['kcws','kcwebs','kcwebps2']
+            serall=['kcws','kcwebs','kcwebps']
             if fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1 not in serall:
                 print('不支持该命令')
                 exit()
@@ -204,8 +204,8 @@ def cllfunction():
                     response=requests.get("https://gitee.com/open_source_official_website/kcws/raw/master/kcws.zip")
                 elif 'kcwebs'==bs:
                     response=requests.get("https://gitee.com/open_source_official_website/kcwebs/raw/develop/kcwebs.zip")
-                elif 'kcwebps2'==bs:
-                    response=requests.get("https://gitee.com/open_source_official_website/kcwebps2/raw/develop/kcwebps2.zip")
+                elif 'kcwebps'==bs:
+                    response=requests.get("https://gitee.com/open_source_official_website/kcwebps/raw/develop/kcwebps.zip")
                 f=open(bs+'.zip',"wb")
                 f.write(response.content)
                 f.close()

{kcws-1.1 → kcws-1.3}/kcws.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: kcws
-Version: 1.1
+Version: 1.3
 Summary: 超轻量级http框架
 Home-page: https://docs.kwebapp.cn/index/index/1
 Author: 百里-坤坤
@@ -9,5 +9,5 @@ Maintainer: 坤坤
 Maintainer-email: fk1402936534@qq.com
 License: MIT License
 Description: kcws是一个由kcwebs抽象出来的超轻量级http框架
-Keywords: kcws1.1
+Keywords: kcws1.3
 Platform: UNKNOWN

{kcws-1.1 → kcws-1.3}/setup.py

@@ -59,7 +59,7 @@ def start():
         url=confkcws['url'],
         packages =  b,
         # data_files=[('Scripts', ['kcws/bin/kcws.exe'])],
-        install_requires = ['gunicorn==20.0.4','watchdog==4.0.0','filetype==1.2.0','psutil==5.8.0','requests==2.32.4',], #第三方包
+        install_requires = ['gunicorn==20.0.4','watchdog==4.0.0','filetype==1.2.0','psutil==5.8.0','requests==2.32.4'], #第三方包
         package_data = {
             '': ['*.html', '*.js','*.css','*.jpg','*.png','*.gif'],
         },