KimHanJin
/
YNICTE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This commit is contained in:
kdh0120 2020-12-24 06:27:40 +00:00
parent 72bcb4092d
commit d33129a325
11 changed files with 153 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
BO/Content/file/users.xlsx
View File

Binary file not shown.

10
BO/Controllers/croomController.cs
View File

@ -560,17 +560,17 @@ namespace NP.BO.Controllers
ht.Add("cdts", vm.stringval);
ht.Add("cdte", string.IsNullOrEmpty(vm.stringval2) ? null : (vm.stringval2 + " 23:59:59"));
ht.Add("pstatusin", vm.stringval3);
ht.Add("isrefundcall", string.IsNullOrEmpty(vm.stringval4) ? null : "1");
ht.Add("rstatusin", vm.stringval5);
//ht.Add("pstatusin", vm.stringval3);
//ht.Add("isrefundcall", string.IsNullOrEmpty(vm.stringval4) ? null : "1");
//ht.Add("rstatusin", vm.stringval5);
String pstatusall = null;
if (vm.stringval3 != null)
{
pstatusall = " and (p.pstatus in (" +vm.stringval3+")";
pstatusall = " and ((p.pstatus in (" +vm.stringval3+") and pr.rstatus is null and p.rstatus = 0)";
}
if (vm.stringval4 != null)
{
pstatusall = pstatusall == null ? "and (pr.rfdno is not null" : (pstatusall + " or pr.rfdno is not null");
pstatusall = pstatusall == null ? "and ((pr.rfdno is not null and pr.rstatus = 0)" : (pstatusall + " or (pr.rfdno is not null and pr.rstatus = 0)");
}
if ((vm.stringval5??"").Contains("1"))
{

3
BO/Web.config
View File

@ -32,8 +32,9 @@
<add key="fronturl" value="https://www.ynicte.com" />
<add key="adminurl" value="http://admin.ynicte.com" />
<add key="adminips" value="118.219.255.223;118.219.255.225"/>
<add key="reporturl" value="http://ynicter.nptc.kr" />
<add key="isstaging" value="1" />
<add key="isstaging" value="0" />
<!--<add key="masteremail" value="edu@ynicte.or.kr;mail.ynicte.or.kr;25;ynicte@ynicte.or.kr;k7758870!%" />-->
<add key="masteremail" value="yicte@cte.or.kr;smtp.daum.net;465;yicte2020;yicte04003" />
<add key="usessl" value="Y" />

BIN
BO/obj/Debug/BO.csprojAssemblyReference.cache
View File

Binary file not shown.

129
Base/Controller/BaseController.cs
View File

@ -420,53 +420,100 @@ namespace NP.Base
System.Net.WebRequest request;
System.IO.Stream dataStream = null;
System.Net.WebResponse response = null;
try
if(GetConfig("isstaging") == "1")
{
if (GetConfig("isstaging") == "1")
try
{
request = System.Net.WebRequest.Create(GetConfig("fronturl").Replace("https://", "http://") + "/Open/" + fmtype);
}
else
{
request = System.Net.WebRequest.Create(GetConfig("fronturl") + "/Open/" + fmtype);
}
request.Method = "POST";
//request.PreAuthenticate = true;
//request.UseDefaultCredentials = false;
string postData = "This is a test that posts this string to a Web server.";
byte[] byteArray = Encoding.UTF8.GetBytes(postData);
request.ContentType = "application/x-www-form-urlencoded";
request.ContentLength = byteArray.Length;
dataStream = request.GetRequestStream();
dataStream.Write(byteArray, 0, byteArray.Length);
dataStream.Close();
response = request.GetResponse();
//Console.WriteLine(((HttpWebResponse)response).StatusDescription);
dataStream = response.GetResponseStream();
reader = new System.IO.StreamReader(dataStream);
string responseFromServer = reader.ReadToEnd();
//Console.WriteLine(responseFromServer);
reader.Close();
dataStream.Close();
response.Close();
return true;
}
catch(Exception ex)
{
SetError("FrontMemnu()" + ":" + Request.Url + ":" + ex.Message + ex.StackTrace);
if (reader != null)
{
reader.Close();
}
if (dataStream != null)
{
//request = System.Net.WebRequest.Create(GetConfig("fronturl") + "/Open/" + fmtype);
request.Method = "POST";
//request.PreAuthenticate = true;
//request.UseDefaultCredentials = false;
string postData = "This is a test that posts this string to a Web server.";
byte[] byteArray = Encoding.UTF8.GetBytes(postData);
request.ContentType = "application/x-www-form-urlencoded";
request.ContentLength = byteArray.Length;
dataStream = request.GetRequestStream();
dataStream.Write(byteArray, 0, byteArray.Length);
dataStream.Close();
response = request.GetResponse();
//Console.WriteLine(((HttpWebResponse)response).StatusDescription);
dataStream = response.GetResponseStream();
reader = new System.IO.StreamReader(dataStream);
string responseFromServer = reader.ReadToEnd();
//Console.WriteLine(responseFromServer);
reader.Close();
dataStream.Close();
}
if (response != null)
{
response.Close();
return true;
}
return false;
catch(Exception ex)
{
SetError("FrontMemnu()" + ":" + Request.Url + ":" + ex.Message + ex.StackTrace);
if (reader != null)
{
reader.Close();
}
if (dataStream != null)
{
dataStream.Close();
}
if (response != null)
{
response.Close();
}
return false;
}
}
else
{
bool result = true;
foreach(var d in GetConfig("adminips").Split(';'))
{
try
{
request = System.Net.WebRequest.Create("http://"+d + "/Open/" + fmtype);
//request = System.Net.WebRequest.Create(GetConfig("fronturl") + "/Open/" + fmtype);
request.Method = "POST";
//request.PreAuthenticate = true;
//request.UseDefaultCredentials = false;
string postData = "This is a test that posts this string to a Web server.";
byte[] byteArray = Encoding.UTF8.GetBytes(postData);
request.ContentType = "application/x-www-form-urlencoded";
request.ContentLength = byteArray.Length;
dataStream = request.GetRequestStream();
dataStream.Write(byteArray, 0, byteArray.Length);
dataStream.Close();
response = request.GetResponse();
//Console.WriteLine(((HttpWebResponse)response).StatusDescription);
dataStream = response.GetResponseStream();
reader = new System.IO.StreamReader(dataStream);
string responseFromServer = reader.ReadToEnd();
//Console.WriteLine(responseFromServer);
reader.Close();
dataStream.Close();
response.Close();
}
catch (Exception ex)
{
SetError("FrontMemnu()" + ":" + Request.Url + ":" + ex.Message + ex.StackTrace);
if (reader != null)
{
reader.Close();
}
if (dataStream != null)
{
dataStream.Close();
}
if (response != null)
{
response.Close();
}
result = false;
}
}
return result;
}
}
}

