hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

fix: update image retrieval logic in LeaveController and adjust RabbitMQ configuration in appsettings

Browse source 
#2138
This commit is contained in:
Suphonchai Phoonsawat 2025-12-18 14:08:05 +07:00
parent d6497a5d51
commit 3980fbd2d8
3 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
BMA.EHR.Domain/Middlewares/CombinedErrorHandlerAndLoggingMiddleware.cs
View file

@ -552,12 +552,15 @@ namespace BMA.EHR.Domain.Middlewares
return Guid.Empty.ToString("D"); return Guid.Empty.ToString("D");
} }
// Decode Base64 payload // Decode Base64Url payload (JWT uses Base64Url encoding, not standard Base64)
var payload = parts[1]; var payload = parts[1];
// แปลง Base64Url เป็น Base64 ก่อน
payload = payload.Replace('-', '+').Replace('_', '/');
// เพิ่ม padding ถ้าจำเป็น // เพิ่ม padding ถ้าจำเป็น
var padLength = 4 - (payload.Length % 4); var padLength = 4 - (payload.Length % 4);
if (padLength != 4) if (padLength < 4)
{ {
payload += new string('=', padLength); payload += new string('=', padLength);
} }

5
BMA.EHR.Leave/Controllers/LeaveController.cs
View file

@ -1496,7 +1496,8 @@ namespace BMA.EHR.Leave.Service.Controllers
CheckInPOI = d.CheckInPOI, CheckInPOI = d.CheckInPOI,
CheckInLat = d.CheckInLat, CheckInLat = d.CheckInLat,
CheckInLon = d.CheckInLon, CheckInLon = d.CheckInLon,
CheckInImg = $"{imgUrl}/{d.CheckInImageUrl}", //CheckInImg = $"{imgUrl}/{d.CheckInImageUrl}",
CheckInImg = await _minIOService.ImagesPathByName(d.CheckInImageUrl),
CheckInStatus = d.CheckInStatus != null || d.CheckInStatus != "" ? d.CheckInStatus : CheckInStatus = d.CheckInStatus != null || d.CheckInStatus != "" ? d.CheckInStatus :
DateTime.Parse(d.CheckIn.ToString("yyyy-MM-dd HH:mm")) > DateTime.Parse(d.CheckIn.ToString("yyyy-MM-dd HH:mm")) >
DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}") ? DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}") ?
@ -1516,7 +1517,7 @@ namespace BMA.EHR.Leave.Service.Controllers
CheckOutPOI = d.CheckOut == null ? "" : d.CheckOutPOI, CheckOutPOI = d.CheckOut == null ? "" : d.CheckOutPOI,
CheckOutLat = d.CheckOut == null ? null : d.CheckOutLat, CheckOutLat = d.CheckOut == null ? null : d.CheckOutLat,
CheckOutLon = d.CheckOut == null ? null : d.CheckOutLon, CheckOutLon = d.CheckOut == null ? null : d.CheckOutLon,
CheckOutImg = d.CheckOut == null ? "" : $"{imgUrl}/{d.CheckOutImageUrl}", CheckOutImg = d.CheckOut == null ? "" : await _minIOService.ImagesPathByName(d.CheckOutImageUrl),
CheckOutStatus = d.CheckOut == null ? null : CheckOutStatus = d.CheckOut == null ? null :
d.CheckOutStatus != null || d.CheckOutStatus != "" ? d.CheckOutStatus : d.CheckOutStatus != null || d.CheckOutStatus != "" ? d.CheckOutStatus :

9
BMA.EHR.Leave/appsettings.json
View file

@ -50,12 +50,11 @@
"API": "https://bma-ehr.frappet.synology.me/api/v1/probation" "API": "https://bma-ehr.frappet.synology.me/api/v1/probation"
}, },
"Rabbit": { "Rabbit": {
"Host": "192.168.1.40", "Host": "192.168.1.63",
"API": "https://bma-ehr.frappet.synology.me/api/v1",
"User": "admin", "User": "admin",
"Password": "Test123456", "Password": "12345678",
"Queue": "bma-checkin-queue", "Queue": "hrms-checkin-queue",
"URL": "https://edm-mq.frappet.synology.me/api/queues/%2F/" "URL": "http://192.168.1.63:9122/api/queues/%2F/"
}, },
"Mail": { "Mail": {
"Server": "mail.bangkok.go.th", "Server": "mail.bangkok.go.th",