diff --git a/microservices/S3Bucket/appsettings.json b/microservices/S3Bucket/appsettings.json index 02070bf..c1d8ed8 100644 --- a/microservices/S3Bucket/appsettings.json +++ b/microservices/S3Bucket/appsettings.json @@ -9,10 +9,10 @@ "AllowedHosts": "*", "ConnectionStrings": { //Production connection string - "DefaultConnectionString": "BTG3gPH/5QU/Ziaw9qfFcCR7n1uQ58BpJeY2enHpagQNiaQohW6//faJRPLyjzLzsufkT3kcnHv7+P6DKFrnahIHTFJAhmPTRfVppxEotvCAmd6bHfq7IT9UhGEAzJkEldkpRe780FaHNfmer6pIGhS9P15G2ZrP99vd3Pxu/nUyBcoKTbo40I7lKUQJ4gRUZbWjjD/bjwMFs9ouKC7CDQ==" + "DefaultConnectionString": "wB5dpl3FEA6ZAZOKD3hmWgcwfHESYidkz0oW18Dund4RTe6vT9K1J+zZDUHdzJ8wagNAz/ZVQB6oKhRqa3fqNHtUEf0jAHTCHvSO5Z07gYu9sE02tGerCvZydVR5f/AmwMNa34wHBEA1ASXgo38i+u0Y7iq3LUM/OJI/oevkYec5f6TzJmqPdrEOKRkwsWgDbXos96cVqEliCAt2BVpR8g==" //Staging Connection String - //"DefaultConnectionString": "3O5IBcQilkuCpSiL2/78srPWCHpYVGryBrDmdDH7ymmzevrvLYfgEbsScCZKknceXynyLeTn/5v0PJ4ddIyj6xF/wS+l7ElwqwaaGlpVEFNG4RetA1YQ/dKg92Y9czBU9QeEkT7DVwsBpb4LX+3X0uOd0VlQYhIQ1bmF0YNmlubv3O0k8c4UFM8sVzPexSIx8JuqhjWgfDw5sAgyKqvg/Q==" + //"DefaultConnectionString": "7D8cq/bCLiMdJBw4FlTpea3Px4UJryffPEqWW88xDv1O/+zyh60HU73a39dR3fjQq0XLZq4QNchqsX++Anqj+upqfqYpEwb+omIWLOQ/qt21Ms9yUYjS+3xA8ixtr6c3RBzbJxLr9oRrvnXhmCi1jOnoJAS5UaNC4ObKtK2nSa193lLyh8d95hSlSZOqcde2UKLDMVN85V9BDElPzhiX8A==" }, "Jwt": { "Key": "THIS_IS_ODIWARE_SECRET_KEY", diff --git a/microservices/_layers/common/StartupExtensions.cs b/microservices/_layers/common/StartupExtensions.cs index c690c33..1ca7ec2 100644 --- a/microservices/_layers/common/StartupExtensions.cs +++ b/microservices/_layers/common/StartupExtensions.cs @@ -13,10 +13,11 @@ namespace OnlineAssessment /// public static IServiceCollection AddDbConnections(this IServiceCollection services, IConfiguration configuration) { - - string connString1 = @"Server=94.249.213.139;Database=OA_STAGING;User Id=sa;Password=Odiware@1234!;TrustServerCertificate=True;MultipleActiveResultSets=true"; - string connection1 = AesEncryptionHelper.Encrypt(connString1); - + //=================================== + //string connString1 = @"Server=94.249.213.139;Database=OA_STAGING;User Id=odiware;Password=HariHara@1234!;TrustServerCertificate=True;MultipleActiveResultSets=true"; + //string connection1 = AesEncryptionHelper.Encrypt(connString1); + //string connection2 = AesEncryptionHelper.Decrypt(connection1); + //=================================== string connString = configuration.GetConnectionString("DefaultConnectionString"); string connection = AesEncryptionHelper.Decrypt(connString); diff --git a/microservices/_layers/data/EFCore/EfCoreCommonRepository.cs b/microservices/_layers/data/EFCore/EfCoreCommonRepository.cs index 5b89249..b3b425d 100644 --- a/microservices/_layers/data/EFCore/EfCoreCommonRepository.cs +++ b/microservices/_layers/data/EFCore/EfCoreCommonRepository.cs @@ -1235,8 +1235,8 @@ namespace OnlineAssessment.Data.EFCore //examDetail.points_needed = (short)item.e.CreditsNeeded; //examDetail.points_available = myExamPoints; var latestAttempt = _context.ExamAttempts - .Where(a => a.ExamId == item.e.Id && a.CreatedBy == user_id) - .OrderByDescending(a => a.CreatedOn) + .Where(a => a.ExamId == item.e.Id && a.CreatedBy == user_id) + .OrderByDescending(a => a.CreatedOn) .FirstOrDefault(); if (latestAttempt != null) diff --git a/microservices/admin/appsettings.json b/microservices/admin/appsettings.json index a65d93f..522323c 100644 --- a/microservices/admin/appsettings.json +++ b/microservices/admin/appsettings.json @@ -9,10 +9,10 @@ "AllowedHosts": "*", "ConnectionStrings": { //Production connection string - "DefaultConnectionString": "BTG3gPH/5QU/Ziaw9qfFcCR7n1uQ58BpJeY2enHpagQNiaQohW6//faJRPLyjzLzsufkT3kcnHv7+P6DKFrnahIHTFJAhmPTRfVppxEotvCAmd6bHfq7IT9UhGEAzJkEldkpRe780FaHNfmer6pIGhS9P15G2ZrP99vd3Pxu/nUyBcoKTbo40I7lKUQJ4gRUZbWjjD/bjwMFs9ouKC7CDQ==" + "DefaultConnectionString": "wB5dpl3FEA6ZAZOKD3hmWgcwfHESYidkz0oW18Dund4RTe6vT9K1J+zZDUHdzJ8wagNAz/ZVQB6oKhRqa3fqNHtUEf0jAHTCHvSO5Z07gYu9sE02tGerCvZydVR5f/AmwMNa34wHBEA1ASXgo38i+u0Y7iq3LUM/OJI/oevkYec5f6TzJmqPdrEOKRkwsWgDbXos96cVqEliCAt2BVpR8g==" //Staging Connection String - //"DefaultConnectionString": "3O5IBcQilkuCpSiL2/78srPWCHpYVGryBrDmdDH7ymmzevrvLYfgEbsScCZKknceXynyLeTn/5v0PJ4ddIyj6xF/wS+l7ElwqwaaGlpVEFNG4RetA1YQ/dKg92Y9czBU9QeEkT7DVwsBpb4LX+3X0uOd0VlQYhIQ1bmF0YNmlubv3O0k8c4UFM8sVzPexSIx8JuqhjWgfDw5sAgyKqvg/Q==" + //"DefaultConnectionString": "7D8cq/bCLiMdJBw4FlTpea3Px4UJryffPEqWW88xDv1O/+zyh60HU73a39dR3fjQq0XLZq4QNchqsX++Anqj+upqfqYpEwb+omIWLOQ/qt21Ms9yUYjS+3xA8ixtr6c3RBzbJxLr9oRrvnXhmCi1jOnoJAS5UaNC4ObKtK2nSa193lLyh8d95hSlSZOqcde2UKLDMVN85V9BDElPzhiX8A==" }, "Jwt": { "Key": "THIS_IS_ODIWARE_SECRET_KEY", diff --git a/microservices/institute/appsettings.json b/microservices/institute/appsettings.json index a65d93f..522323c 100644 --- a/microservices/institute/appsettings.json +++ b/microservices/institute/appsettings.json @@ -9,10 +9,10 @@ "AllowedHosts": "*", "ConnectionStrings": { //Production connection string - "DefaultConnectionString": "BTG3gPH/5QU/Ziaw9qfFcCR7n1uQ58BpJeY2enHpagQNiaQohW6//faJRPLyjzLzsufkT3kcnHv7+P6DKFrnahIHTFJAhmPTRfVppxEotvCAmd6bHfq7IT9UhGEAzJkEldkpRe780FaHNfmer6pIGhS9P15G2ZrP99vd3Pxu/nUyBcoKTbo40I7lKUQJ4gRUZbWjjD/bjwMFs9ouKC7CDQ==" + "DefaultConnectionString": "wB5dpl3FEA6ZAZOKD3hmWgcwfHESYidkz0oW18Dund4RTe6vT9K1J+zZDUHdzJ8wagNAz/ZVQB6oKhRqa3fqNHtUEf0jAHTCHvSO5Z07gYu9sE02tGerCvZydVR5f/AmwMNa34wHBEA1ASXgo38i+u0Y7iq3LUM/OJI/oevkYec5f6TzJmqPdrEOKRkwsWgDbXos96cVqEliCAt2BVpR8g==" //Staging Connection String - //"DefaultConnectionString": "3O5IBcQilkuCpSiL2/78srPWCHpYVGryBrDmdDH7ymmzevrvLYfgEbsScCZKknceXynyLeTn/5v0PJ4ddIyj6xF/wS+l7ElwqwaaGlpVEFNG4RetA1YQ/dKg92Y9czBU9QeEkT7DVwsBpb4LX+3X0uOd0VlQYhIQ1bmF0YNmlubv3O0k8c4UFM8sVzPexSIx8JuqhjWgfDw5sAgyKqvg/Q==" + //"DefaultConnectionString": "7D8cq/bCLiMdJBw4FlTpea3Px4UJryffPEqWW88xDv1O/+zyh60HU73a39dR3fjQq0XLZq4QNchqsX++Anqj+upqfqYpEwb+omIWLOQ/qt21Ms9yUYjS+3xA8ixtr6c3RBzbJxLr9oRrvnXhmCi1jOnoJAS5UaNC4ObKtK2nSa193lLyh8d95hSlSZOqcde2UKLDMVN85V9BDElPzhiX8A==" }, "Jwt": { "Key": "THIS_IS_ODIWARE_SECRET_KEY", diff --git a/microservices/student/API.Student.csproj b/microservices/student/API.Student.csproj index 5982c20..2b79251 100644 --- a/microservices/student/API.Student.csproj +++ b/microservices/student/API.Student.csproj @@ -2,7 +2,7 @@ net9.0 - 1.0.0.0 + 1.0.0.1 Preetisagar Parida, Kishor Tripathy Odiware Technologies OnlineAssessment Web API diff --git a/microservices/student/appsettings.json b/microservices/student/appsettings.json index a65d93f..522323c 100644 --- a/microservices/student/appsettings.json +++ b/microservices/student/appsettings.json @@ -9,10 +9,10 @@ "AllowedHosts": "*", "ConnectionStrings": { //Production connection string - "DefaultConnectionString": "BTG3gPH/5QU/Ziaw9qfFcCR7n1uQ58BpJeY2enHpagQNiaQohW6//faJRPLyjzLzsufkT3kcnHv7+P6DKFrnahIHTFJAhmPTRfVppxEotvCAmd6bHfq7IT9UhGEAzJkEldkpRe780FaHNfmer6pIGhS9P15G2ZrP99vd3Pxu/nUyBcoKTbo40I7lKUQJ4gRUZbWjjD/bjwMFs9ouKC7CDQ==" + "DefaultConnectionString": "wB5dpl3FEA6ZAZOKD3hmWgcwfHESYidkz0oW18Dund4RTe6vT9K1J+zZDUHdzJ8wagNAz/ZVQB6oKhRqa3fqNHtUEf0jAHTCHvSO5Z07gYu9sE02tGerCvZydVR5f/AmwMNa34wHBEA1ASXgo38i+u0Y7iq3LUM/OJI/oevkYec5f6TzJmqPdrEOKRkwsWgDbXos96cVqEliCAt2BVpR8g==" //Staging Connection String - //"DefaultConnectionString": "3O5IBcQilkuCpSiL2/78srPWCHpYVGryBrDmdDH7ymmzevrvLYfgEbsScCZKknceXynyLeTn/5v0PJ4ddIyj6xF/wS+l7ElwqwaaGlpVEFNG4RetA1YQ/dKg92Y9czBU9QeEkT7DVwsBpb4LX+3X0uOd0VlQYhIQ1bmF0YNmlubv3O0k8c4UFM8sVzPexSIx8JuqhjWgfDw5sAgyKqvg/Q==" + //"DefaultConnectionString": "7D8cq/bCLiMdJBw4FlTpea3Px4UJryffPEqWW88xDv1O/+zyh60HU73a39dR3fjQq0XLZq4QNchqsX++Anqj+upqfqYpEwb+omIWLOQ/qt21Ms9yUYjS+3xA8ixtr6c3RBzbJxLr9oRrvnXhmCi1jOnoJAS5UaNC4ObKtK2nSa193lLyh8d95hSlSZOqcde2UKLDMVN85V9BDElPzhiX8A==" }, "Jwt": { "Key": "THIS_IS_ODIWARE_SECRET_KEY", diff --git a/microservices/teacher/appsettings.json b/microservices/teacher/appsettings.json index a65d93f..522323c 100644 --- a/microservices/teacher/appsettings.json +++ b/microservices/teacher/appsettings.json @@ -9,10 +9,10 @@ "AllowedHosts": "*", "ConnectionStrings": { //Production connection string - "DefaultConnectionString": "BTG3gPH/5QU/Ziaw9qfFcCR7n1uQ58BpJeY2enHpagQNiaQohW6//faJRPLyjzLzsufkT3kcnHv7+P6DKFrnahIHTFJAhmPTRfVppxEotvCAmd6bHfq7IT9UhGEAzJkEldkpRe780FaHNfmer6pIGhS9P15G2ZrP99vd3Pxu/nUyBcoKTbo40I7lKUQJ4gRUZbWjjD/bjwMFs9ouKC7CDQ==" + "DefaultConnectionString": "wB5dpl3FEA6ZAZOKD3hmWgcwfHESYidkz0oW18Dund4RTe6vT9K1J+zZDUHdzJ8wagNAz/ZVQB6oKhRqa3fqNHtUEf0jAHTCHvSO5Z07gYu9sE02tGerCvZydVR5f/AmwMNa34wHBEA1ASXgo38i+u0Y7iq3LUM/OJI/oevkYec5f6TzJmqPdrEOKRkwsWgDbXos96cVqEliCAt2BVpR8g==" //Staging Connection String - //"DefaultConnectionString": "3O5IBcQilkuCpSiL2/78srPWCHpYVGryBrDmdDH7ymmzevrvLYfgEbsScCZKknceXynyLeTn/5v0PJ4ddIyj6xF/wS+l7ElwqwaaGlpVEFNG4RetA1YQ/dKg92Y9czBU9QeEkT7DVwsBpb4LX+3X0uOd0VlQYhIQ1bmF0YNmlubv3O0k8c4UFM8sVzPexSIx8JuqhjWgfDw5sAgyKqvg/Q==" + //"DefaultConnectionString": "7D8cq/bCLiMdJBw4FlTpea3Px4UJryffPEqWW88xDv1O/+zyh60HU73a39dR3fjQq0XLZq4QNchqsX++Anqj+upqfqYpEwb+omIWLOQ/qt21Ms9yUYjS+3xA8ixtr6c3RBzbJxLr9oRrvnXhmCi1jOnoJAS5UaNC4ObKtK2nSa193lLyh8d95hSlSZOqcde2UKLDMVN85V9BDElPzhiX8A==" }, "Jwt": { "Key": "THIS_IS_ODIWARE_SECRET_KEY", diff --git a/microservices/user/appsettings.json b/microservices/user/appsettings.json index 88981e8..fa2a2d6 100644 --- a/microservices/user/appsettings.json +++ b/microservices/user/appsettings.json @@ -5,10 +5,10 @@ "AllowedHosts": "*", "ConnectionStrings": { //Production connection string - "DefaultConnectionString": "BTG3gPH/5QU/Ziaw9qfFcCR7n1uQ58BpJeY2enHpagQNiaQohW6//faJRPLyjzLzsufkT3kcnHv7+P6DKFrnahIHTFJAhmPTRfVppxEotvCAmd6bHfq7IT9UhGEAzJkEldkpRe780FaHNfmer6pIGhS9P15G2ZrP99vd3Pxu/nUyBcoKTbo40I7lKUQJ4gRUZbWjjD/bjwMFs9ouKC7CDQ==" + "DefaultConnectionString": "wB5dpl3FEA6ZAZOKD3hmWgcwfHESYidkz0oW18Dund4RTe6vT9K1J+zZDUHdzJ8wagNAz/ZVQB6oKhRqa3fqNHtUEf0jAHTCHvSO5Z07gYu9sE02tGerCvZydVR5f/AmwMNa34wHBEA1ASXgo38i+u0Y7iq3LUM/OJI/oevkYec5f6TzJmqPdrEOKRkwsWgDbXos96cVqEliCAt2BVpR8g==" //Staging Connection String - //"DefaultConnectionString": "3O5IBcQilkuCpSiL2/78srPWCHpYVGryBrDmdDH7ymmzevrvLYfgEbsScCZKknceXynyLeTn/5v0PJ4ddIyj6xF/wS+l7ElwqwaaGlpVEFNG4RetA1YQ/dKg92Y9czBU9QeEkT7DVwsBpb4LX+3X0uOd0VlQYhIQ1bmF0YNmlubv3O0k8c4UFM8sVzPexSIx8JuqhjWgfDw5sAgyKqvg/Q==" + //"DefaultConnectionString": "7D8cq/bCLiMdJBw4FlTpea3Px4UJryffPEqWW88xDv1O/+zyh60HU73a39dR3fjQq0XLZq4QNchqsX++Anqj+upqfqYpEwb+omIWLOQ/qt21Ms9yUYjS+3xA8ixtr6c3RBzbJxLr9oRrvnXhmCi1jOnoJAS5UaNC4ObKtK2nSa193lLyh8d95hSlSZOqcde2UKLDMVN85V9BDElPzhiX8A==" }, "Jwt": { "Key": "THIS_IS_ODIWARE_SECRET_KEY",