BIN
Base/obj/Debug/Base.csprojAssemblyReference.cache
View File

Binary file not shown.

5
Dao/MyBatis/Maps/CRoom.xml
View File

@ -769,12 +769,12 @@
left outer join cg cg on cg.cgno=cm.cgno
left outer join book bk on pi.ptype=2 and bk.bkno=pi.itemno
left outer join exam ex on pi.ptype=3 and ex.exno=pi.itemno
where p.pstatus in (1,21,22,41,42,43) and (pri.rfdno is null or pr.rfdno is not null)
where p.pstatus in (1,21,22,41,42,43)
<isNotNull property="cdts">and p.cdt &gt;= #cdts#</isNotNull>
<isNotNull property="cdte">and p.cdt &lt;= #cdte#</isNotNull>
<!--<isNotNull property="pstatusin">and p.pstatus in ($pstatusin$)</isNotNull>-->
<isNotNull property="isrefundcall">and (p.rstatus =0 and pr.rstatus=0 and pri.rfdno is not null)</isNotNull>
<!--<isNotNull property="isrefundcall">and (p.rstatus =0 and pr.rstatus=0 and pri.rfdno is not null)</isNotNull>-->
<!--<isNotNull property="rstatusin">and pi.rstatus in ($rstatusin$)</isNotNull>-->
<isNotNull property="pstatusall">$pstatusall$</isNotNull>
@ -830,7 +830,6 @@
left outer join book bk on a.isexamready=0 and pi.ptype=2 and bk.bkno=pi.itemno
left outer join exam ex on a.isexamready=0 and ex.exno=pi.itemno
left outer join examuser exu on exu.exno=ex.exno and exu.userno=p.userno
where (pri.rfdno is null or pr.rfdno is not null)
) a
<include refid="sql.pagedynamic"></include>
order by a.rno

BIN
Dao/obj/Debug/Dao.csprojAssemblyReference.cache
View File

Binary file not shown.

4
FO/Controllers/CRoomController.cs
View File

