diff --git a/Implements/Company/IndexImpl.py b/Implements/Company/IndexImpl.py index efa12d4..60447dd 100644 --- a/Implements/Company/IndexImpl.py +++ b/Implements/Company/IndexImpl.py @@ -1,7 +1,7 @@ from DBHelper.MongoHelper import MongoHelper -from ObjectsCommon.Company.FECRCompany import BasicBusinessInfo, CCRatingAnalysis, ESGRatingAnalysis -from ObjectsCommon.Industry.FECRIndustry import IndustryAnalysis -from ObjectsInProject.Company.Index import CompanyIndex, ThisFinancialElementsAnalysis, ThisOperatingRiskAnalysis +from Objects.Common.Company.FECRCompany import BasicBusinessInfo, CCRatingAnalysis, ESGRatingAnalysis +from Objects.Common.Industry.FECRIndustry import IndustryAnalysis +from Objects.InProject.Company.Index import CompanyIndex, ThisFinancialElementsAnalysis, ThisOperatingRiskAnalysis class CompanyIndexImpl(CompanyIndex): diff --git a/Implements/Industry/IndustryImpl.py b/Implements/Industry/IndustryImpl.py index 414fc07..278a4d4 100644 --- a/Implements/Industry/IndustryImpl.py +++ b/Implements/Industry/IndustryImpl.py @@ -1,5 +1,5 @@ from DBHelper.MongoHelper import MongoHelper -from ObjectsInProject.Industry.Industry import IndustryReportRecord +from Objects.InProject.Industry.Industry import IndustryReportRecord class IndustryReportRecordImpl(IndustryReportRecord): diff --git a/Implements/Others/EmailNoticeImpl.py b/Implements/Others/EmailNoticeImpl.py index c732471..c02ec04 100644 --- a/Implements/Others/EmailNoticeImpl.py +++ b/Implements/Others/EmailNoticeImpl.py @@ -4,7 +4,7 @@ import random import requests from DBHelper.MongoHelper import MongoHelper -from ObjectsCommon.Others.EmailNotice import EmailNotice +from Objects.Common.Others.EmailNotice import EmailNotice from Utils.ErrorUtil import ReturnConditionCheckFailed diff --git a/Implements/Others/TFSEFileImpl.py b/Implements/Others/TFSEFileImpl.py index 8dc36ba..467ec0e 100644 --- a/Implements/Others/TFSEFileImpl.py +++ b/Implements/Others/TFSEFileImpl.py @@ -1,7 +1,7 @@ from flask import Response from DBHelper.MongoHelper import MongoHelper -from ObjectsInProject.Other.TFSEFile import TFSEFile +from Objects.InProject.Other.TFSEFile import TFSEFile class TFSEFileImpl(TFSEFile): diff --git a/Implements/User/RealCompanyVerifyImpl.py b/Implements/User/RealCompanyVerifyImpl.py index c9c30d6..692f12a 100644 --- a/Implements/User/RealCompanyVerifyImpl.py +++ b/Implements/User/RealCompanyVerifyImpl.py @@ -6,8 +6,8 @@ from urllib.request import urlopen, Request import requests from DBHelper.MongoHelper import MongoHelper -from ObjectsInProject.User.RealCompanyVerify import UploadMaterial, RealCompanyVerify -from ObjectsInProject.User.TFSECompanyUser import TFSECompanyUser +from Objects.InProject.User.RealCompanyVerify import UploadMaterial, RealCompanyVerify +from Objects.InProject.User.TFSECompanyUser import TFSECompanyUser from Utils.ErrorUtil import ReturnConditionCheckFailed diff --git a/Implements/User/TFSECompanyUserImpl.py b/Implements/User/TFSECompanyUserImpl.py index 539f2f5..5b1041f 100644 --- a/Implements/User/TFSECompanyUserImpl.py +++ b/Implements/User/TFSECompanyUserImpl.py @@ -1,15 +1,11 @@ -import json import time import random -import base64 -import requests -from urllib.request import Request, urlopen -from werkzeug.security import check_password_hash, generate_password_hash +from werkzeug.security import check_password_hash from itsdangerous import TimedJSONWebSignatureSerializer as Serializer from DBHelper.MongoHelper import MongoHelper -from ObjectsInProject.User.TFSECompanyUser import TFSECompanyUser +from Objects.InProject.User.TFSECompanyUser import TFSECompanyUser from Utils.ErrorUtil import ReturnConditionCheckFailed diff --git a/ObjectsCommon/Company/FECRCompany.py b/Objects/Common/Company/FECRCompany.py similarity index 100% rename from ObjectsCommon/Company/FECRCompany.py rename to Objects/Common/Company/FECRCompany.py diff --git a/ObjectsCommon/Company/__init__.py b/Objects/Common/Company/__init__.py similarity index 100% rename from ObjectsCommon/Company/__init__.py rename to Objects/Common/Company/__init__.py diff --git a/ObjectsCommon/Industry/FECRIndustry.py b/Objects/Common/Industry/FECRIndustry.py similarity index 100% rename from ObjectsCommon/Industry/FECRIndustry.py rename to Objects/Common/Industry/FECRIndustry.py diff --git a/ObjectsCommon/Industry/__init__.py b/Objects/Common/Industry/__init__.py similarity index 100% rename from ObjectsCommon/Industry/__init__.py rename to Objects/Common/Industry/__init__.py diff --git a/ObjectsCommon/Others/EmailNotice.py b/Objects/Common/Others/EmailNotice.py similarity index 100% rename from ObjectsCommon/Others/EmailNotice.py rename to Objects/Common/Others/EmailNotice.py diff --git a/ObjectsCommon/Others/__init__.py b/Objects/Common/Others/__init__.py similarity index 100% rename from ObjectsCommon/Others/__init__.py rename to Objects/Common/Others/__init__.py diff --git a/ObjectsCommon/Rating/__init__.py b/Objects/Common/Rating/__init__.py similarity index 100% rename from ObjectsCommon/Rating/__init__.py rename to Objects/Common/Rating/__init__.py diff --git a/ObjectsCommon/User/ToBUser.py b/Objects/Common/User/ToBUser.py similarity index 100% rename from ObjectsCommon/User/ToBUser.py rename to Objects/Common/User/ToBUser.py diff --git a/ObjectsCommon/User/ToCUser.py b/Objects/Common/User/ToCUser.py similarity index 100% rename from ObjectsCommon/User/ToCUser.py rename to Objects/Common/User/ToCUser.py diff --git a/ObjectsCommon/User/__init__.py b/Objects/Common/User/__init__.py similarity index 100% rename from ObjectsCommon/User/__init__.py rename to Objects/Common/User/__init__.py diff --git a/ObjectsCommon/__init__.py b/Objects/Common/__init__.py similarity index 100% rename from ObjectsCommon/__init__.py rename to Objects/Common/__init__.py diff --git a/ObjectsInProject/Company/Index.py b/Objects/InProject/Company/Index.py similarity index 94% rename from ObjectsInProject/Company/Index.py rename to Objects/InProject/Company/Index.py index 3bd272b..628ea46 100644 --- a/ObjectsInProject/Company/Index.py +++ b/Objects/InProject/Company/Index.py @@ -1,5 +1,8 @@ -from ObjectsCommon.Company.FECRCompany import * -from ObjectsCommon.Industry.FECRIndustry import IndustryAnalysis +from Objects.Common.Company.FECRCompany import FinancialElementsAnalysis, OperatingRiskAnalysis, BasicBusinessInfo, \ + CCRatingAnalysis, ESGRatingAnalysis +from Objects.Common.Industry.FECRIndustry import IndustryAnalysis +from Utils.ObjUtil import SpecObject +from Utils.ValidateUtil import ValidateAttr class ThisFinancialElementsAnalysis(FinancialElementsAnalysis): diff --git a/ObjectsInProject/Company/__init__.py b/Objects/InProject/Company/__init__.py similarity index 100% rename from ObjectsInProject/Company/__init__.py rename to Objects/InProject/Company/__init__.py diff --git a/ObjectsInProject/Industry/Industry.py b/Objects/InProject/Industry/Industry.py similarity index 100% rename from ObjectsInProject/Industry/Industry.py rename to Objects/InProject/Industry/Industry.py diff --git a/ObjectsInProject/Industry/__init__.py b/Objects/InProject/Industry/__init__.py similarity index 100% rename from ObjectsInProject/Industry/__init__.py rename to Objects/InProject/Industry/__init__.py diff --git a/ObjectsInProject/Other/TFSEFile.py b/Objects/InProject/Other/TFSEFile.py similarity index 100% rename from ObjectsInProject/Other/TFSEFile.py rename to Objects/InProject/Other/TFSEFile.py diff --git a/ObjectsInProject/Other/__init__.py b/Objects/InProject/Other/__init__.py similarity index 100% rename from ObjectsInProject/Other/__init__.py rename to Objects/InProject/Other/__init__.py diff --git a/ObjectsInProject/User/RealCompanyVerify.py b/Objects/InProject/User/RealCompanyVerify.py similarity index 100% rename from ObjectsInProject/User/RealCompanyVerify.py rename to Objects/InProject/User/RealCompanyVerify.py diff --git a/ObjectsInProject/User/TFSECompanyUser.py b/Objects/InProject/User/TFSECompanyUser.py similarity index 100% rename from ObjectsInProject/User/TFSECompanyUser.py rename to Objects/InProject/User/TFSECompanyUser.py diff --git a/ObjectsInProject/User/__init__.py b/Objects/InProject/User/__init__.py similarity index 100% rename from ObjectsInProject/User/__init__.py rename to Objects/InProject/User/__init__.py diff --git a/ObjectsInProject/__init__.py b/Objects/InProject/__init__.py similarity index 100% rename from ObjectsInProject/__init__.py rename to Objects/InProject/__init__.py diff --git a/Objects/__init__.py b/Objects/__init__.py new file mode 100644 index 0000000..e69de29