mwgencode 1.4.1__tar.gz → 1.4.3__tar.gz

{mwgencode-1.4.1/mwgencode.egg-info → mwgencode-1.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mwgencode
-Version: 1.4.1
+Version: 1.4.3
 Summary: 根据starUML文档产生flask专案的代码
 Home-page: https://bitbucket.org/maxwin-inc/gencode/src/
 Author: cxhjet

{mwgencode-1.4.1 → mwgencode-1.4.3}/gencode/gen_code.py

@@ -128,8 +128,8 @@ class GenProject_Sample(GenProject_base):
     def __init__(self,modelfile,rootpath):
         super().__init__(modelfile,rootpath)
         
-    def gen_code(self,include_gencoderun):
-        p_name = os.path.split(self.rootpath)[-1]
+    def gen_code(self,include_gencoderun,project_name=None):
+        p_name = project_name or os.path.split(self.rootpath)[-1]
         if not os.path.exists(self.modelfile):
             if not os.path.exists('docs'):
                 os.makedirs('docs')

{mwgencode-1.4.1 → mwgencode-1.4.3}/gencode/gencode/export_class2swgclass.py

@@ -147,7 +147,7 @@ class ExportClass2SWGClass():
         package_cls_swg = self.__find_element(self.swg_package['ownedElements'], 'name',swgpackage_name)
         if not package_cls_swg:
             logging.warning('the swagger package(%s) is not exist'%swgpackage_name)
-            return
+            raise ValueError('the swagger package(%s) is not exist'%swgpackage_name)
         obj_signal = self.__find_element(package_cls_swg['ownedElements'],'_type','UMLSignal')
         assert obj_signal,'the swagger package(%s) has no UMLSignal class'%swgpackage_name
         obj_cls = self.__find_element(package_cls_swg['ownedElements'],'_type','UMLClass')
@@ -158,7 +158,7 @@ class ExportClass2SWGClass():
         op= self.__find_element(obj_signal['operations'],'name',opname)
         if op:
             logging.error('the swagger package(%s) has a opname（%s） UMLSignal class，请修改opname再试'%(swgpackage_name,opname))
-            return
+            raise ValueError('the swagger package(%s) has a opname（%s） UMLSignal class，请修改opname再试'%(swgpackage_name,opname))
         # 从模板中拷贝 物件
         import uuid
         # 使用临时的类别，保证临时物件中的id是唯一的，可以直接加入的swagger中
@@ -174,6 +174,11 @@ class ExportClass2SWGClass():
         op_parm_in = self.__find_element(op_tmp['parameters'],'name','in')
         obj_in = self.__find_element(package_cls_tmp['ownedElements'], '_id', op_parm_in['type']['$ref'])
         obj_in['_parent']['$ref']=package_cls_swg['_id']
+        if method in ['post', 'put']:
+            # 如果是post,put方法，则需要有一个in参数
+            # 返回类型 用 obj_cls
+            body_value = self.__find_element(obj_in['attributes'],'name','body')
+            body_value['type']['$ref'] = obj_cls['_id']
         package_cls_swg['ownedElements'].append(obj_in)
         op_parm_return = self.__find_element(op_tmp['parameters'],'direction','return')
         obj_return = self.__find_element(package_cls_tmp['ownedElements'], '_id', op_parm_return['type']['$ref'])

{mwgencode-1.4.1 → mwgencode-1.4.3}/gencode/importmdj/import_swagger2_class.py

@@ -259,7 +259,7 @@ class ImportSwagger(ImportBase):
             if param.type_attr == 'object':
                 if proper.object is None:
                     logging.error('error： %s.%s的属性【%s】 没有指定类型'%(act.call_path(),in_param.object_type.name,proper.name))
-                    exit(-1)
+                    raise Exception
                 if proper.object.type not in (Class_uml.umldatatype.value, Class_uml.umlclass.value):
                     raise Exception('%s.%s.%s 回应物件类型只能是%s和%s，不能是：%s' % (
                     act.call_path(),in_param.object_type.name,proper.name,Class_uml.umldatatype.value, Class_uml.umlclass.value, proper.object.type))

{mwgencode-1.4.1 → mwgencode-1.4.3/mwgencode.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mwgencode
-Version: 1.4.1
+Version: 1.4.3
 Summary: 根据starUML文档产生flask专案的代码
 Home-page: https://bitbucket.org/maxwin-inc/gencode/src/
 Author: cxhjet

{mwgencode-1.4.1 → mwgencode-1.4.3}/setup.py

@@ -7,7 +7,7 @@ def read(f):
 
 setup(
     name='mwgencode',
-    version='1.4.1',
+    version='1.4.3',
     author='cxhjet',
     author_email='cxhjet@qq.com',
     description="根据starUML文档产生flask专案的代码",