diff --git a/0001-add-paging-parameter-schema.patch b/0001-add-paging-parameter-schema.patch deleted file mode 100644 index 6c0ea2999af03df9b839dd9c426a3c36a6c64a4b..0000000000000000000000000000000000000000 --- a/0001-add-paging-parameter-schema.patch +++ /dev/null @@ -1,41 +0,0 @@ -From db18901aae967d1bf6b26a751d25a8f63eba7c2d Mon Sep 17 00:00:00 2001 -From: rabbitali -Date: Wed, 7 Jun 2023 16:35:22 +0800 -Subject: [PATCH] add paging parameter schema - ---- - vulcanus/restful/serialize/validate.py | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/vulcanus/restful/serialize/validate.py b/vulcanus/restful/serialize/validate.py -index 1c00804..0e5c6ea 100644 ---- a/vulcanus/restful/serialize/validate.py -+++ b/vulcanus/restful/serialize/validate.py -@@ -16,7 +16,8 @@ Author: - Description: - """ - import re --from marshmallow import ValidationError -+ -+from marshmallow import Schema, ValidationError, fields - - - def validate(verifier, data, load=False): -@@ -72,4 +73,12 @@ class ValidateRules: - validation rules for password, which only contains string or number - """ - if not re.findall("[a-zA-Z0-9]{6,20}", string): -- raise ValidationError("password should only contains string or number, between 6 and 20 characters!!") -\ No newline at end of file -+ raise ValidationError("password should only contains string or number, between 6 and 20 characters!!") -+ -+ -+class PaginationSchema(Schema): -+ """ -+ filter schema of paging parameter -+ """ -+ page = fields.Integer(required=False, validate=lambda s: 10**6 > s > 0) -+ per_page = fields.Integer(required=False, validate=lambda s: 10**3 > s > 0) --- -Gitee - diff --git a/0002-updateuwsgi-conf-file-generation-function.patch b/0002-updateuwsgi-conf-file-generation-function.patch deleted file mode 100644 index 6069f4af41e98a62dbec2b153e72a27b72fc156c..0000000000000000000000000000000000000000 --- a/0002-updateuwsgi-conf-file-generation-function.patch +++ /dev/null @@ -1,24 +0,0 @@ -From af4cb1a8f4b898e94d67020a7425d781e28013f5 Mon Sep 17 00:00:00 2001 -From: rabbitali -Date: Mon, 5 Jun 2023 23:48:03 +0800 -Subject: [PATCH] update uwsgi.ini generation function - ---- - aops-vulcanus | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/aops-vulcanus b/aops-vulcanus -index dea2b61..ce63dbd 100644 ---- a/aops-vulcanus -+++ b/aops-vulcanus -@@ -67,7 +67,6 @@ callable=app - http-timeout=${http_timeout} - harakiri=${harakiri} - processes=${processes} --lazy-apps=true - daemonize=${daemonize}" >"${OUT_PATH}"/"${service_name}".ini - if [ ${gevent} ] - then --- -Gitee - diff --git a/aops-vulcanus-v1.2.1.tar.gz b/aops-vulcanus-v1.2.1.tar.gz deleted file mode 100644 index 2db472a771767ebd3b5f63a722d41dc61beee6f5..0000000000000000000000000000000000000000 Binary files a/aops-vulcanus-v1.2.1.tar.gz and /dev/null differ diff --git a/aops-vulcanus-v1.3.0.tar.gz b/aops-vulcanus-v1.3.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4e91ea254801e7dfb2a399aa58fc7f1318ad4fff Binary files /dev/null and b/aops-vulcanus-v1.3.0.tar.gz differ diff --git a/aops-vulcanus.spec b/aops-vulcanus.spec index c712efab52cb8325acf75f78e999d616693fd360..cee832dac3a04e4ca4b061aef0ab3ac582146e80 100644 --- a/aops-vulcanus.spec +++ b/aops-vulcanus.spec @@ -1,12 +1,10 @@ Name: aops-vulcanus -Version: v1.2.1 -Release: 2 +Version: v1.3.0 +Release: 1 Summary: A basic tool libraries of aops, including logging, configure and response, etc. License: MulanPSL2 URL: https://gitee.com/openeuler/%{name} Source0: %{name}-%{version}.tar.gz -Patch0001: 0001-add-paging-parameter-schema.patch -Patch0002: 0002-updateuwsgi-conf-file-generation-function.patch BuildRequires: python3-setuptools @@ -32,7 +30,7 @@ tools for aops, it's about aops deploy %prep -%autosetup -n %{name}-%{version} -p1 +%autosetup -n %{name}-%{version} # build for aops-vulcanus @@ -62,6 +60,10 @@ cp -r scripts %{buildroot}/opt/aops/ %changelog +* Tue Aug 29 2023 wenxin - v1.3.0-1 +- optimize project directory structure +- support database initialization script + * Thu Jun 08 2023 wenxin - v1.2.1-2 - fix issue: aops-zeus app failed to load when first start by uwsgi - add paging parameter schema