Browse Source

修改接口獲取服務器地址

Dev
18300102974 2 years ago
parent
commit
18e0aa1a2d
  1. 21
      EuroTran/EasyBL.WEBAPP/ShowEasy/IndexService.cs
  2. 10
      EuroTran/WebApp/Controllers/IndexController.cs

21
EuroTran/EasyBL.WEBAPP/ShowEasy/IndexService.cs

@ -25,7 +25,7 @@ namespace EasyBL.WEBAPP.SYS
{ {
//ads Swiper //ads Swiper
public HttpResponseMessage Banner(string Lang)
public HttpResponseMessage Banner(string requestUrl, string Lang)
{ {
//string sMsg = null; //string sMsg = null;
SuccessResponseMessage srm = SugarBase.ExecTran(db => SuccessResponseMessage srm = SugarBase.ExecTran(db =>
@ -75,7 +75,7 @@ namespace EasyBL.WEBAPP.SYS
if (hasMatch && !FilePathTotal.Contains(image.Image)) { if (hasMatch && !FilePathTotal.Contains(image.Image)) {
FilePathTotal.Add("http://www.origtek.com:9105/" + FilePath.FilePath);
FilePathTotal.Add("http://" + requestUrl + "/" + FilePath.FilePath.Replace("\\", "/"));
} }
} }
@ -101,7 +101,7 @@ namespace EasyBL.WEBAPP.SYS
/// <param name="OrgID"></param> /// <param name="OrgID"></param>
/// <param name="Lang"></param> /// <param name="Lang"></param>
/// <returns></returns> /// <returns></returns>
public HttpResponseMessage BaseInfo(string OrgID,string Lang)
public HttpResponseMessage BaseInfo(string requestUrl,string Lang)
{ {
SuccessResponseMessage srm = null; SuccessResponseMessage srm = null;
string sError = null; string sError = null;
@ -110,10 +110,25 @@ namespace EasyBL.WEBAPP.SYS
{ {
do do
{ {
string OrgID = WebAppGlobalConstWord.TG_ORGID;
if (string.IsNullOrEmpty(Lang))
{
Lang = WebAppGlobalConstWord.DEFAULT_LANGUAGE;
}
var baseInfo = db.Queryable<SETB_SAP_BasicInfo>() var baseInfo = db.Queryable<SETB_SAP_BasicInfo>()
//搜尋條件 //搜尋條件
.Where(x => x.OrgID == OrgID && x.Language == Lang) .Where(x => x.OrgID == OrgID && x.Language == Lang)
.First(); .First();
if (baseInfo !=null)
{
var saFile = db.Queryable<OTB_SYS_Files>()
.Where(x => x.ParentID == baseInfo.Image)
.First();
if (saFile != null)
{
baseInfo.Image = "http://"+ requestUrl + "/" + saFile.FilePath.Replace("\\","/");
}
}
srm = new SuccessResponseMessage(null, null); srm = new SuccessResponseMessage(null, null);
srm.DATA.Add(BLWording.REL, baseInfo); srm.DATA.Add(BLWording.REL, baseInfo);

10
EuroTran/WebApp/Controllers/IndexController.cs

@ -17,9 +17,10 @@ namespace WebApp.Controllers
//ads Swiper //ads Swiper
[HttpGet] [HttpGet]
public HttpResponseMessage Banner(string Lang)
public HttpResponseMessage Banner(string Lang)
{ {
return new IndexService().Banner(Lang);
string requestUrl = this.Request.RequestUri.Authority;
return new IndexService().Banner(requestUrl,Lang);
} }
/// <summary> /// <summary>
@ -28,9 +29,10 @@ namespace WebApp.Controllers
/// <param name="Lang"></param> /// <param name="Lang"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
public HttpResponseMessage BaseInfo(string OrgID, string Lang)
public HttpResponseMessage BaseInfo(string Lang)
{ {
return new IndexService().BaseInfo(OrgID,Lang);
string requestUrl = this.Request.RequestUri.Authority;
return new IndexService().BaseInfo(requestUrl,Lang);
} }
/// <summary> /// <summary>

Loading…
Cancel
Save