Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cd4cdaf7f7 | ||
|
|
86c0787ee0 |
@@ -1,11 +0,0 @@
|
|||||||
<hr/>
|
|
||||||
test
|
|
||||||
<hr/>
|
|
||||||
<cfflush/>
|
|
||||||
<!--- <cftry>
|
|
||||||
<cfdump var=#session#/>
|
|
||||||
<cfcatch type="any"><cfdump var=#cfcatch#/></cfcatch>
|
|
||||||
</cftry> --->
|
|
||||||
|
|
||||||
<cfmodule template="mod/crm_contract.cfm" wz="WZ01348"/>
|
|
||||||
<cfdump var=#qComponent#/>
|
|
||||||
+2
-2
@@ -27,7 +27,7 @@
|
|||||||
<cfset this.idpCertUrl = "https://keycloak.nubes.ru/realms/cloud/protocol/openid-connect/certs" />
|
<cfset this.idpCertUrl = "https://keycloak.nubes.ru/realms/cloud/protocol/openid-connect/certs" />
|
||||||
<cfset this.client_secret = createObject("java", "java.lang.System").getEnv("IDP_CLIENT_SECRET")/>
|
<cfset this.client_secret = createObject("java", "java.lang.System").getEnv("IDP_CLIENT_SECRET")/>
|
||||||
<!--- <cfset this.iam_url = "https://auth-api.ngcloud.ru/api/v1/auth/user"/> --->
|
<!--- <cfset this.iam_url = "https://auth-api.ngcloud.ru/api/v1/auth/user"/> --->
|
||||||
<cfset this.iamServiceUrl = "https://auth-api-dev.ngcloud.ru/api/v1/auth/user "/>
|
<cfset this.iamServiceUrl = "https://auth-api.ngcloud.ru/api/v1/auth/user "/>
|
||||||
<cfset this.redirect_uri = "https://#CGI.SERVER_NAME##CGI.SCRIPT_NAME#"/><!--- куда возвращаться от IDP --->
|
<cfset this.redirect_uri = "https://#CGI.SERVER_NAME##CGI.SCRIPT_NAME#"/><!--- куда возвращаться от IDP --->
|
||||||
<cfset this.crm_cache_host = "elma-cache.adl.nubes.ru"/><!--- *** почему-то приходится устанавливать серт sslCertificateInstall, иначе не коннектится --->
|
<cfset this.crm_cache_host = "elma-cache.adl.nubes.ru"/><!--- *** почему-то приходится устанавливать серт sslCertificateInstall, иначе не коннектится --->
|
||||||
<cfset request.crm_cache_base = "https://#this.crm_cache_host#/contract_ls.cfm"/>
|
<cfset request.crm_cache_base = "https://#this.crm_cache_host#/contract_ls.cfm"/>
|
||||||
@@ -109,7 +109,7 @@
|
|||||||
|
|
||||||
<!--- global settings --->
|
<!--- global settings --->
|
||||||
<!--- *************************************************************************************************************** --->
|
<!--- *************************************************************************************************************** --->
|
||||||
<cfset request.APP_VERSION="0.00.038"/><!--- ************************************************************************ --->
|
<cfset request.APP_VERSION="0.00.040"/><!--- ************************************************************************ --->
|
||||||
<!--- *************************************************************************************************************** --->
|
<!--- *************************************************************************************************************** --->
|
||||||
<cfheader name="X-Application-Version" value=#request.APP_VERSION#/>
|
<cfheader name="X-Application-Version" value=#request.APP_VERSION#/>
|
||||||
<cfset request.STAND=getStand()/>
|
<cfset request.STAND=getStand()/>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
component {
|
component {
|
||||||
|
/*0.03 precision fix*/
|
||||||
/*0.02 timestamp support*/
|
/*0.02 timestamp support*/
|
||||||
/**
|
/**
|
||||||
* HSQL 1.8
|
* HSQL 1.8
|
||||||
@@ -33,6 +34,7 @@ component {
|
|||||||
CREATE TEMPORARY TABLE #arguments.name#(#arrayToList(colDefs, ', ')#) ON COMMIT PRESERVE ROWS";
|
CREATE TEMPORARY TABLE #arguments.name#(#arrayToList(colDefs, ', ')#) ON COMMIT PRESERVE ROWS";
|
||||||
queryExecute(createSql, {}, { datasource: arguments.dsn });
|
queryExecute(createSql, {}, { datasource: arguments.dsn });
|
||||||
//}
|
//}
|
||||||
|
//writedump(meta); writedump(createSql);abort;
|
||||||
|
|
||||||
// 2. Цикл вставки
|
// 2. Цикл вставки
|
||||||
var insertSql = "INSERT INTO #arguments.name# (#cols#) VALUES (#repeatString("?,", listLen(cols)-1)#?)";
|
var insertSql = "INSERT INTO #arguments.name# (#cols#) VALUES (#repeatString("?,", listLen(cols)-1)#?)";
|
||||||
@@ -65,10 +67,11 @@ component {
|
|||||||
private string function mapType(required string luceeType) {
|
private string function mapType(required string luceeType) {
|
||||||
switch (arguments.luceeType) {
|
switch (arguments.luceeType) {
|
||||||
case "VARCHAR": case "CHAR": case "LONGVARCHAR": return "LONGVARCHAR";
|
case "VARCHAR": case "CHAR": case "LONGVARCHAR": return "LONGVARCHAR";
|
||||||
case "INTEGER": case "BIGINT": case "SMALLINT": case "TINYINT": return "INT";
|
case "INTEGER": case "SMALLINT": case "TINYINT": return "INT";
|
||||||
|
case "BIGINT": return "BIGINT";
|
||||||
case "DOUBLE": case "FLOAT": case "REAL": return "DOUBLE";
|
case "DOUBLE": case "FLOAT": case "REAL": return "DOUBLE";
|
||||||
case "BOOLEAN": case "BIT": return "BIT";
|
case "BOOLEAN": case "BIT": return "BIT";
|
||||||
case "DECIMAL": case "NUMERIC": return "DECIMAL(20,6)";
|
case "DECIMAL": case "NUMERIC": return "DECIMAL";
|
||||||
case "TIMESTAMP": case "DATE": case "TIME": return "TIMESTAMP";
|
case "TIMESTAMP": case "DATE": case "TIME": return "TIMESTAMP";
|
||||||
default: return "LONGVARCHAR"; // И тут тоже
|
default: return "LONGVARCHAR"; // И тут тоже
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user