From 24789ed06f3c8f97e213c435c31e786be0809259 Mon Sep 17 00:00:00 2001 From: anhduy-tech Date: Tue, 7 Apr 2026 09:35:51 +0700 Subject: [PATCH] changes --- .gitea/workflows/deploy-dev.yaml | 51 -------------------------------- .gitea/workflows/deploy-pro.yaml | 51 -------------------------------- build.sh | 8 ++--- buildbiz.sh | 10 ------- builddealer.sh | 10 ------- builddealerdev.sh | 10 ------- builddev.sh | 10 ------- ecosystem.config.cjs | 2 +- envdev.py | 26 ---------------- envdevdealer.py | 27 ----------------- envprod.py | 26 ---------------- envproddealer.py | 26 ---------------- 12 files changed, 3 insertions(+), 254 deletions(-) delete mode 100644 .gitea/workflows/deploy-dev.yaml delete mode 100644 .gitea/workflows/deploy-pro.yaml delete mode 100644 buildbiz.sh delete mode 100644 builddealer.sh delete mode 100644 builddealerdev.sh delete mode 100644 builddev.sh delete mode 100644 envdev.py delete mode 100644 envdevdealer.py delete mode 100644 envprod.py delete mode 100644 envproddealer.py diff --git a/.gitea/workflows/deploy-dev.yaml b/.gitea/workflows/deploy-dev.yaml deleted file mode 100644 index c0dbe8d..0000000 --- a/.gitea/workflows/deploy-dev.yaml +++ /dev/null @@ -1,51 +0,0 @@ -name: Deploy Utopia Dev - -on: - push: - branches: - - dev - -concurrency: - group: ${{ gitea.workflow }}-${{ gitea.ref }} - cancel-in-progress: true - -jobs: - deploy: - runs-on: ubuntu-24.04 - - steps: - - name: Deploy to server via SSH - uses: appleboy/ssh-action@v1.2.5 - with: - host: ${{ secrets.SSH_HOST_DEV }} - username: ${{ secrets.SSH_USER_DEV }} - password: ${{ secrets.SSH_PASSWORD_DEV }} - port: ${{ secrets.SSH_PORT_DEV }} - script: | - cd ~/deploy/utopiadev - echo "Pulling latest code..." - git pull - echo "Starting deployment..." - sh start.sh - echo "Deploy done" - - cleanup: - runs-on: ubuntu-24.04 - needs: deploy - if: always() - steps: - - name: Cleanup Docker on server - uses: appleboy/ssh-action@v1.2.5 - with: - host: ${{ secrets.SSH_HOST_DEV }} - username: ${{ secrets.SSH_USER_DEV }} - password: ${{ secrets.SSH_PASSWORD_DEV }} - port: ${{ secrets.SSH_PORT_DEV }} - script: | - echo "=== Starting Docker cleanup ===" - docker images --format "{{.Repository}}:{{.Tag}} {{.ID}}" | \ - grep -v ":latest" | \ - awk '{print $2}' | \ - xargs -r docker rmi || true - docker system prune -f - echo "=== Cleanup completed ===" \ No newline at end of file diff --git a/.gitea/workflows/deploy-pro.yaml b/.gitea/workflows/deploy-pro.yaml deleted file mode 100644 index 7f066bd..0000000 --- a/.gitea/workflows/deploy-pro.yaml +++ /dev/null @@ -1,51 +0,0 @@ -name: Deploy Utopia Product - -on: - push: - branches: - - product - -concurrency: - group: ${{ gitea.workflow }}-${{ gitea.ref }} - cancel-in-progress: true - -jobs: - deploy: - runs-on: ubuntu-24.04 - - steps: - - name: Deploy to server via SSH - uses: appleboy/ssh-action@v1.2.5 - with: - host: ${{ secrets.SSH_HOST_PRO }} - username: ${{ secrets.SSH_USER_PRO }} - password: ${{ secrets.SSH_PASSWORD_PRO }} - port: ${{ secrets.SSH_PORT_PRO }} - script: | - cd ~/deploy/utopia - echo "Pulling latest code..." - git pull - echo "Starting deployment..." - sh start.sh - echo "Deploy done" - - cleanup: - runs-on: ubuntu-24.04 - needs: deploy - if: always() - steps: - - name: Cleanup Docker on server - uses: appleboy/ssh-action@v1.2.5 - with: - host: ${{ secrets.SSH_HOST_PRO }} - username: ${{ secrets.SSH_USER_PRO }} - password: ${{ secrets.SSH_PASSWORD_PRO }} - port: ${{ secrets.SSH_PORT_PRO }} - script: | - echo "=== Starting Docker cleanup ===" - docker images --format "{{.Repository}}:{{.Tag}} {{.ID}}" | \ - grep -v ":latest" | \ - awk '{print $2}' | \ - xargs -r docker rmi || true - docker system prune -f - echo "=== Cleanup completed ===" \ No newline at end of file diff --git a/build.sh b/build.sh index 35b4c2d..7a8e70c 100644 --- a/build.sh +++ b/build.sh @@ -1,10 +1,6 @@ -# docker build -t y99-application . -# docker tag y99-application docker.bigdatatech.vn/y99-application -# docker push docker.bigdatatech.vn/y99-application -python3 envprod.py -PROJECT="utopia" -IMAGE="biz" +PROJECT="erp" +IMAGE="hrm" docker build -t docker.bigdatatech.vn/$PROJECT/$IMAGE:latest . docker push docker.bigdatatech.vn/$PROJECT/$IMAGE:latest diff --git a/buildbiz.sh b/buildbiz.sh deleted file mode 100644 index 24514bf..0000000 --- a/buildbiz.sh +++ /dev/null @@ -1,10 +0,0 @@ -# docker build -t y99-application . -# docker tag y99-application docker.bigdatatech.vn/y99-application -# docker push docker.bigdatatech.vn/y99-application - -python3 envdev.py -PROJECT="utopia" -IMAGE="biz" - -docker build -t docker.bigdatatech.vn/$PROJECT/$IMAGE:latest . -docker push docker.bigdatatech.vn/$PROJECT/$IMAGE:latest diff --git a/builddealer.sh b/builddealer.sh deleted file mode 100644 index 6aa12b1..0000000 --- a/builddealer.sh +++ /dev/null @@ -1,10 +0,0 @@ -# docker build -t y99-application . -# docker tag y99-application docker.bigdatatech.vn/y99-application -# docker push docker.bigdatatech.vn/y99-application - -python3 envproddealer.py -PROJECT="utopia" -IMAGE="dealer" - -docker build -t docker.bigdatatech.vn/$PROJECT/$IMAGE:latest . -docker push docker.bigdatatech.vn/$PROJECT/$IMAGE:latest diff --git a/builddealerdev.sh b/builddealerdev.sh deleted file mode 100644 index e11cf94..0000000 --- a/builddealerdev.sh +++ /dev/null @@ -1,10 +0,0 @@ -# docker build -t y99-application . -# docker tag y99-application docker.bigdatatech.vn/y99-application -# docker push docker.bigdatatech.vn/y99-application - -python3 envdevdealer.py -PROJECT="utopia" -IMAGE="dealer-dev" - -docker build -t docker.bigdatatech.vn/$PROJECT/$IMAGE:latest . -docker push docker.bigdatatech.vn/$PROJECT/$IMAGE:latest diff --git a/builddev.sh b/builddev.sh deleted file mode 100644 index 16c1c5f..0000000 --- a/builddev.sh +++ /dev/null @@ -1,10 +0,0 @@ -# docker build -t y99-application . -# docker tag y99-application docker.bigdatatech.vn/y99-application -# docker push docker.bigdatatech.vn/y99-application - -python3 envdev.py -PROJECT="utopia" -IMAGE="biz-dev" - -docker build -t docker.bigdatatech.vn/$PROJECT/$IMAGE:latest . -docker push docker.bigdatatech.vn/$PROJECT/$IMAGE:latest diff --git a/ecosystem.config.cjs b/ecosystem.config.cjs index 4216f2f..9268773 100644 --- a/ecosystem.config.cjs +++ b/ecosystem.config.cjs @@ -1,7 +1,7 @@ module.exports = { apps: [ { - name: 'UtopiaBiz', + name: 'HRM', port: '3000', exec_mode: 'cluster', instances: 'max', diff --git a/envdev.py b/envdev.py deleted file mode 100644 index 8124530..0000000 --- a/envdev.py +++ /dev/null @@ -1,26 +0,0 @@ -def search_text(file, text, new_text): - f = open(file, 'r', newline='\n') - content = f.read() - print(text, content.find(new_text)) - content = content.replace(text, new_text) - f.close() - with open(file, 'w', newline='\n') as f: - f.write(content) - -file = './app/plugins/02-connection.js' -text1 = 'mode = "prod"' -newtext1 = 'mode = "dev"' -newtext2 = 'module = "application"' -text2 = 'module = "dealer"' -newtext3 = 'Biz_Setting' -text3 = 'Dealer_Setting' -newtext4 = 'Biz_Rights' -text4 = 'Dealer_Rights' -search_text(file, text1, newtext1) -search_text(file, text2, newtext2) -search_text(file, text3, newtext3) -search_text(file, text4, newtext4) -file = './app/assets/styles/main.scss' -search_text(file, '/logo.png', '/logo_dev.png') -file = './app/stores/index.js' -search_text(file,'export const useStore = defineStore("main", {','export const useStore = defineStore("maindev", {') \ No newline at end of file diff --git a/envdevdealer.py b/envdevdealer.py deleted file mode 100644 index 57192ef..0000000 --- a/envdevdealer.py +++ /dev/null @@ -1,27 +0,0 @@ -def search_text(file, text, new_text): - f = open(file, 'r', newline='\n') - content = f.read() - print(text, content.find(new_text)) - content = content.replace(text, new_text) - f.close() - with open(file, 'w', newline='\n') as f: - f.write(content) - -file = './app/plugins/02-connection.js' - -text1 = 'mode = "prod"' -newtext1 = 'mode = "dev"' -text2 = 'module = "application"' -newtext2 = 'module = "dealer"' -text3 = 'Biz_Setting' -newtext3 = 'Dealer_Setting' -text4 = 'Biz_Rights' -newtext4 = 'Dealer_Rights' -search_text(file, text1, newtext1) -search_text(file, text2, newtext2) -search_text(file, text3, newtext3) -search_text(file, text4, newtext4) -file = './app/assets/styles/main.scss' -search_text(file, '/logo.png', '/logo_dev.png') -file = './app/stores/index.js' -search_text(file,'export const useStore = defineStore("main", {','export const useStore = defineStore("maindev", {') diff --git a/envprod.py b/envprod.py deleted file mode 100644 index 5e7564b..0000000 --- a/envprod.py +++ /dev/null @@ -1,26 +0,0 @@ -def search_text(file, text, new_text): - f = open(file, 'r', newline='\n') - content = f.read() - print(text, content.find(new_text)) - content = content.replace(text, new_text) - f.close() - with open(file, 'w', newline='\n') as f: - f.write(content) - -file = './app/plugins/02-connection.js' -newtext1 = 'mode = "prod"' -text1 = 'mode = "dev"' -newtext2 = 'module = "application"' -text2 = 'module = "dealer"' -newtext3 = 'Biz_Setting' -text3 = 'Dealer_Setting' -newtext4 = 'Biz_Rights' -text4 = 'Dealer_Rights' -search_text(file, text1, newtext1) -search_text(file, text2, newtext2) -search_text(file, text3, newtext3) -search_text(file, text4, newtext4) -file = './app/assets/styles/main.scss' -search_text(file, '/logo_dev.png', '/logo.png') -file = './app/stores/index.js' -search_text(file,'export const useStore = defineStore("maindev", {','export const useStore = defineStore("main", {') diff --git a/envproddealer.py b/envproddealer.py deleted file mode 100644 index ff0a0e8..0000000 --- a/envproddealer.py +++ /dev/null @@ -1,26 +0,0 @@ -def search_text(file, text, new_text): - f = open(file, 'r', newline='\n') - content = f.read() - print(text, content.find(new_text)) - content = content.replace(text, new_text) - f.close() - with open(file, 'w', newline='\n') as f: - f.write(content) - -file = './app/plugins/02-connection.js' -text1 = 'mode = "dev"' -text2 = 'module = "application"' -newtext1 = 'mode = "prod"' -newtext2 = 'module = "dealer"' -text3 = 'Biz_Setting' -newtext3 = 'Dealer_Setting' -text4 = 'Biz_Rights' -newtext4 = 'Dealer_Rights' -search_text(file, text1, newtext1) -search_text(file, text2, newtext2) -search_text(file, text3, newtext3) -search_text(file, text4, newtext4) -file = './app/assets/styles/main.scss' -search_text(file, '/logo_dev.png', '/logo.png') -file = './app/stores/index.js' -search_text(file,'export const useStore = defineStore("maindev", {','export const useStore = defineStore("main", {') \ No newline at end of file