diff --git a/BO/Controllers/AccountController.cs b/BO/Controllers/AccountController.cs index 2a10aa5..f6b5817 100644 --- a/BO/Controllers/AccountController.cs +++ b/BO/Controllers/AccountController.cs @@ -354,7 +354,7 @@ namespace NP.BO.Controllers smstype = "A", isok = string.IsNullOrEmpty(u.mobile) ? -1 : 1, mobile = (u.mobile ?? "").Replace("-", ""), - mcontents = string.Format("영남건설기술교육원입니다.\n\n{0}님이 수강중인 [{1}] 자격검정이 [{2}]에 {3}에서 이뤄질 예정입니다.\n\n☞사이트: https://edu.kfcf.or.kr", + mcontents = string.Format("영남건설기술교육원입니다.\n\n{0}님이 신청중인 [{1}] 자격검정이 [{2}]에 {3}에서 이뤄질 예정입니다.\n\n☞사이트: https://edu.kfcf.or.kr", u.username, u.cname, u.stime.ToString("yyyy-MM-dd HH:mm"),u.place) }); } diff --git a/BO/obj/Debug/BO.csprojAssemblyReference.cache b/BO/obj/Debug/BO.csprojAssemblyReference.cache index e3c9000..a3e1abc 100644 Binary files a/BO/obj/Debug/BO.csprojAssemblyReference.cache and b/BO/obj/Debug/BO.csprojAssemblyReference.cache differ diff --git a/Base/Controller/FOCommon.cs b/Base/Controller/FOCommon.cs index 42123d6..6c1d875 100644 --- a/Base/Controller/FOCommon.cs +++ b/Base/Controller/FOCommon.cs @@ -465,7 +465,7 @@ namespace NP.Base.Controllers Random r = new Random(); int lakey = r.Next(100000, 999999); SmsAuth sa = new SmsAuth() { lakey = lakey.ToString(),lectno=lectno }; - String msg = "영남건설기술교육원 입니다.\n 회원님의 인증번호는 :\t" + lakey + "\t 입니다."; + String msg = "[영남건설기술교육원]\n\n영남건설기술교육원 인증번호 [" + lakey + "] 입니다."; var users = Dao.Get("users.findme", new Hashtable() { { "mobile", mobile } }).ToList(); if(users.Count() == 0) { @@ -476,7 +476,7 @@ namespace NP.Base.Controllers return JsonBack(new JsonRtn() { code = -1 }); } Dao.Insert("common.smsauth", sa); - //Dao.Insert("common.sms.send", new Hashtable() { { "CMID", result }, { "DEST_PHONE", mobile.Replace(" ", "").Replace("-", "") }, { "SEND_PHONE", "0260051004" }, { "MSG_BODY", msg } }); + Dao.Insert("common.atalk.send", new Hashtable() { { "senderkey", GetConfig("mastersms").Split(';')[0] },{"method","alarm" }, { "DEST_PHONE", mobile.Replace(" ", "").Replace("-", "") }, { "SEND_PHONE", GetConfig("mastersms").Split(';')[1] },{"title","인증번호" }, { "MSG_BODY", msg },{"replace_type","S" } }); return JsonOK(sa.authno); } [HttpPost] diff --git a/Base/obj/Debug/Base.csproj.CoreCompileInputs.cache b/Base/obj/Debug/Base.csproj.CoreCompileInputs.cache index fba4695..5d0b141 100644 --- a/Base/obj/Debug/Base.csproj.CoreCompileInputs.cache +++ b/Base/obj/Debug/Base.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -360ee404857251438cfed673dada16fc24819b88 +eca8cda3d1a6996c6a1890f7ee38a0835275ba74 diff --git a/Base/obj/Debug/Base.csprojAssemblyReference.cache b/Base/obj/Debug/Base.csprojAssemblyReference.cache index 8032fd1..073cc15 100644 Binary files a/Base/obj/Debug/Base.csprojAssemblyReference.cache and b/Base/obj/Debug/Base.csprojAssemblyReference.cache differ diff --git a/Dao/MyBatis/Maps/Common.xml b/Dao/MyBatis/Maps/Common.xml index de6cb59..a0d04c8 100644 --- a/Dao/MyBatis/Maps/Common.xml +++ b/Dao/MyBatis/Maps/Common.xml @@ -489,5 +489,9 @@ set latime = now() where authno = #authno# + + insert into MTS_ATALK_MSG (TRAN_SENDER_KEY,TRAN_TMPL_CD,TRAN_CALLBACK,TRAN_PHONE,TRAN_SUBJECT,TRAN_MSG,TRAN_DATE,TRAN_TYPE,TRAN_STATUS,TRAN_REPLACE_TYPE,TRAN_REPLACE_MSG) + values (#senderkey#,#method#,#SEND_PHONE#,#DEST_PHONE#,#title#,#MSG_BODY#,now(),5,'1',#replace_type#,#MSG_BODY#); + diff --git a/Dao/obj/Debug/Dao.csprojAssemblyReference.cache b/Dao/obj/Debug/Dao.csprojAssemblyReference.cache index 9d661eb..199ffa0 100644 Binary files a/Dao/obj/Debug/Dao.csprojAssemblyReference.cache and b/Dao/obj/Debug/Dao.csprojAssemblyReference.cache differ diff --git a/FO/Controllers/CRoomController.cs b/FO/Controllers/CRoomController.cs index d50b68d..9b149e8 100644 --- a/FO/Controllers/CRoomController.cs +++ b/FO/Controllers/CRoomController.cs @@ -53,6 +53,7 @@ namespace NP.FO.Controllers public ActionResult Innings() { vm.LectInnings = Dao.Get("cr.cminnings", new System.Collections.Hashtable() { { "lectno", vm.croomlectno }, { "userno", SUserInfo.UserNo } }); + ViewBag.Mobile = Dao.Get("users.users", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo } }).FirstOrDefault().mobile; if (vm.LectInnings.Count() > 0 && vm.LectInnings.First().isrebate == 1) { vm.intval = Dao.Get("cr.lectinnings", new System.Collections.Hashtable() { { "lectno", vm.croomlectno }, { "isfinishtoday", 1 } }).Count(); diff --git a/FO/Views/CRoom/Index.cshtml b/FO/Views/CRoom/Index.cshtml index c45d358..d350796 100644 --- a/FO/Views/CRoom/Index.cshtml +++ b/FO/Views/CRoom/Index.cshtml @@ -3,7 +3,6 @@ }
-
나의성적
diff --git a/FO/Views/CRoom/Innings.cshtml b/FO/Views/CRoom/Innings.cshtml index f09e79e..27c9f8e 100644 --- a/FO/Views/CRoom/Innings.cshtml +++ b/FO/Views/CRoom/Innings.cshtml @@ -6,6 +6,7 @@ 출결이력조회
+ @foreach (var d in Model.LectInnings) @@ -122,11 +123,14 @@ +@Html.Partial("./Partial/MobileChk", null, new ViewDataDictionary { { "bindmethod", "cbchkmobile" } }) @section scriptsHeader{ - } + +} @section scripts{