Skip to content

Commit aa8bd2f

Browse files
author
K
committed
RabbitMQ Support removed.
1 parent cef9ec1 commit aa8bd2f

File tree

3 files changed

+11
-60
lines changed

3 files changed

+11
-60
lines changed

‎CodeGenerator/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/bin/

‎CodeGenerator/Program.cs‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,7 +1174,7 @@ static string GeneratePassword()
11741174

11751175
return new string(passwordArray);
11761176
}
1177-
public static void ProcessFiles(string adminUsername, string adminPassword, string path, string server, string uid, string username, string password, string databaseName, string script, string statusOfGeneration, string projectName, string DBexists, string port, string rabbitMQConn, string noderedurl, string swgurl,string project_id,IGeneratorManager generatorManager)
1177+
public static void ProcessFiles(string adminUsername, string adminPassword, string path, string server, string uid, string username, string password, string databaseName, string script, string statusOfGeneration, string projectName, string DBexists, string port, string rabbitMQConn, string noderedurl, string swgurl,string project_id)
11781178
{
11791179
try
11801180
{
@@ -1373,7 +1373,7 @@ SIGNAL SQLSTATE '45000'
13731373
username = adminUsername,
13741374
password = adminPassword
13751375
};
1376-
generatorManager.send_to_consumer(masterCredentialModel);
1376+
13771377
connection_string += "database=" + databaseName + ";";
13781378
string conn1 = connection_string;
13791379
string createTableSql = "CREATE TABLE IF NOT EXISTS messageQueue (id INT AUTO_INCREMENT PRIMARY KEY, queueName VARCHAR(255) Unique,PrimaryKey VARCHAR(255))";
@@ -2962,17 +2962,7 @@ public static void Main(string[] args)
29622962
.SetBasePath(Directory.GetCurrentDirectory())
29632963
.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
29642964
.Build();
2965-
string rabbitMqConnection = configuration.GetConnectionString("RabitMQ");
2966-
//services.AddTransient(_ => new RabbitMqConnection(rabbitMqConnection));
2967-
ConnectionFactory factory = new ConnectionFactory();
2968-
factory.Uri = new Uri(rabbitMqConnection);
2969-
IConnection connection = factory.CreateConnection();
2970-
services.AddScoped<IRabitMQAsyncProducer, RabitMQAsyncProducer>();
2971-
services.AddTransient<IChannelManager, ChannelManager>();
2972-
services.AddSingleton<IConnection>(connection);
2973-
services.AddTransient<IGeneratorManager, GeneratorManager>();
2974-
var serviceProvider = services.BuildServiceProvider();
2975-
var generatorManager = serviceProvider.GetService<IGeneratorManager>();
2965+
29762966
string parameter = Environment.GetEnvironmentVariable("PARAMETER");
29772967
Console.WriteLine("parameter:" + parameter);
29782968
// Define a regular expression pattern to match key-value pairs
@@ -3255,7 +3245,7 @@ public static void Main(string[] args)
32553245
kubectlProcess.BeginErrorReadLine();
32563246
string adminUsername = GenerateUsername();
32573247
string adminPassword = GeneratePassword();
3258-
DotNet_MySQL.DotNet_MySQL_Template(adminUsername, adminPassword,server, uid, username, password, databaseName, script, statusOfGeneration, projectName, DBexists, port, rabbitMQConn, Technology_Frontend, Baackend_technology, projectType, noderedurl, swgurl,project_id,generatorManager);
3248+
DotNet_MySQL.DotNet_MySQL_Template(adminUsername, adminPassword,server, uid, username, password, databaseName, script, statusOfGeneration, projectName, DBexists, port, rabbitMQConn, Technology_Frontend, Baackend_technology, projectType, noderedurl, swgurl,project_id);
32593249
string[] drpath = Directory.GetDirectories("/", (uid + "_*"));
32603250
string fname = drpath[0].Split("/").Last();
32613251
string[] upt = Directory.GetFiles($"/{fname}/{projectName}/zip/", "generatedBackend*.zip");
@@ -3283,7 +3273,7 @@ public static void Main(string[] args)
32833273
link = link,
32843274
is_successful = 1
32853275
};
3286-
generatorManager.send_to_consumer(generatorResponseModel);
3276+
32873277
}
32883278
else
32893279
{
@@ -3295,7 +3285,7 @@ public static void Main(string[] args)
32953285
error_log = errors_list,
32963286
is_successful = 0
32973287
};
3298-
generatorManager.send_to_consumer(generatorResponseModel);
3288+
32993289
}
33003290
}
33013291
catch (Exception ex)
@@ -3310,7 +3300,7 @@ public static void Main(string[] args)
33103300
error_log = errors_list,
33113301
is_successful = 0
33123302
};
3313-
generatorManager.send_to_consumer(generatorResponseModel);
3303+
33143304
}
33153305

