Merge remote-tracking branch 'origin/master' into 6.0.x

This commit is contained in:
William Cheng
2021-09-01 14:16:17 +08:00
3893 changed files with 67761 additions and 15499 deletions

View File

@@ -212,7 +212,7 @@ bool ModelBase::fromString( const utility::string_t& val, std::shared_ptr<T>& ou
if(outVal == nullptr)
{
outVal = std::shared_ptr<T>(new T());
}
}
if( outVal != nullptr )
{
ok = outVal->fromJson(web::json::value::parse(val));

View File

@@ -1,7 +1,7 @@
#!/bin/sh
# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
#
# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
git_user_id=$1
git_repo_id=$2
@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'