Commit 3d04a6da by xiongyuwen

no message

parent 36904722
...@@ -97,5 +97,6 @@ namespace Bailun.Discuz.Application.WeiPan.Dto.ResponseDto ...@@ -97,5 +97,6 @@ namespace Bailun.Discuz.Application.WeiPan.Dto.ResponseDto
/// ///
/// </summary> /// </summary>
public File_list file_list { get; set; } public File_list file_list { get; set; }
public string companyName { get; set; }
} }
} }
...@@ -30,7 +30,7 @@ namespace Bailun.Discuz.Application.WeiPan ...@@ -30,7 +30,7 @@ namespace Bailun.Discuz.Application.WeiPan
///// 获取首层文件列表 ///// 获取首层文件列表
///// </summary> ///// </summary>
///// <returns></returns> ///// <returns></returns>
Task<GetFileListResponse> GetFirstFileList(string userId,bool isGetRedis = true); Task<GetFileListResponse> GetFirstFileList(string userId, string companyName, bool isGetRedis = true, bool isDelCaching = false);
///// <summary> ///// <summary>
///// 获取下载文件链接地址 ///// 获取下载文件链接地址
...@@ -41,7 +41,7 @@ namespace Bailun.Discuz.Application.WeiPan ...@@ -41,7 +41,7 @@ namespace Bailun.Discuz.Application.WeiPan
/// <summary> /// <summary>
/// 递归获取所有首页下的所有文件列表数据 /// 递归获取所有首页下的所有文件列表数据
/// </summary> /// </summary>
Task<List<FileListTreeDto>> GetFileListTree(string userId, string fildId,bool isGetRedis = true); Task<List<FileListTreeDto>> GetFileListTree(string userId, string companyName, string fildId, bool isGetRedis = true, bool isDelCaching = false);
Task<AttachmentsDto> GetAttchmattachmentByFileId(string fileId); Task<AttachmentsDto> GetAttchmattachmentByFileId(string fileId);
......
...@@ -15,5 +15,6 @@ namespace Bailun.Discuz.Domain.WeiPan ...@@ -15,5 +15,6 @@ namespace Bailun.Discuz.Domain.WeiPan
[Column("father_file_id")] public string FatherFileId { get; set; } [Column("father_file_id")] public string FatherFileId { get; set; }
[Column("file_id")] public string File_Id { get; set; } [Column("file_id")] public string File_Id { get; set; }
[Column("company_name")] public string Company_Name { get; set; }
} }
} }
...@@ -45,9 +45,9 @@ namespace Bailun.Discuz.Service.Controllers ...@@ -45,9 +45,9 @@ namespace Bailun.Discuz.Service.Controllers
///// </summary> ///// </summary>
///// <returns></returns> ///// <returns></returns>
[HttpGet("GetFirstFileList")] [HttpGet("GetFirstFileList")]
public async Task<GetFileListResponse> GetFirstFileList(string userId) public async Task<GetFileListResponse> GetFirstFileList(string userId,string companyName)
{ {
return await _iweiPanService.GetFirstFileList(userId); return await _iweiPanService.GetFirstFileList(userId, companyName,true);
} }
///// <summary> ///// <summary>
...@@ -63,9 +63,9 @@ namespace Bailun.Discuz.Service.Controllers ...@@ -63,9 +63,9 @@ namespace Bailun.Discuz.Service.Controllers
/// 递归获取所有首页下的所有文件列表数据 /// 递归获取所有首页下的所有文件列表数据
/// </summary> /// </summary>
[HttpGet("GetFileListTree")] [HttpGet("GetFileListTree")]
public async Task<List<FileListTreeDto>> GetFileListTree(string userId, string fildId) public async Task<List<FileListTreeDto>> GetFileListTree(string userId, string fildId, string companyName)
{ {
return await _iweiPanService.GetFileListTree(userId, fildId); return await _iweiPanService.GetFileListTree(userId, companyName,fildId);
} }
/// <summary> /// <summary>
......
...@@ -17,6 +17,12 @@ ...@@ -17,6 +17,12 @@
"WeiPanSpaceId": "s.ww833808f6b8dc0745.610693393XlV", "WeiPanSpaceId": "s.ww833808f6b8dc0745.610693393XlV",
"WeiPanSpaceFileId": "s.ww833808f6b8dc0745.610693393XlV_d.6106935069y7b" "WeiPanSpaceFileId": "s.ww833808f6b8dc0745.610693393XlV_d.6106935069y7b"
}, },
"FourKQYWeChat": {
"AppId": "ww4e7dd5ae312eb101",
"Secret": "tbiUloEtNcsbSnKRBpVjeWjlDTOR7pPAdOtmn3kfQMM ",
"WeiPanSpaceId": "s.ww4e7dd5ae312eb101.614679173dzT",
"WeiPanSpaceFileId": "s.ww4e7dd5ae312eb101.614679173dzT_d.614679239rBH4"
},
"ApiServerUrl": { "ApiServerUrl": {
"ProductUrl": "http://pro.bailuntec.com", "ProductUrl": "http://pro.bailuntec.com",
"ProfitApiAddress": "http://profit.bailuntec.com", "ProfitApiAddress": "http://profit.bailuntec.com",
...@@ -43,5 +49,27 @@ ...@@ -43,5 +49,27 @@
"Host": "10.0.0.2", "Host": "10.0.0.2",
"UserName": "bailun", "UserName": "bailun",
"Password": "bailun2019" "Password": "bailun2019"
},
"QiNiu": {
"AccessKey": "QSvtvN4Ons1CiNzaMGqx8XmDaiM1L0ZqSwJ2YoTn",
"SecretKey": "yagRd-cBOVhkRGGT-o_reMqNVjI8_k7YwoTXkhrm",
"CdnUrl": "http://img.blsct.com",
"ProxyUrl": "http://172.106.221.14:8513",
"ProductsCdnUrl": "https://img.blsct.com",
"Bucket": "bailun-publish-img",
"ImgCDNs": [
"http://img.blsct.com",
"http://oyd60abh0.bkt.clouddn.com",
"http://elite99.blsct.com",
"http://bailun.blsct.com",
"http://gelnailpolish.blsct.com",
"http://nails.blsct.com",
"http://huilin.blsct.com",
"http://beauty.blsct.com",
"http://gelnails.blsct.com",
"http://digi.blsct.com",
"http://kiunobeauty.blsct.com",
"http://eumengman.blsct.com"
]
} }
} }
...@@ -2,6 +2,12 @@ ...@@ -2,6 +2,12 @@
"ConnectionStrings": { "ConnectionStrings": {
"Discuz": "Server=106.55.44.113;port=3306;database=discuz;uid=admin;password=e066d4d1;Convert Zero Datetime=True;Allow User Variables=True;pooling=true" "Discuz": "Server=106.55.44.113;port=3306;database=discuz;uid=admin;password=e066d4d1;Convert Zero Datetime=True;Allow User Variables=True;pooling=true"
}, },
//"redis": {
// "HostName": "127.0.0.1",
// "Port": "6379",
// "Password": "",
// "Defaultdatabase": 1
//},
"redis": { "redis": {
"HostName": "10.0.8.8", "HostName": "10.0.8.8",
"Port": "6379", "Port": "6379",
...@@ -20,8 +26,8 @@ ...@@ -20,8 +26,8 @@
"FourKQYWeChat": { "FourKQYWeChat": {
"AppId": "ww4e7dd5ae312eb101", "AppId": "ww4e7dd5ae312eb101",
"Secret": "tbiUloEtNcsbSnKRBpVjeWjlDTOR7pPAdOtmn3kfQMM ", "Secret": "tbiUloEtNcsbSnKRBpVjeWjlDTOR7pPAdOtmn3kfQMM ",
"WeiPanSpaceId": "s.ww4e7dd5ae312eb101.614410738dfa", "WeiPanSpaceId": "s.ww4e7dd5ae312eb101.614679173dzT",
"WeiPanSpaceFileId": "s.ww4e7dd5ae312eb101.614410738dfa_d.614411110Jd02" "WeiPanSpaceFileId": "s.ww4e7dd5ae312eb101.614679173dzT_d.614679239rBH4"
}, },
"ApiServerUrl": { "ApiServerUrl": {
"ProductUrl": "http://pro.bailuntec.com", "ProductUrl": "http://pro.bailuntec.com",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment