This commit is contained in:
msyu
2024-10-26 11:06:02 +03:00
parent a317828de2
commit 5580b68038
+14 -2
View File
@@ -84,9 +84,21 @@
request.ANONYMOUS_USR_ID=2; request.ANONYMOUS_USR_ID=2;
request.GUEST_USR_ID=3; request.GUEST_USR_ID=3;
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
request.ORCHESTRATOR_AUTH="Basic c3ZjX2xrdGVzdDoxMTgzZDIyNzc1OWExYjFkZmVjM2M3NTFiMzIyNzdiYTQ3"; //*** времянка, дубль из корневого Application.cfm
request.ORCHESTRATOR_AUTH = createObject("java", "java.lang.System").getEnv("ORCHESTRATOR_AUTH");
if (isNull(request.ORCHESTRATOR_AUTH)) {
request.ORCHESTRATOR_AUTH = "Basic c3ZjX2xrdGVzdDoxMTgzZDIyNzc1OWExYjFkZmVjM2M3NTFiMzIyNzdiYTQ3";//*** времянка, дубль из корневого Application.cfm
}
//почему-то scope this ведет себя совершенно не так, как request и variables
// в нем переменная имеет значение Empty:null и можно выполнить writedump, а в других получаем ошибку, что такой переменной нет
</cfscript> </cfscript>
<!--- <cfset this.orchestrator_authorization_string=createObject("java", "java.lang.System").getEnv("ORCHESTRATOR_AUTH")/>
<cfif isEmpty(this.orchestrator_authorization_string)>
<cfset this.orchestrator_authorization_string = "Basic c3ZjX2xrdGVzdDoxMTgzZDIyNzc1OWExYjFkZmVjM2M3NTFiMzIyNzdiYTQ3"/><!--- *** remove --->
</cfif> --->
<cffunction name="onApplicationStart"> <cffunction name="onApplicationStart">
<!--- <cfset application.dbUser = "username" /> <!--- <cfset application.dbUser = "username" />
@@ -137,7 +149,7 @@
//if (UCase(arguments.verb) EQ 'OPTIONS') return newRepresentation().noData().withStatus("204","No Data").withHeaders({"Content-Type":"application/json;charset=utf-8"}); //if (UCase(arguments.verb) EQ 'OPTIONS') return newRepresentation().noData().withStatus("204","No Data").withHeaders({"Content-Type":"application/json;charset=utf-8"});
if (UCase(arguments.verb) EQ 'OPTIONS') return true; if (UCase(arguments.verb) EQ 'OPTIONS') return true;
return true;
var auth=""; var auth="";
if (structKeyExists(headers,"Authorization")) { if (structKeyExists(headers,"Authorization")) {
auth=headers.Authorization; auth=headers.Authorization;