diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 84a5b0f..855bcdd 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -18,16 +18,20 @@ jobs: host: ${{ secrets.SSH_BUILD_HOST }} username: ${{ secrets.SSH_USERNAME }} password: ${{ secrets.SSH_PASSWORD }} + script_stop: true script: | + set -e mkdir -p /data/projects cd /data/projects - git clone git@github.com:xiaoliutral/SimpleAdmin.Api.git + if [ ! -d SimpleAdmin.Api/.git ]; then + git clone git@github.com:xiaoliutral/SimpleAdmin.Api.git + fi cd SimpleAdmin.Api - git pull origin master + git fetch origin master + git checkout master + git reset --hard origin/master docker build -t admin_api:latest -f src/SimpleAdmin.Api/Dockerfile . - # 标记镜像 docker tag admin_api:latest registry.nanafa.com/admin_api:latest - # 推送镜像 docker push registry.nanafa.com/admin_api:latest - name: Deploy to Server uses: appleboy/ssh-action@v0.1.5 @@ -35,7 +39,10 @@ jobs: host: ${{ secrets.SSH_MANAGER_HOST }} username: ${{ secrets.SSH_USERNAME }} password: ${{ secrets.SSH_PASSWORD }} + script_stop: true script: | + set -e cd /data + docker pull registry.nanafa.com/admin_api:latest docker stack deploy -c api.yml api # yml没变化不会更新 - docker service update --force --image registry.nanafa.com/admin_api:latest api_admin # 一定要和service name一致 + docker service update --force --image registry.nanafa.com/admin_api:latest api_admin # 一定要和service name一致 diff --git a/src/Oms.Application/Shared/MarketingCouponManager.cs b/src/Oms.Application/Shared/MarketingCouponManager.cs index d71cfe4..58ab925 100644 --- a/src/Oms.Application/Shared/MarketingCouponManager.cs +++ b/src/Oms.Application/Shared/MarketingCouponManager.cs @@ -93,8 +93,7 @@ public class MarketingCouponManager : IScopedDependency var templates = await _templateRepository.GetListAsync( x => x.Status == CouponTemplateStatus.Active - && x.GrantChannel == MarketingGrantChannels.Newcomer, - cancellationToken); + && x.GrantChannel == MarketingGrantChannels.Newcomer); if (templates.Count == 0) { return 0; diff --git a/src/Oms.Application/Shared/MarketingReferralBinder.cs b/src/Oms.Application/Shared/MarketingReferralBinder.cs index ecb00ae..fa9795a 100644 --- a/src/Oms.Application/Shared/MarketingReferralBinder.cs +++ b/src/Oms.Application/Shared/MarketingReferralBinder.cs @@ -1,3 +1,4 @@ +using Fake.Application; using Fake.Domain.Exceptions; using Oms.Domain.CustomersAggregate.Entities; using Oms.Domain.CustomersAggregate.Repositories;