@ -35,8 +35,8 @@ namespace NP.FO.Controllers
}
}
vm.Datas = Dao.Get<Data>("cr.main.boardalarm", new System.Collections.Hashtable() { { "bmnos", bmnos != null ? bmnos.Substring(1) : bmnos},{ "lect", vm.croomlectno },{ "cmno", vm.croomcmno }, { "lectno", vm.croomlectno }, { "userno", SUserInfo.UserNo } });
vm.LectInnings = Dao.Get<LectInning>("cr.cminnings", new System.Collections.Hashtable() { { "lectno", vm.croomlectno },{ "userno",SUserInfo.UserNo}, { "notstudy"+(Request.IsLocal?"x":""), 1 },{ "limit", 6} });
if (!string.IsNullOrEmpty(vm.LectInnings.FirstOrDefault().existslectinning) && vm.LectInnings.Count() > 0 && vm.LectInnings.First().isrebate == 1)
vm.LectInnings = Dao.Get<LectInning>("cr.cminnings", new System.Collections.Hashtable() { { "lectno", vm.croomlectno },{ "userno",SUserInfo.UserNo}, { "notstudy" + (Request.IsLocal ? "x" : ""), 1 },{ "limit", 6} });
if (vm.LectInnings.Count() > 0 && !string.IsNullOrEmpty(vm.LectInnings.FirstOrDefault().existslectinning) && vm.LectInnings.FirstOrDefault().isrebate == 1)
{
vm.intval = Dao.Get<LectInning>("cr.lectinnings", new System.Collections.Hashtable() { { "lectno", vm.croomlectno }, { "isfinishtoday", 1 } }).Count();
}

55
FO/Views/Home/Index.cshtml
View File

@ -219,10 +219,37 @@
</div>
</form>
}
<script type="text/javascript">
<textarea style="display: none;" id="texthide01">@ViewBag.POPUPS</textarea>
@section scripts{
<script>
$(document).ready(function () {
initSearch();
if (!ismobile()) {
if ($("#texthide01").val() != '') {
$.each($($("#texthide01").val().split('nptechpopuplistseparator')), function (i, p) {
var p = p.split('nptechpopupseparator');
if ('p@(ViewBag.POPUPXS)p'.indexOf('p' + p[0] + 'p') < 0) {
$("body").append("<div data-zindex=\"" + p[8] + "\" style=\"z-index: " + p[8] + "; left: " + p[4] + "px; top: " + p[3] + "px; width: " + (getint(p[5]) + 45) + "px; height: " + (getint(p[6]) + 105) + "px;\" class=\"draggablethis ui-widget-content popupitem\" id=\"popbox" + p[0] + "\">" +
"<div class=\"inner\"><div class=\"poptitlebox\"><span>" + p[1] + "</span>" +
"<a class=\"closepopa\" href=\"#\" onclick=\"hidepop();$('#popbox" + p[0] + "').remove();\">x</a></div>" +
"<div class=\"iframebox\"><iframe id=\"ifrpop" + p[0] + "\" style=\"border: 0 none; height: " + p[6] + "px; width: " + (getint(p[5])) + "px;\"></iframe></div>" +
"<div class=\"iframeclosebox\"><a class=\"\" style=\"border: 1px solid #ddd; padding: 5px 15px;\" onclick=\"hide7('popbox" + p[0] + "', " + p[0] + ")\"> 7일간 숨기기</a></div></div></div>");
$("#ifrpop" + p[0]).attr("src", "/Home/Popup?pno=" + p[0]);
$("#popbox" + p[0]).show();
//$("html").css("overflow", "hidden");
}
});
$(".poptitlebox").on("click", function () {
$.each($(".popupitem"), function (i, d) {
$(d).css("z-index", $(d).attr("data-zindex"));
});
$(this).closest(".popupitem").css("z-index", 130);
});
}
$(".draggablethis").draggable();
}
$('#liTab1').click(function () {
$("#stringval").val("0");
$("#indexForm").submit();
@ -339,6 +366,30 @@
$('#msSel5 > span').text("");
}
}
</script>
function hppopclick(url) {
url = url.toLowerCase().replace('http//', 'http://').replace('https//', 'https://');
if (url.toLowerCase().indexOf("http://") == 0 || url.toLowerCase().indexOf("http://") == 0) {
window.open(url);
}
else if (url != "") {
location.href = url;
}
}
var _hide7;
function hide7(id, pno) {
_hide7 = id;
capp("/focommon/hidepop", { pno: pno }, "cbhide7");
}
function cbhide7() {
hidepop();
$("#" + _hide7).remove();
}
function hidepop() {
if ($(".popupitem").length == 1) {
$("html").css("overflow", "auto");
}
}
</script>
}

2
FO/Web.config
View File

@ -343,7 +343,7 @@
</layout>
</appender>
<appender name="QueryAppender" type="log4net.Appender.RollingFileAppender,log4net">
<param name="File" value="D:\log\kfcf\query.txt" />
<param name="File" value="D:\log\ynicte\query.txt" />
<param name="AppendToFile" value="true" />
<param name="MaxSizeRollBackups" value="10" />
<param name="MaximumFileSize" value="5MB" />