From 1ae7e7db56b64570df6aa0446dab88852254d0b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CNaeel=E2=80=9D?= <tazet@narod.ru>
Date: Thu, 18 Jun 2026 14:00:24 +0400
Subject: [PATCH] =?UTF-8?q?fix:=20Application.cfc=20=D0=BD=D0=B0=20cfset,?=
 =?UTF-8?q?=20=D0=B1=D0=B5=D0=B7=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application.cfc | 55 ++++++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/Application.cfc b/Application.cfc
index caa4626..74cf4fa 100644
--- a/Application.cfc
+++ b/Application.cfc
@@ -1,34 +1,37 @@
-component {
-    this.name = "contractor";
-    this.applicationTimeout = createTimeSpan(0, 0, 3, 0);
-    this.sessionmanagement = true;
-    this.datasource = "baza";
-    this.restEnabled = true;
-    this.restSettings = {skipCFCWithError: true};
+<cfcomponent displayname="Application" output="true">
 
-    // defaults
-    var dbHost = "postgresqlk8s-master.418f9960-2eb7-4429-b2ec-ac64319d7268.svc.cluster.local";
-    var dbPort = "5432";
-    var dbName = "baza";
+    <cfset this.Name = "contractor"/>
+    <cfset this.applicationTimeout = createTimeSpan(0, 0, 3, 0)/>
+    <cfset this.sessionmanagement = true/>
+    <cfset this.datasource = "baza"/>
+    <cfset this.restEnabled = true/>
+    <cfset this.restSettings = {skipCFCWithError: true}/>
 
-    // из env или дефолт
-    var sys = createObject("java", "java.lang.System");
-    var user = sys.getenv("DB_USER");
-    if (isNull(user) || !len(user)) user = "super";
-    var pass = sys.getenv("DB_PASS");
-    if (isNull(pass) || !len(pass)) pass = "hoHdkA23yxlD9oMUlZ1bIbNyc6DE2mNJmyHMNkEpVD1F4suQs7O2lyN4t0qITyzt";
+    <cfset sys = createObject("java", "java.lang.System")/>
 
-    this.datasources["baza"] = {
+    <cfset dbHost = "postgresqlk8s-master.418f9960-2eb7-4429-b2ec-ac64319d7268.svc.cluster.local"/>
+    <cfset dbPort = "5432"/>
+    <cfset dbName = "baza"/>
+
+    <cfset dbUser = sys.getenv("DB_USER")/>
+    <cfif isNull(dbUser) OR NOT len(dbUser)><cfset dbUser = "super"/></cfif>
+
+    <cfset dbPass = sys.getenv("DB_PASS")/>
+    <cfif isNull(dbPass) OR NOT len(dbPass)><cfset dbPass = "hoHdkA23yxlD9oMUlZ1bIbNyc6DE2mNJmyHMNkEpVD1F4suQs7O2lyN4t0qITyzt"/></cfif>
+
+    <cfset this.datasources["baza"] = {
         class: "org.postgresql.Driver",
         bundleName: "org.postgresql.jdbc",
         bundleVersion: "42.6.0",
         connectionString: "jdbc:postgresql://#dbHost#:#dbPort#/#dbName#",
-        username: user,
-        password: pass
-    };
+        username: dbUser,
+        password: dbPass
+    }/>
 
-    function onRequestStart(targetPage) {
-        if (structKeyExists(url, "reload")) applicationStop();
-        return true;
-    }
-}
+    <cffunction name="onRequestStart" access="public" returntype="boolean">
+        <cfargument name="targetPage" type="string" required="true"/>
+        <cfif structKeyExists(url, "reload")><cfset applicationStop()/></cfif>
+        <cfreturn true/>
+    </cffunction>
+
+</cfcomponent>