From 3ab864127c2eae953338457ef91c9446b738568a Mon Sep 17 00:00:00 2001 From: kittapath Date: Sat, 7 Dec 2024 09:34:14 +0700 Subject: [PATCH 1/7] test build discord --- .github/workflows/build-local.yaml | 46 --------------------- .github/workflows/release.yaml | 64 ++++++++++++++++++++++++------ 2 files changed, 51 insertions(+), 59 deletions(-) delete mode 100644 .github/workflows/build-local.yaml diff --git a/.github/workflows/build-local.yaml b/.github/workflows/build-local.yaml deleted file mode 100644 index 3a06de7..0000000 --- a/.github/workflows/build-local.yaml +++ /dev/null @@ -1,46 +0,0 @@ -# use for local build with act -name: build-local -run-name: build-local ${{ github.actor }} -on: - workflow_dispatch: -env: - REGISTRY: docker.frappet.com - IMAGE_NAME: demo/bma-ehr-metadata-service -jobs: - # act workflow_dispatch -W .github/workflows/build-local.yaml --input IMAGE_VER=test-v6.1 - build-local: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - # skip Set up QEMU because it fail on act and container - - name: Gen Version - id: gen_ver - run: | - if [[ $GITHUB_REF == 'refs/tags/'* ]]; then - IMAGE_VER='${GITHUB_REF/refs\/tags\//}' - else - IMAGE_VER=${{ github.event.inputs.IMAGE_VER }} - fi - if [[ $IMAGE_VER == '' ]]; then - IMAGE_VER='test-vBeta' - fi - echo '::set-output name=image_ver::'$IMAGE_VER - - name: Test Version - run: | - echo $GITHUB_REF - echo ${{ steps.gen_ver.outputs.image_ver }} - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - # - name: Login in to registry - # uses: docker/login-action@v2 - # with: - # registry: ${{env.REGISTRY}} - # username: ${{secrets.DOCKER_USER}} - # password: ${{secrets.DOCKER_PASS}} - - name: Build and load local docker image - uses: docker/build-push-action@v3 - with: - context: . - platforms: linux/amd64 - load: true - tags: ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:${{ steps.gen_ver.outputs.image_ver }},${{env.REGISTRY}}/${{env.IMAGE_NAME}}:latest diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 688baac..f1669a5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,27 +1,27 @@ -name: release-dev -run-name: release-dev ${{ github.actor }} +name: release +run-name: release ${{ github.actor }} on: - # push: - # tags: - # - 'v[0-9]+.[0-9]+.[0-9]+' - # tags-ignore: - # - '2.*' - # Allow run workflow manually from Action tab + push: + tags: + - "version-[0-9]+.[0-9]+.[0-9]+" workflow_dispatch: env: REGISTRY: docker.frappet.com IMAGE_NAME: ehr/bma-ehr-recruit-service DEPLOY_HOST: frappet.com - DEPLOY_PORT: 10102 COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-recruit jobs: # act workflow_dispatch -W .github/workflows/release.yaml --input IMAGE_VER=latest -s DOCKER_USER=admin -s DOCKER_PASS=FPTadmin2357 -s SSH_PASSWORD=FPTadmin2357 - release-dev: + release: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 # skip Set up QEMU because it fail on act and container + # Gen Version try to get version from tag or inut + - name: Set output tags + id: vars + run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT - name: Gen Version id: gen_ver run: | @@ -34,10 +34,11 @@ jobs: IMAGE_VER='test-vBeta' fi echo '::set-output name=image_ver::'$IMAGE_VER - - name: Test Version + - name: Check Version run: | echo $GITHUB_REF echo ${{ steps.gen_ver.outputs.image_ver }} + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - name: Login in to registry @@ -46,7 +47,7 @@ jobs: registry: ${{env.REGISTRY}} username: ${{secrets.DOCKER_USER}} password: ${{secrets.DOCKER_PASS}} - - name: Build and load local docker image + - name: Build and push docker image uses: docker/build-push-action@v3 with: context: . @@ -60,9 +61,46 @@ jobs: host: ${{env.DEPLOY_HOST}} username: frappet password: ${{ secrets.SSH_PASSWORD }} - port: ${{env.DEPLOY_PORT}} + port: 10102 script: | cd "${{env.COMPOSE_PATH}}" docker compose pull docker compose up -d echo "${{ steps.gen_ver.outputs.image_ver }}"> success + - name: Notify Discord Success + if: success() + run: | + curl -H "Content-Type: application/json" \ + -X POST \ + -d '{ + "embeds": [{ + "title": "✅ Deployment Success!", + "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Deployed by: `${{github.actor}}`", + "color": 3066993, + "footer": { + "text": "Release Notification", + "icon_url": "https://example.com/success-icon.png" + }, + "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" + }] + }' \ + ${{ secrets.DISCORD_WEBHOOK }} + + - name: Notify Discord Failure + if: failure() + run: | + curl -H "Content-Type: application/json" \ + -X POST \ + -d '{ + "embeds": [{ + "title": "❌ Deployment Failed!", + "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Attempted by: `${{github.actor}}`", + "color": 15158332, + "footer": { + "text": "Release Notification", + "icon_url": "https://example.com/failure-icon.png" + }, + "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" + }] + }' \ + ${{ secrets.DISCORD_WEBHOOK }} From d0235e0c538856d5e0928e2fd830173f1269d06b Mon Sep 17 00:00:00 2001 From: kittapath Date: Sat, 7 Dec 2024 09:41:25 +0700 Subject: [PATCH 2/7] edit tag --- .github/workflows/release.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index f1669a5..72adff2 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -25,15 +25,15 @@ jobs: - name: Gen Version id: gen_ver run: | - if [[ $GITHUB_REF == 'refs/tags/'* ]]; then - IMAGE_VER='${GITHUB_REF/refs\/tags\//}' - else - IMAGE_VER=${{ github.event.inputs.IMAGE_VER }} - fi - if [[ $IMAGE_VER == '' ]]; then - IMAGE_VER='test-vBeta' - fi - echo '::set-output name=image_ver::'$IMAGE_VER + if [[ $GITHUB_REF == 'refs/tags/'* ]]; then + IMAGE_VER=${{ steps.vars.outputs.tag }} + else + IMAGE_VER=${{ github.event.inputs.IMAGE_VER }} + fi + if [[ $IMAGE_VER == '' ]]; then + IMAGE_VER='test-vBeta' + fi + echo '::set-output name=image_ver::'$IMAGE_VER - name: Check Version run: | echo $GITHUB_REF From 79237c4a7f8a914f5a84cf1bca498dd1c949fc25 Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Fri, 13 Dec 2024 14:18:14 +0700 Subject: [PATCH 3/7] #984(2) --- Controllers/RecruitController.cs | 179 ++++++++++++++++++++++++++++++- 1 file changed, 176 insertions(+), 3 deletions(-) diff --git a/Controllers/RecruitController.cs b/Controllers/RecruitController.cs index e8f3b5a..1e67750 100644 --- a/Controllers/RecruitController.cs +++ b/Controllers/RecruitController.cs @@ -1,5 +1,9 @@ using Amazon.S3.Model; -// using BMA.EHR.Extensions; +using BMA.EHR.MetaData.Service.Models; +using BMA.EHR.Profile.Service.Models.HR; + + +//using BMA.EHR.Extensions; using BMA.EHR.Recruit.Service.Core; using BMA.EHR.Recruit.Service.Data; using BMA.EHR.Recruit.Service.Extensions; @@ -23,6 +27,7 @@ using System.Net; using System.Net.WebSockets; using System.Security.Claims; using System.Text; +using static System.Runtime.InteropServices.JavaScript.JSType; namespace BMA.EHR.Recruit.Service.Controllers { @@ -44,7 +49,8 @@ namespace BMA.EHR.Recruit.Service.Controllers private readonly PermissionRepository _permission; private readonly IHttpContextAccessor _httpContextAccessor; private readonly ILogger _logger; - + //private readonly DateTimeExtension; + #endregion #region " Constructor and Destructor " @@ -56,7 +62,9 @@ namespace BMA.EHR.Recruit.Service.Controllers RecruitService recruitService, IHttpContextAccessor httpContextAccessor, ILogger logger, - PermissionRepository permission) + PermissionRepository permission + //DateTimeExtension extensions + ) { _context = context; _contextMetadata = contextMetadata; @@ -66,6 +74,7 @@ namespace BMA.EHR.Recruit.Service.Controllers _httpContextAccessor = httpContextAccessor; _logger = logger; _permission = permission; + //_extensions = extensions; } #endregion @@ -189,6 +198,15 @@ namespace BMA.EHR.Recruit.Service.Controllers } } + private class ExamInfo + { + public string PositionName { get; set; } + public string Gender { get; set; } + public int Age { get; set; } + public string Degree { get; set; } + public string Result { get; set; } + } + #endregion #region " Ex. Upload, Download and Delete file " @@ -2200,6 +2218,161 @@ namespace BMA.EHR.Recruit.Service.Controllers #endregion + #region " Report " + /// + /// รายงานจำนวนผู้เข้าสอบแข่งขันเพื่อบรรจุเข้ารับราชการเป็นข้าราชการ กทม. สามัญ + /// + /// ปีงบประมาณ + /// + /// เมื่อทำการอ่านข้อมูลจำนวนผู้เข้าสอบแข่งขันเพื่อบรรจุเข้ารับราชการเป็นข้าราชการ กทม. สามัญสำเร็จ + /// ไม่ได้ Login เข้าระบบ + /// เมื่อเกิดข้อผิดพลาดในการทำงาน + [HttpGet("report1"), DisableRequestSizeLimit] + [ProducesResponseType(StatusCodes.Status200OK)] + [ProducesResponseType(StatusCodes.Status401Unauthorized)] + [ProducesResponseType(StatusCodes.Status500InternalServerError)] + public async Task> report1(string year) + { + try + { + List header = new List(); + using (var cmd = _context.Database.GetDbConnection().CreateCommand()) + { + var sb = new StringBuilder(); + cmd.CommandTimeout = 0; + cmd.Parameters.Clear(); + sb.Clear(); + sb.Append(" SELECT * "); + sb.Append(" FROM exam_info "); + sb.Append(" Where score_year = @year"); + sb.Append(" ORDER BY Position_name ASC"); + cmd.CommandText = sb.ToString(); + cmd.Parameters.Add(new MySqlParameter("@year", MySqlDbType.Int32) { Value = year }); + _context.Database.OpenConnection(); + using (var reader = cmd.ExecuteReader()) + { + while (reader.Read()) + { + var examInfo = new ExamInfo + { + PositionName = reader["Position_name"].ToString(), + Gender = reader["Gender"].ToString(), + Age = DateTimeExtension.CalculateAge(Convert.ToDateTime(reader["Dateofbirth"]), 0, 0), + Degree = reader["Degree"].ToString(), + }; + + header.Add(examInfo); + } + + } + + } + var groupedResult = header + .GroupBy(x => new + { + x.PositionName, + x.Gender, + x.Age, + x.Degree + }) + .Select(group => new + { + Group = group.Key, + Amount = group.Count() + }) + .ToList(); + var resultMap = groupedResult.ToDictionary( + x => string.Join("_", x.Group.PositionName, x.Group.Gender, x.Group.Age, x.Group.Degree), + x => x); + + return Success(resultMap); + + } + catch (Exception ex) + { + return Error(ex); + } + } + + /// + /// รายงานจำนวนผู้สอบผ่านแข่งขันเพื่อบรรจุเข้ารับราชการเป็นข้าราชการ กทม. สามัญ + /// + /// ปีงบประมาณ + /// + /// เมื่อทำการอ่านข้อมูลจำนวนผู้สอบผ่านแข่งขันเพื่อบรรจุเข้ารับราชการเป็นข้าราชการ กทม. สามัญสำเร็จ + /// ไม่ได้ Login เข้าระบบ + /// เมื่อเกิดข้อผิดพลาดในการทำงาน + [HttpGet("report2"), DisableRequestSizeLimit] + [ProducesResponseType(StatusCodes.Status200OK)] + [ProducesResponseType(StatusCodes.Status401Unauthorized)] + [ProducesResponseType(StatusCodes.Status500InternalServerError)] + public async Task> report2(string year) + { + try + { + List header = new List(); + using (var cmd = _context.Database.GetDbConnection().CreateCommand()) + { + var sb = new StringBuilder(); + cmd.CommandTimeout = 0; + cmd.Parameters.Clear(); + sb.Clear(); + sb.Append(" SELECT * "); + sb.Append(" FROM exam_info "); + sb.Append(" Where score_year = @year"); + sb.Append(" AND result = 'ผ่าน'"); + sb.Append(" ORDER BY Position_name ASC"); + cmd.CommandText = sb.ToString(); + cmd.Parameters.Add(new MySqlParameter("@year", MySqlDbType.Int32) { Value = year }); + _context.Database.OpenConnection(); + using (var reader = cmd.ExecuteReader()) + { + while (reader.Read()) + { + var examInfo = new ExamInfo + { + PositionName = reader["Position_name"].ToString(), + Gender = reader["Gender"].ToString(), + Age = DateTimeExtension.CalculateAge(Convert.ToDateTime(reader["Dateofbirth"]), 0, 0), + Degree = reader["Degree"].ToString(), + Result = reader["Result"].ToString() + }; + + header.Add(examInfo); + } + + } + + } + var groupedResult = header + .GroupBy(x => new + { + x.PositionName, + x.Gender, + x.Age, + x.Degree, + x.Result + }) + .Select(group => new + { + Group = group.Key, + Amount = group.Count() + }) + .ToList(); + var resultMap = groupedResult.ToDictionary( + x => string.Join("_", x.Group.PositionName, x.Group.Gender, x.Group.Age, x.Group.Degree, x.Group.Result), + x => x); + + return Success(resultMap); + } + catch (Exception ex) + { + return Error(ex); + } + } #endregion + + #endregion + } } \ No newline at end of file From a53f2b6a996baa2a35501b37c7c4fa9ef71e79ad Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Mon, 16 Dec 2024 14:46:53 +0700 Subject: [PATCH 4/7] fix --- Controllers/RecruitController.cs | 94 +++++++++++++++++++------------- 1 file changed, 56 insertions(+), 38 deletions(-) diff --git a/Controllers/RecruitController.cs b/Controllers/RecruitController.cs index 1e67750..5868c40 100644 --- a/Controllers/RecruitController.cs +++ b/Controllers/RecruitController.cs @@ -16,6 +16,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using MySqlConnector; +using MySqlX.XDevAPI.Common; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using OfficeOpenXml; @@ -2235,6 +2236,7 @@ namespace BMA.EHR.Recruit.Service.Controllers { try { + var year_ = int.Parse(year) - 543; List header = new List(); using (var cmd = _context.Database.GetDbConnection().CreateCommand()) { @@ -2247,7 +2249,7 @@ namespace BMA.EHR.Recruit.Service.Controllers sb.Append(" Where score_year = @year"); sb.Append(" ORDER BY Position_name ASC"); cmd.CommandText = sb.ToString(); - cmd.Parameters.Add(new MySqlParameter("@year", MySqlDbType.Int32) { Value = year }); + cmd.Parameters.Add(new MySqlParameter("@year", MySqlDbType.Int32) { Value = year_ }); _context.Database.OpenConnection(); using (var reader = cmd.ExecuteReader()) { @@ -2268,24 +2270,32 @@ namespace BMA.EHR.Recruit.Service.Controllers } var groupedResult = header - .GroupBy(x => new - { - x.PositionName, - x.Gender, - x.Age, - x.Degree - }) - .Select(group => new - { - Group = group.Key, - Amount = group.Count() - }) - .ToList(); - var resultMap = groupedResult.ToDictionary( - x => string.Join("_", x.Group.PositionName, x.Group.Gender, x.Group.Age, x.Group.Degree), - x => x); + .GroupBy(x => new + { + x.PositionName, + x.Gender, + x.Age, + x.Degree + }) + .Select(group => new + { + positionName = group.Key.PositionName, + gender = group.Key.Gender, + age = group.Key.Age, + degree = group.Key.Degree, + amount = group.Count() + }) + .ToList(); - return Success(resultMap); + var result = new + { + template = "recruit-officer-pre", + reportName = "xlsx-report", + data = new { list = groupedResult } + }; + + + return Success(result); } catch (Exception ex) @@ -2310,6 +2320,7 @@ namespace BMA.EHR.Recruit.Service.Controllers { try { + var year_ = int.Parse(year) - 543; List header = new List(); using (var cmd = _context.Database.GetDbConnection().CreateCommand()) { @@ -2323,7 +2334,7 @@ namespace BMA.EHR.Recruit.Service.Controllers sb.Append(" AND result = 'ผ่าน'"); sb.Append(" ORDER BY Position_name ASC"); cmd.CommandText = sb.ToString(); - cmd.Parameters.Add(new MySqlParameter("@year", MySqlDbType.Int32) { Value = year }); + cmd.Parameters.Add(new MySqlParameter("@year", MySqlDbType.Int32) { Value = year_ }); _context.Database.OpenConnection(); using (var reader = cmd.ExecuteReader()) { @@ -2342,28 +2353,35 @@ namespace BMA.EHR.Recruit.Service.Controllers } } - } var groupedResult = header - .GroupBy(x => new - { - x.PositionName, - x.Gender, - x.Age, - x.Degree, - x.Result - }) - .Select(group => new - { - Group = group.Key, - Amount = group.Count() - }) - .ToList(); - var resultMap = groupedResult.ToDictionary( - x => string.Join("_", x.Group.PositionName, x.Group.Gender, x.Group.Age, x.Group.Degree, x.Group.Result), - x => x); + .GroupBy(x => new + { + x.PositionName, + x.Gender, + x.Age, + x.Degree, + x.Result + }) + .Select(group => new + { + positionName = group.Key.PositionName, + gender = group.Key.Gender, + age = group.Key.Age, + degree = group.Key.Degree, + result = group.Key.Result, + amount = group.Count() + }) + .ToList(); - return Success(resultMap); + var result = new + { + template = "recruit-officer-pass", + reportName = "xlsx-report", + data = new { list = groupedResult } + }; + return Success(result); + } catch (Exception ex) { From c7f0b648ed5153213769ea5c59b32df1fb07f77f Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Tue, 17 Dec 2024 11:56:05 +0700 Subject: [PATCH 5/7] thai number 984 (2) --- Controllers/RecruitController.cs | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/Controllers/RecruitController.cs b/Controllers/RecruitController.cs index 5868c40..9a0f6bd 100644 --- a/Controllers/RecruitController.cs +++ b/Controllers/RecruitController.cs @@ -2281,9 +2281,9 @@ namespace BMA.EHR.Recruit.Service.Controllers { positionName = group.Key.PositionName, gender = group.Key.Gender, - age = group.Key.Age, + age = group.Key.Age.ToString().ToThaiNumber(), degree = group.Key.Degree, - amount = group.Count() + amount = group.Count().ToString().ToThaiNumber() }) .ToList(); @@ -2291,7 +2291,11 @@ namespace BMA.EHR.Recruit.Service.Controllers { template = "recruit-officer-pre", reportName = "xlsx-report", - data = new { list = groupedResult } + data = new { + year = year.ToString().ToThaiNumber(), + date = DateTime.Now.ToThaiShortDateWithPrefix().ToThaiNumber(), + list = groupedResult + } }; @@ -2367,10 +2371,10 @@ namespace BMA.EHR.Recruit.Service.Controllers { positionName = group.Key.PositionName, gender = group.Key.Gender, - age = group.Key.Age, + age = group.Key.Age.ToString().ToThaiNumber(), degree = group.Key.Degree, result = group.Key.Result, - amount = group.Count() + amount = group.Count().ToString().ToThaiNumber() }) .ToList(); @@ -2378,7 +2382,11 @@ namespace BMA.EHR.Recruit.Service.Controllers { template = "recruit-officer-pass", reportName = "xlsx-report", - data = new { list = groupedResult } + data = new { + year = year.ToString().ToThaiNumber(), + date = DateTime.Now.ToThaiShortDateWithPrefix().ToThaiNumber(), + list = groupedResult + } }; return Success(result); From 9995bb6d50394b07cdf0021b988563ea25911ed7 Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Tue, 17 Dec 2024 18:09:23 +0700 Subject: [PATCH 6/7] extension --- Extensions/DateTimeExtension.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Extensions/DateTimeExtension.cs b/Extensions/DateTimeExtension.cs index 1461920..df6379d 100644 --- a/Extensions/DateTimeExtension.cs +++ b/Extensions/DateTimeExtension.cs @@ -66,6 +66,11 @@ namespace BMA.EHR.Recruit.Service.Extensions var yy = value.Year < 2400 ? value.Year + 543 : value.Year; return $"{value.Day} {value.ToString("MMM", _culture.DateTimeFormat)} {yy.ToString().Right(2)}"; } + public static string ToThaiShortDateWithPrefix(this DateTime value) + { + var yy = value.Year < 2400 ? value.Year + 543 : value.Year; + return $"วันที่ {value.Day} {value.ToString("MMM", _culture.DateTimeFormat)} {yy.ToString().Right(2)}"; + } public static string ToThaiDate(this DateTime value) { From e076d577f98746080b6895ac252b681f15aedcef Mon Sep 17 00:00:00 2001 From: kittapath Date: Thu, 19 Dec 2024 14:16:25 +0700 Subject: [PATCH 7/7] update db connection --- Program.cs | 8 ++++---- appsettings.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Program.cs b/Program.cs index fe66d99..b773ff0 100644 --- a/Program.cs +++ b/Program.cs @@ -74,12 +74,12 @@ BsonSerializer.RegisterSerializer(new GuidSerializer(BsonType.String)); BsonSerializer.RegisterSerializer(new DateTimeSerializer(BsonType.String)); // Register DbContext -var defaultConnection = builder.Configuration.GetConnectionString("DefaultConnection"); +var recruitConnection = builder.Configuration.GetConnectionString("RecruitConnection"); builder.Services.AddDbContext(options => - options.UseMySql(defaultConnection, ServerVersion.AutoDetect(defaultConnection)), ServiceLifetime.Transient); -var metadataConnection = builder.Configuration.GetConnectionString("MetadataConnection"); + options.UseMySql(recruitConnection, ServerVersion.AutoDetect(recruitConnection)), ServiceLifetime.Transient); +var defaultConnection = builder.Configuration.GetConnectionString("DefaultConnection"); builder.Services.AddDbContext(options => - options.UseMySql(metadataConnection, ServerVersion.AutoDetect(metadataConnection)), ServiceLifetime.Transient); + options.UseMySql(defaultConnection, ServerVersion.AutoDetect(defaultConnection)), ServiceLifetime.Transient); // Add config CORS builder.Services.AddCors(options => options.AddDefaultPolicy(builder => diff --git a/appsettings.json b/appsettings.json index c8d9f96..3ae208e 100644 --- a/appsettings.json +++ b/appsettings.json @@ -14,8 +14,8 @@ "AllowedHosts": "*", "ConnectionStrings": { "MongoConnection": "mongodb://admin:adminVM123@127.0.0.1:27017", - "DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_recruit_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", - "MetadataConnection": "server=192.168.1.80;user=root;password=adminVM123;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;" + "DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", + "RecruitConnection": "server=192.168.1.80;user=root;password=adminVM123;database=bma_recruit_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;" }, "Jwt": { "Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",