33163306
}
@@ -3508,7 +3498,7 @@ public static void Main(string[] args)
35083498
}
35093499
class DotNet_MySQL : Program
35103500
{
3511-
public static void DotNet_MySQL_Template(string adminUsername, string adminPassword, string server, string uid, string username, string password, string databaseName, string script, string statusOfGeneration, string projectName, string DBexists, string port, string rabbitMQConn, string frontEndTechnology, string backendTechnology, string projectType, string noderedurl, string swgurl,string project_id,IGeneratorManager generatorManager)
3501+
public static void DotNet_MySQL_Template(string adminUsername, string adminPassword, string server, string uid, string username, string password, string databaseName, string script, string statusOfGeneration, string projectName, string DBexists, string port, string rabbitMQConn, string frontEndTechnology, string backendTechnology, string projectType, string noderedurl, string swgurl,string project_id)
35123502
{
35133503
try
35143504
{
@@ -3725,7 +3715,7 @@ PRIMARY KEY (`workflow_trigger_id`),
37253715
//}
37263716
ProcessFiles( adminUsername, adminPassword, @currentDir, server, uid, username, password, databaseName,
37273717
script, statusOfGeneration, projectName, DBexists, port,
3728-
rabbitMQConn, noderedurl, swgurl,project_id,generatorManager);
3718+
rabbitMQConn, noderedurl, swgurl,project_id);
37293719

37303720
// ProcessFiles(@currentDir, "localhost", "", "root", "", "myeshopAPI",
37313721
// "http://localhost/sqlScript/myeshop.sql", "", "myeshopAPI", "YES",

‎CodeGenerator/Properties/launchSettings.json‎

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3,47 +3,7 @@
33
"NoCodeAppGenerator": {
44
"commandName": "Project",
55
"environmentVariables": {
6-
"PARAMETER": "{project_id:919,server:localhost,uid:1,username:root,password:,databaseName:splitbill,script:http://localhost/splitbill_sqlscript.sql,statusOfGeneration:null,projectName:ContentPlannertest,DBexists:YES,port:3306,rabbitMQConn:amqp://user30037:***@172.178.58.89:30158/,redisConn:172.178.58.89:31158,password=password30037,apiflowurl:,fronttemplateurl:null,Technology_Frontend:ReactTs,Backend_technology:null,buttonClicked:Generate,projectType:dnd,swgurl:null,noderedurl:null}",
7-
8-
9-
// "PARAMETER": "{project_id:643,server:localhost,uid:1,username:root,password:,databaseName:test3,script:https://nyc3.digitaloceanspaces.com/nocodes3dev/466/pfmscript_script_20230828162610360.sql?AWSAccessKeyId=DO0089PZREULYLFACQZJ&Expires=1693243568&Signature=XLflrpBvo73%2BcMA4A6LmKn0Flvs%3D,statusOfGeneration:null,projectName:Chatbottest,DBexists:NO,port:3306,rabbitMQConn:amqp://user29983:***@20.232.143.107:30104/,redisConn:20.232.143.107:31104,password=password29983,Technology_Frontend:ReactJs,Backend_technology:null,buttonClicked:Generate,projectType:dnd,swgurl:https://cbt1.neoapps.ai/backend/v1/api,noderedurl:https://cbt1.neoapps.ai/nodered}",
10-
//"PARAMETER": "{project_id:643,server:neoappsiodev.mysql.database.azure.com,uid:1,username:User_466,password:User_466@pfm_466,databaseName:pfm_466,script:null,statusOfGeneration:null,projectName:Chatbottest,DBexists:YES,port:3306,rabbitMQConn:https://cbt1.neoapps.ai/backend/v1/api,redisConn:null,Technology_Frontend:ReactTs,Backend_technology:null,buttonClicked:Generate,projectType:dnd,swgurl:null,noderedurl:null}",
11-
//"PARAMETER": "{project_id:826,server:neoappsiodev.mysql.database.azure.com,uid:1,username:User_511,password:User_511@split17Db826_511,databaseName:split17Db826_511,script:null,statusOfGeneration:null,projectName:Split17,DBexists:YES,port:3306,rabbitMQConn:https://split17.neoapps.ai/backend/v1/api,redisConn:null,apiflowurl:,fronttemplateurl:https://nyc3.digitaloceanspaces.com/nocodes3dev/196/196_frontendTemplateURL_20231213122101517.json?AWSAccessKeyId=DO0089PZREULYLFACQZJ&Expires=1702451462&Signature=JlT60hFCaurVciXVvWQvOfhAHZE%3D,Technology_Frontend:ReactTs,Backend_technology:null,buttonClicked:Generate,projectType:dnd,swgurl:null,noderedurl:null}",
12-
//"PARAMETER": "{project_id:828,server:localhost,uid:1,username:root,password:,databaseName:splitbill,script:null,statusOfGeneration:null,projectName:Split17,DBexists:YES,port:3306,rabbitMQConn:https://split17.neoapps.ai/backend/v1/api,redisConn:null,apiflowurl:,fronttemplateurl:,Technology_Frontend:ReactTs,Backend_technology:null,buttonClicked:Generate,projectType:dnd,swgurl:null,noderedurl:null}",
13-
//"PARAMETER": "{project_id:828,server:neoappsiodev.mysql.database.azure.com,uid:1,username:User_512,password:User_512@surevyBuilder1_512,databaseName:surevyBuilder1_512,script:null,statusOfGeneration:null,projectName:SurveyBuilder1,DBexists:YES,port:3306,rabbitMQConn:https://svb1.neoapps.ai/backend/v1/api,redisConn:null,apiflowurl:,fronttemplateurl:,Technology_Frontend:ReactTs,Backend_technology:null,buttonClicked:Generate,projectType:dnd,swgurl:null,noderedurl:null}",
14-
//"PARAMETER": "{project_id:846,server:localhost,uid:1,username:root,password:,databaseName:splitbill,script:http://localhost/splitbill_sqlscript.sql,statusOfGeneration:null,projectName:Splitdndtest2,DBexists:YES,port:3306,rabbitMQConn:https://splitdndtest2.neoapps.ai/backend/v1/api,redisConn:null,apiflowurl:,fronttemplateurl:,Technology_Frontend:ReactTs,Backend_technology:null,buttonClicked:Generate,projectType:dnd,swgurl:null,noderedurl:null}",
15-
//"PARAMETER": "{project_id:883,server:neoappsiodev.mysql.database.azure.com,uid:1,username:User_528,password:User_528@splittest_528,databaseName:splittest_528,script:http://localhost/splitbill_sqlscript.sql,statusOfGeneration:null,projectName:Splitest,DBexists:NO,port:3306,rabbitMQConn:amqp://user30025:***@172.178.58.89:30146/,redisConn:172.178.58.89:31146,password=password30025,apiflowurl:,fronttemplateurl:null,Technology_Frontend:null,Backend_technology:dotnet,buttonClicked:Generate,projectType:null,swgurl:https://splittestiii.neoapps.ai/backend/v1/api,noderedurl:https://splittestiii.neoapps.ai/nodered}",
16-
//"PARAMETER": "{project_id:826,server:neoappsiodev.mysql.database.azure.com,uid:1,username:User_511,password:User_511@split17Db826_511,databaseName:split17Db826_511,script:http://localhost/splitbill_sqlscript.sql,statusOfGeneration:null,projectName:Split17,DBexists:NO,port:3306,rabbitMQConn:amqp://user30011:***@172.178.58.89:30132/,redisConn:172.178.58.89:31132,password=password30011,apiflowurl:,fronttemplateurl:null,Technology_Frontend:null,Backend_technology:dotnet,buttonClicked:Generate,projectType:null,swgurl:https://split17.neoapps.ai/backend/v1/api,noderedurl:https://split17.neoapps.ai/nodered}",
17-
//"PARAMETER": "{project_id:826,server:neoappsiodev.mysql.database.azure.com,uid:1,username:User_511,password:User_511@split17Db826_511,databaseName:split17Db826_511,script:null,statusOfGeneration:null,projectName:Split17,DBexists:YES,port:3306,rabbitMQConn:https://split17.neoapps.ai/backend/v1/api,redisConn:null,apiflowurl:,fronttemplateurl:https://nyc3.digitaloceanspaces.com/nocodes3dev/202/202_frontendTemplateURL_20231221120632033.json?AWSAccessKeyId=DO0089PZREULYLFACQZJ&Expires=1703141793&Signature=%2B7uJwKge1PUrVwS%2F9rUBI6B1VMo%3D,Technology_Frontend:ReactTs,Backend_technology:null,buttonClicked:Generate,projectType:dnd,swgurl:null,noderedurl:null}",
18-
//"PARAMETER": "{project_id:822,server:localhost,uid:1,username:root,password:,databaseName:surveybuilder,script:http://localhost/splitbill_sqlscript.sql,statusOfGeneration:null,projectName:split13,DBexists:YES,port:3306,rabbitMQConn:amqp://user30007:***@172.178.58.89:30128/,redisConn:172.178.58.89:31128,password=password30007,apiflowurl:,fronttemplateurl:http://localhost/templatejson.txt,Technology_Frontend:ReactTs,Backend_technology:null,buttonClicked:Generate,projectType:dnd,swgurl:null,noderedurl:null}",
19-
//"PARAMETER": "{project_id:828,server:localhost,uid:1,username:root,password:,databaseName:splitbill,script:null,statusOfGeneration:null,projectName:Split17,DBexists:YES,port:3306,rabbitMQConn:https://split17.neoapps.ai/backend/v1/api,redisConn:null,apiflowurl:null,fronttemplateurl:null,Technology_Frontend:ReactTs,Backend_technology:null,buttonClicked:Generate,projectType:nodered,swgurl:null,noderedurl:null}",
20-
21-
"ARG3": "root",
22-
"ARG4": "",
23-
"ARG5": "test",
24-
"ARG6": "blink",
25-
"ARG8": "Onlinemeet",
26-
"ARG9": "YES",
27-
"ARG10": "3306",
28-
//"ARG11": "https://connectionstringtest.neoapps.ai/367/backend/1/v1/api",
29-
"ARG11": "amqp://user29995:[email protected]:31116/",
30-
"ARG13": "Dotnet",
31-
"ARG14": "generate",
32-
"ARG25": "rabbitmq-204-1",
33-
"ARG26": "user29995",
34-
"ARG27": "password29995",
35-
"ARG28": "30116",
36-
"ARG29": "31116",
37-
"ARG2": "1",
38-
"ARG16": "https://nyc3.digitaloceanspaces.com/nocodes3dev/1/150/23/22441/generatedBackend638226863802046121.zip?AWSAccessKeyId=DO0089PZREULYLFACQZJ&Expires=1687090660&Signature=RwXS9bNevgMyNYT2THCMy6uoJrg%3D",
39-
"ARG15": "https://nyc3.digitaloceanspaces.com/nocodes3dev/1/150/23/22441/1_Onlinemeet_generatedFrontend_workflow_638224231361734832.zip?AWSAccessKeyId=DO0089PZREULYLFACQZJ&Expires=1686807442&Signature=rKrobBiTmgWMj1QNo39RAY5F%2Buk%3D",
40-
"ARG17": "/199/frontend/1",
41-
"ARG19": "dop_v1_53ea52811349d42d267f5cb90b0dcb4f79dbe8ede92bb78f778bff53",
42-
"ARG23": "dop_v1_53ea52811349d42d267f5cb90b0dcb4f79dbe8ede92bb78f778bff53",
43-
"ARG22": "dop_v1_53ea52811349d42d267f5cb90b0dcb4f79dbe8ede92bb78f778bff53",
44-
"ARG24": "registry.digitalocean.com",
45-
"ARG20": "latest",
46-
"ARG30": "nodered"
6+
"PARAMETER": "{project_id:1,server:localhost,uid:1,username:root,password:,databaseName:splitthebill,script:http://localhost/split_app_script.sql,statusOfGeneration:null,projectName:ContentPlannerTest,DBexists:No,port:3306,rabbitMQConn:amqp://user12345:12345@localhost:5672/,redisConn:localhost:6379,password=12345,apiflowurl:,fronttemplateurl:,Technology_Frontend:,Backend_technology:dotnet,buttonClicked:generate,projectType:,swgurl:,noderedurl:null}",
477
},
488
"remoteDebugEnabled": false
499
}

0 commit comments

Comments
 (0)