diff --git a/.gitignore b/.gitignore index 4eef7e1..ac0482c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ build out .cache buildpc -buildhost \ No newline at end of file +buildhost +./release \ No newline at end of file diff --git a/appsrc/appconfig/basic/zappversion.hpp b/appsrc/appconfig/basic/zappversion.hpp index b0baa7a..a29c454 100644 --- a/appsrc/appconfig/basic/zappversion.hpp +++ b/appsrc/appconfig/basic/zappversion.hpp @@ -1,3 +1,3 @@ #pragma once -#define VERSION "2.2.5" +#define VERSION "2.2.6" #define PROJECT_NAME "TRANSMIT_DM" \ No newline at end of file diff --git a/appsrc/service/audit_mgr_service.cpp b/appsrc/service/audit_mgr_service.cpp index fb175f1..624a31e 100644 --- a/appsrc/service/audit_mgr_service.cpp +++ b/appsrc/service/audit_mgr_service.cpp @@ -76,6 +76,10 @@ void AuditMgrService::exportData(shared_ptr cxt) { void AuditMgrService::getRecords(shared_ptr cxt, int page, int page_size) { // cxt->rely = UserBehaviorRecordDao::ins()->getUserBehaviorRecordDescJson(jsonGet(params["page"]), jsonGet(params["page_size"])); + page = page - 1; + if (page < 0) { + page = 0; + } cxt->rely = UserBehaviorRecordDao::ins()->getUserBehaviorRecordDescJson(page, page_size); } void AuditMgrService::pushTestData(shared_ptr cxt) {} diff --git a/packet_release.sh b/packet_release.sh index 270fbdc..0838cce 100755 --- a/packet_release.sh +++ b/packet_release.sh @@ -10,14 +10,19 @@ echo "VERSION: $VERSION" ./ ./build.sh aarch64-linux-gnu-strip ./build/app/* -mkdir -p /tmp/app/ -rm -rf /tmp/app/* -cp ./build/app/* /tmp/app/ -cp -rf html /tmp/app/ -tar -czvf /tmp/app.tar.gz -C /tmp app -rm -rf /tmp/app -mv /tmp/app.tar.gz /tmp/app_v$VERSION.tar.gz -mv /tmp/app_v$VERSION.tar.gz ./release/ - -echo "Release package is in ./release/app_v$VERSION.tar.gz" +packetname=app-v$VERSION-aarm64 +packetpath=/tmp/$packetname + + +rm -rf $packetpath +mkdir -p $packetpath/ + +cp ./build/app/* $packetpath/ +cp -rf html $packetpath/ + +tar -czvf $packetpath.tar.gz -C /tmp/ $packetname + +mv $packetpath.tar.gz ./release/ + +echo "Release package is in ./release/$packetname.tar.gz" diff --git a/release/app_v2.1.8.tar.gz b/release/app_v2.1.8.tar.gz deleted file mode 100644 index 4c549d6..0000000 Binary files a/release/app_v2.1.8.tar.gz and /dev/null differ diff --git a/release/app_v2.1.9.tar.gz b/release/app_v2.1.9.tar.gz deleted file mode 100644 index d282645..0000000 Binary files a/release/app_v2.1.9.tar.gz and /dev/null differ