Compare commits
12 Commits
kub-stage
...
60c91438ec
| Author | SHA1 | Date | |
|---|---|---|---|
| 60c91438ec | |||
| 1d8f34ae6c | |||
| bdea2e8aef | |||
| e541aec115 | |||
| 743403e4d4 | |||
| 44fd5f29d9 | |||
| fac3d2c85e | |||
| 51c20116a7 | |||
| 4454b8dd3a | |||
| 2bbb1ba4c7 | |||
| 978475360c | |||
| 230453e491 |
@@ -0,0 +1,2 @@
|
||||
# Keep production config from current branch during merges — never overwrite
|
||||
src/BackOffice/wwwroot/appsettings.Production.json merge=ours
|
||||
@@ -1,46 +0,0 @@
|
||||
|
||||
name: Push nuget and docker image Actions Workflow
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- stage-new
|
||||
jobs:
|
||||
Deploy:
|
||||
runs-on: windows
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: https://git.afrino.co/actions/checkout@v3
|
||||
- name: Setup dotnet
|
||||
uses: https://git.afrino.co/actions/setup-dotnet@v3
|
||||
with:
|
||||
dotnet-version: 7.0.x
|
||||
|
||||
- name: Remove Package Source
|
||||
run: dotnet nuget remove source FourSat
|
||||
continue-on-error: true
|
||||
- name: Add Package Source
|
||||
run: dotnet nuget add source --name FourSat --username systemuser --password sZSA7PTiv3pUSQZ https://git.afrino.co/api/packages/FourSat/nuget/index.json --store-password-in-clear-text
|
||||
|
||||
- name: Install dependencies
|
||||
run: dotnet restore ".\src\BackOffice\BackOffice.csproj"
|
||||
- name: Build
|
||||
run: dotnet build ".\src\BackOffice\BackOffice.csproj" --configuration Release --no-restore
|
||||
- name: Test
|
||||
run: dotnet test ".\src\BackOffice\BackOffice.csproj" --no-restore --verbosity normal
|
||||
- name: Recycle Apppool
|
||||
run: |
|
||||
& "C:\Windows\System32\inetsrv\appcmd.exe" recycle apppool /apppool.name:admin.kbs1.ir
|
||||
shell: powershell
|
||||
- name: Stop Website
|
||||
run: |
|
||||
& "C:\Windows\System32\inetsrv\appcmd.exe" stop site /site.name:admin.kbs1.ir
|
||||
shell: powershell
|
||||
- name: Publish
|
||||
run: dotnet publish ".\src\BackOffice\BackOffice.csproj" -c Release -o publish
|
||||
- name: Copy Publish To IIS Directory
|
||||
run: Get-ChildItem -Path "publish\*" | Copy-Item -Destination "E:\kbs1.ir\admin.kbs1.ir\" -Recurse -Force
|
||||
- name: Start Website
|
||||
run: |
|
||||
& "C:\Windows\System32\inetsrv\appcmd.exe" start site /site.name:admin.kbs1.ir
|
||||
shell: powershell
|
||||
@@ -1,74 +0,0 @@
|
||||
name: Build and Deploy to Kubernetes
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- kub-stage
|
||||
|
||||
env:
|
||||
REGISTRY: 194.5.195.53:30080
|
||||
IMAGE_NAME: admin/backoffice
|
||||
K8S_SERVER: 194.5.195.53
|
||||
|
||||
jobs:
|
||||
build-and-deploy:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: 194.5.195.53:32082/docker-sshpass:latest
|
||||
options: --privileged
|
||||
steps:
|
||||
- name: Start Docker daemon
|
||||
run: |
|
||||
mkdir -p /etc/docker
|
||||
cat > /etc/docker/daemon.json << 'DAEMON'
|
||||
{
|
||||
"insecure-registries": ["194.5.195.53:30080", "194.5.195.53:32500", "194.5.195.53:32082"]
|
||||
}
|
||||
DAEMON
|
||||
echo "🚀 Starting Docker daemon..."
|
||||
dockerd --iptables=false --ip6tables=false --bridge=none --storage-driver=vfs &
|
||||
|
||||
# Wait up to 3 minutes for Docker to be ready
|
||||
for i in $(seq 1 90); do
|
||||
if docker info >/dev/null 2>&1; then
|
||||
echo "✅ Docker daemon is ready (attempt $i)"
|
||||
docker version
|
||||
break
|
||||
else
|
||||
echo "⏳ Waiting for Docker daemon... (attempt $i/90)"
|
||||
sleep 2
|
||||
fi
|
||||
done
|
||||
|
||||
# Final check
|
||||
if ! docker info >/dev/null 2>&1; then
|
||||
echo "❌ Docker daemon failed to start after 3 minutes"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
- name: Checkout code
|
||||
run: |
|
||||
git clone --depth 1 --branch kub-stage http://gitea-svc:3000/admin/BackOffice.git .
|
||||
|
||||
- name: Login to Docker registries
|
||||
run: |
|
||||
echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login 194.5.195.53:32082 -u admin --password-stdin
|
||||
echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login ${{ env.REGISTRY }} -u admin --password-stdin
|
||||
|
||||
- name: Build Docker Image
|
||||
run: |
|
||||
cd src
|
||||
DOCKER_BUILDKIT=0 docker build --network host -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest -f BackOffice/Dockerfile .
|
||||
|
||||
- name: Push to Registry
|
||||
run: |
|
||||
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
|
||||
|
||||
- name: Deploy to Kubernetes
|
||||
run: |
|
||||
export SSHPASS="${{ secrets.SERVER_PASSWORD }}"
|
||||
sshpass -e ssh -o StrictHostKeyChecking=no root@${{ env.K8S_SERVER }} "
|
||||
kubectl rollout restart deployment/backoffice
|
||||
kubectl rollout status deployment/backoffice --timeout=180s
|
||||
"
|
||||
echo "✅ Deployed!"
|
||||
@@ -40,7 +40,7 @@ jobs:
|
||||
done
|
||||
|
||||
if ! docker info >/dev/null 2>&1; then
|
||||
echo "❌ Docker daemon failed to start after 3 minutes"
|
||||
echo "❌ Docker daemon failed to start"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -56,9 +56,10 @@ jobs:
|
||||
- name: Build Docker Image
|
||||
run: |
|
||||
cd src
|
||||
DOCKER_BUILDKIT=0 docker build --network host -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }} \
|
||||
DOCKER_BUILDKIT=0 docker build --network host -f BackOffice/Dockerfile \
|
||||
-t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }} \
|
||||
-t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:prod \
|
||||
-f BackOffice/Dockerfile .
|
||||
.
|
||||
|
||||
- name: Push to Registry
|
||||
run: |
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
Margin="Margin.Dense">
|
||||
<MudSelectItem T="int?" Value="@(null as int?)">همه وضعیتها</MudSelectItem>
|
||||
<MudSelectItem T="int?" Value="0">در انتظار واریز به کیف پول</MudSelectItem>
|
||||
<MudSelectItem T="int?" Value="1">واریز شده به کیف پول طلایی</MudSelectItem>
|
||||
<MudSelectItem T="int?" Value="1">واریز شده به پاداش تیمی</MudSelectItem>
|
||||
<MudSelectItem T="int?" Value="2">درخواست برداشت ثبت شده</MudSelectItem>
|
||||
<MudSelectItem T="int?" Value="3">برداشت انجام شده</MudSelectItem>
|
||||
<MudSelectItem T="int?" Value="4">خطا در پرداخت بانکی</MudSelectItem>
|
||||
|
||||
@@ -152,7 +152,7 @@
|
||||
</MudItem>
|
||||
|
||||
<MudItem xs="6">
|
||||
<MudText Color="Color.Success">از کیف پول تخفیف:</MudText>
|
||||
<MudText Color="Color.Success">از کیف پول اعتباری:</MudText>
|
||||
</MudItem>
|
||||
<MudItem xs="6" Class="text-left">
|
||||
<MudText Color="Color.Success">@Order.DiscountBalanceUsed.ToString("N0") تومان</MudText>
|
||||
|
||||
@@ -101,7 +101,7 @@
|
||||
</CellTemplate>
|
||||
</TemplateColumn>
|
||||
|
||||
<TemplateColumn Title="تخفیف کیفپول">
|
||||
<TemplateColumn Title="کیف پول اعتباری">
|
||||
<CellTemplate>
|
||||
<MudText Color="Color.Success">@context.Item.DiscountBalanceUsed.ToString("N0") تومان</MudText>
|
||||
</CellTemplate>
|
||||
|
||||
@@ -234,7 +234,7 @@ public partial class DiscountOrdersMainPage
|
||||
try
|
||||
{
|
||||
var sb = new StringBuilder();
|
||||
sb.AppendLine("شناسه,نام کاربر,موبایل,مبلغ کل,تخفیف کیفپول,پرداخت درگاه,تعداد آیتم,وضعیت پرداخت,وضعیت ارسال,تاریخ پرداخت,تاریخ ثبت,آدرس");
|
||||
sb.AppendLine("شناسه,نام کاربر,موبایل,مبلغ کل,کیف پول اعتباری,پرداخت درگاه,تعداد آیتم,وضعیت پرداخت,وضعیت ارسال,تاریخ پرداخت,تاریخ ثبت,آدرس");
|
||||
|
||||
foreach (var o in _orders)
|
||||
{
|
||||
|
||||
@@ -26,8 +26,8 @@
|
||||
Variant="Variant.Outlined"
|
||||
@bind-Value="_selectedType">
|
||||
<MudSelectItem T="int" Value="1">واریز نقدی</MudSelectItem>
|
||||
<MudSelectItem T="int" Value="2">شارژ کیف پول تخفیف</MudSelectItem>
|
||||
<MudSelectItem T="int" Value="3">شارژ کیف پول شبکه</MudSelectItem>
|
||||
<MudSelectItem T="int" Value="2">شارژ کیف پول اعتباری</MudSelectItem>
|
||||
<MudSelectItem T="int" Value="3">شارژ پاداش تیمی</MudSelectItem>
|
||||
<MudSelectItem T="int" Value="4">تسویه حساب</MudSelectItem>
|
||||
<MudSelectItem T="int" Value="5">اصلاح خطا</MudSelectItem>
|
||||
<MudSelectItem T="int" Value="6">بازپرداخت</MudSelectItem>
|
||||
|
||||
@@ -26,8 +26,8 @@
|
||||
<MudSelect T="int?" Clearable="true" Label="نوع" Variant="Variant.Outlined"
|
||||
Margin="Margin.Dense" @bind-Value="_typeFilter">
|
||||
<MudSelectItem T="int?" Value="@(1)">واریز نقدی</MudSelectItem>
|
||||
<MudSelectItem T="int?" Value="@(2)">شارژ کیفپول تخفیف</MudSelectItem>
|
||||
<MudSelectItem T="int?" Value="@(3)">شارژ کیفپول شبکه</MudSelectItem>
|
||||
<MudSelectItem T="int?" Value="@(2)">شارژ کیف پول اعتباری</MudSelectItem>
|
||||
<MudSelectItem T="int?" Value="@(3)">شارژ پاداش تیمی</MudSelectItem>
|
||||
<MudSelectItem T="int?" Value="@(4)">تسویه حساب</MudSelectItem>
|
||||
<MudSelectItem T="int?" Value="@(5)">اصلاح خطا</MudSelectItem>
|
||||
<MudSelectItem T="int?" Value="@(6)">بازگشت وجه</MudSelectItem>
|
||||
@@ -219,8 +219,8 @@
|
||||
return type switch
|
||||
{
|
||||
1 => "واریز نقدی",
|
||||
2 => "شارژ کیفپول تخفیف",
|
||||
3 => "شارژ کیفپول شبکه",
|
||||
2 => "شارژ کیف پول اعتباری",
|
||||
3 => "شارژ پاداش تیمی",
|
||||
4 => "تسویه حساب",
|
||||
5 => "اصلاح خطا",
|
||||
6 => "بازگشت وجه",
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
<MudText Color="Color.Primary"><strong>@context.Item.Balance.ToString("N0")</strong> تومان</MudText>
|
||||
</CellTemplate>
|
||||
</TemplateColumn>
|
||||
<TemplateColumn Title="موجودی شبکه">
|
||||
<TemplateColumn Title="پاداش تیمی">
|
||||
<CellTemplate>
|
||||
<MudText Color="Color.Success">@context.Item.NetworkBalance.ToString("N0") تومان</MudText>
|
||||
</CellTemplate>
|
||||
@@ -110,12 +110,12 @@
|
||||
<MudText Color="Color.Primary">@context.Item.CurrentBalance.ToString("N0")</MudText>
|
||||
</CellTemplate>
|
||||
</TemplateColumn>
|
||||
<TemplateColumn Title="تغییر شبکه">
|
||||
<TemplateColumn Title="تغییر پاداش تیمی">
|
||||
<CellTemplate>
|
||||
<MudText>@context.Item.ChangeNerworkValue.ToString("N0")</MudText>
|
||||
</CellTemplate>
|
||||
</TemplateColumn>
|
||||
<TemplateColumn Title="موجودی شبکه فعلی">
|
||||
<TemplateColumn Title="پاداش تیمی فعلی">
|
||||
<CellTemplate>
|
||||
<MudText Color="Color.Success">@context.Item.CurrentNetworkBalance.ToString("N0")</MudText>
|
||||
</CellTemplate>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"GwUrl": "https://cms.kbs1.ir",
|
||||
"GwUrl": "https://cms.kbs2.ir",
|
||||
"Authentication": {
|
||||
"Authority": "https://ids.afrino.co/",
|
||||
"ClientId": "client_backoffice_spa"
|
||||
|
||||
Reference in New Issue
Block a user