Merge branch 'develop' into adiDev

# Conflicts:
#	src/controllers/CommandController.ts

src/controllers/CommandController.ts

@@ -1263,6 +1263,7 @@ export class CommandController extends Controller {
     });
 
     const adminToken = response.data.access_token;
+    
     command.forEach(async (x) => {
       const path = commandTypePath(x.commandType.code);
       if (path == null) throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบประเภทคำสั่งนี้ในระบบ");

src/controllers/LoginController.ts

@@ -37,7 +37,7 @@ export class LoginController extends Controller {
     let _data: any = null;
     await Promise.all([
       await new CallAPI()
-        .PostDataKeycloak(`/realms/${process.env.KC_REALM}/protocol/openid-connect/token`, data)
+        .PostDataKeycloak(`/realms/${process.env.KC_REALMS}/protocol/openid-connect/token`, data)
         .then(async (x) => {
           _data = x;
         })