Эх сурвалжийг харах

Merge branch 'master' into repo-develop/master

yazid138 3 жил өмнө
parent
commit
f2eea1c752

+ 3 - 3
.env

@@ -1,11 +1,11 @@
-BASE_URL=https://api.dev-sidali.sixsenz.net
+BASE_URL=https://api.sidali.sixsenz.net
 PORT=5000
 SECRET=3d3eb3d842f4e595048f1806ca815f8092e29fb6b98a30dff0b8241ad0e6c273
 
-MONGO_URL=mongodb://mongodb-dev.sidali.sixsenz.net:50010/ptb-db-dev
+MONGO_URL=mongodb://production.sidali.sixsenz.net:50010/ptb-db
 TOKEN_DEVELOPMENT=77aecfec-10ac-3b4f-ab59-3fbfbeed6324
 TOKEN_PRODUCTION=5b62f743-eef2-3370-8c66-6951b2e9c2c5
 TOKEN_AUTO=5j12h43g6hj2367234k57
 
 
-ENV=development
+ENV=production

+ 1 - 1
.gitignore

@@ -55,7 +55,7 @@ typings/
 .yarn-integrity
 
 # dotenv environment variables file
-# .env
+.env
 
 # next.js build output
 # .next

+ 1 - 1
Jenkinsfile

@@ -10,7 +10,7 @@ node {
   def registryCredential
   try {
     // environment {
-      registryAddress = "https://registry.dev-sidali.sixsenz.net"
+      registryAddress = "https://registry.sidali.sixsenz.net"
       registryCredential = 'DockerRegistry-ID'
     // }
 	

+ 4 - 4
controller/sanksi/perbaikan.controller.js

@@ -35,10 +35,10 @@ exports.add = handleError(async (req, res) => {
       laporan: sanksi.laporan._id,
       _id: sanksi._id,
       ['pengajuan.banding']: { $exists: true, $ne: null },
-      ['pengajuan.cabut_sanksi']: {
-        $exists: false,
-        $eq: null,
-      },
+      // ['pengajuan.cabut_sanksi']: {
+      //   $exists: false,
+      //   $eq: null,
+      // },
     },
     {
       $push: {