lichunlei пре 3 година
родитељ
комит
470061a64f
56 измењених фајлова са 138 додато и 132 уклоњено
  1. 21 20
      AppStart/OssHelper.cs
  2. 6 6
      Areas/Admin/Views/BsServer/Advertisment/Add.cshtml
  3. 1 1
      Areas/Admin/Views/BsServer/Advertisment/Edit.cshtml
  4. 1 1
      Areas/Admin/Views/BsServer/Col/Add.cshtml
  5. 1 1
      Areas/Admin/Views/BsServer/Col/Edit.cshtml
  6. 1 1
      Areas/Admin/Views/BsServer/MsgPersonal/Add.cshtml
  7. 1 1
      Areas/Admin/Views/BsServer/MsgPersonal/Edit.cshtml
  8. 1 1
      Areas/Admin/Views/BsServer/MsgPlacard/Add.cshtml
  9. 1 1
      Areas/Admin/Views/BsServer/MsgPlacard/Edit.cshtml
  10. 2 2
      Areas/Admin/Views/BsServer/SystemSet/Add.cshtml
  11. 2 2
      Areas/Admin/Views/BsServer/SystemSet/Edit.cshtml
  12. 5 5
      Areas/Admin/Views/CashServer/UserIdentity/Add.cshtml
  13. 5 5
      Areas/Admin/Views/CashServer/UserIdentity/Edit.cshtml
  14. 1 1
      Areas/Admin/Views/MainServer/ActivityInfo/Add.cshtml
  15. 1 1
      Areas/Admin/Views/MainServer/ActivityInfo/Edit.cshtml
  16. 1 1
      Areas/Admin/Views/MainServer/AppVideo/Add.cshtml
  17. 1 1
      Areas/Admin/Views/MainServer/AppVideo/Edit.cshtml
  18. 2 2
      Areas/Admin/Views/MainServer/AppVideoList/Add.cshtml
  19. 2 2
      Areas/Admin/Views/MainServer/AppVideoList/Edit.cshtml
  20. 1 1
      Areas/Admin/Views/MainServer/Consumers/Add.cshtml
  21. 1 1
      Areas/Admin/Views/MainServer/Consumers/Edit.cshtml
  22. 1 1
      Areas/Admin/Views/MainServer/IndexIconList/Add.cshtml
  23. 1 1
      Areas/Admin/Views/MainServer/IndexIconList/Edit.cshtml
  24. 1 1
      Areas/Admin/Views/MainServer/MainCol/Add.cshtml
  25. 1 1
      Areas/Admin/Views/MainServer/MainCol/Edit.cshtml
  26. 17 17
      Areas/Admin/Views/MainServer/MerchantAddInfo/Add.cshtml
  27. 17 17
      Areas/Admin/Views/MainServer/MerchantAddInfo/Edit.cshtml
  28. 1 1
      Areas/Admin/Views/MainServer/MerchantCol/Add.cshtml
  29. 1 1
      Areas/Admin/Views/MainServer/MerchantCol/Edit.cshtml
  30. 2 2
      Areas/Admin/Views/MainServer/Merchants/Add.cshtml
  31. 2 2
      Areas/Admin/Views/MainServer/Merchants/AdminInfo.cshtml
  32. 2 2
      Areas/Admin/Views/MainServer/Merchants/Edit.cshtml
  33. 1 1
      Areas/Admin/Views/MainServer/OrderProduct/Add.cshtml
  34. 1 1
      Areas/Admin/Views/MainServer/OrderProduct/Edit.cshtml
  35. 1 1
      Areas/Admin/Views/MainServer/OrderRefund/Add.cshtml
  36. 1 1
      Areas/Admin/Views/MainServer/OrderRefund/Edit.cshtml
  37. 1 1
      Areas/Admin/Views/MainServer/ProductComment/Add.cshtml
  38. 1 1
      Areas/Admin/Views/MainServer/ProductComment/Edit.cshtml
  39. 1 1
      Areas/Admin/Views/MainServer/Products/Add.cshtml
  40. 1 1
      Areas/Admin/Views/MainServer/Products/Edit.cshtml
  41. 1 1
      Areas/Admin/Views/MainServer/StoreHouse/Import.cshtml
  42. 1 1
      Areas/Admin/Views/MainServer/UserCardForWeChat/Add.cshtml
  43. 1 1
      Areas/Admin/Views/MainServer/UserCardForWeChat/Edit.cshtml
  44. 1 1
      Areas/Admin/Views/MainServer/UserCashRecord/Import.cshtml
  45. 1 1
      Areas/Admin/Views/MainServer/UserCenterIconList/Add.cshtml
  46. 1 1
      Areas/Admin/Views/MainServer/UserCenterIconList/Edit.cshtml
  47. 1 1
      Areas/Admin/Views/MainServer/Users/Add.cshtml
  48. 1 1
      Areas/Admin/Views/MainServer/Users/Edit.cshtml
  49. 1 1
      Areas/Admin/Views/MainServer/Users/ProfitSet.cshtml
  50. 2 2
      Areas/Api/Controllers/PublicMethodController.cs
  51. 5 5
      Startup.cs
  52. 1 0
      appsettings.json
  53. 2 2
      wwwroot/other/mybjq/asp.net/upload_json.ashx.cs
  54. 4 3
      wwwroot/other/mybjq/asp.net/upload_json1.ashx
  55. 0 0
      wwwroot/other/oss/upload-min-oss.js
  56. 3 0
      wwwroot/other/oss/upload-min-oss.jsold

+ 21 - 20
AppStart/OssHelper.cs

@@ -12,27 +12,27 @@ namespace MySystem
 {
     public class OssHelper
     {
-        string key = ConfigurationManager.AppSettings["OSSKey"].ToString(); //阿里云AccessKey ID
-        string secret = ConfigurationManager.AppSettings["OSSSecret"].ToString();  //阿里云Access Key Secret
+        string key = "LTAI5t7ivibdYZTro4SRVZ9M"; //阿里云AccessKey ID
+        string secret = "nfr1bmbJbMhLuaj10iBORkuFfIAX7M";  //阿里云Access Key Secret
         public string PathName = ConfigurationManager.AppSettings["Database"].ToString();
-        public string endpoint = ConfigurationManager.AppSettings["OSSEndpoint"].ToString();  //endpoint
-        public string bucketName = ConfigurationManager.AppSettings["OSSBucketName"].ToString();
-        public string SourceHost = "";
-        public bool OssStatus = false;
+        public string endpoint = "oss-cn-chengdu.aliyuncs.com";  //endpoint
+        public string bucketName = "kexiaoshuang";
+        public string SourceHost = ConfigurationManager.AppSettings["OssHost"].ToString();
+        public bool OssStatus = true;
         public readonly static OssHelper Instance = new OssHelper();
         private OssHelper()
         {
-            SystemSet set = new WebCMSEntities().SystemSet.FirstOrDefault() ?? new SystemSet();
-            if (set.UploadOss == 1)
-            { 
-                SourceHost = "http://" + ConfigurationManager.AppSettings["OSSBucketName"].ToString() + "." + ConfigurationManager.AppSettings["OSSEndpoint"].ToString();
-                OssStatus = true;
-            }
-            else
-            { 
-                SourceHost = "";
-                OssStatus = false;
-            }
+            // SystemSet set = new WebCMSEntities().SystemSet.FirstOrDefault() ?? new SystemSet();
+            // if (set.UploadOss == 1)
+            // { 
+            //     SourceHost = "http://" + ConfigurationManager.AppSettings["OSSBucketName"].ToString() + "." + ConfigurationManager.AppSettings["OSSEndpoint"].ToString();
+            //     OssStatus = true;
+            // }
+            // else
+            // { 
+            //     SourceHost = "";
+            //     OssStatus = false;
+            // }
         }
 
         public void Start()//启动
@@ -82,8 +82,9 @@ namespace MySystem
         //要执行的方法
         public void ScanQueue(string data, string FileFullName)
         {
-            SystemSet set = new WebCMSEntities().SystemSet.FirstOrDefault() ?? new SystemSet();
-            if (set.UploadOss == 1)
+            // SystemSet set = new WebCMSEntities().SystemSet.FirstOrDefault() ?? new SystemSet();
+            // if (set.UploadOss == 1)
+            if(OssStatus)
             {
                 var client = new OssClient(endpoint, key, secret);
                 ScanQueue(data, FileFullName, client);
@@ -92,7 +93,7 @@ namespace MySystem
         private void ScanQueue(string data, string FileFullName, OssClient client)
         {
             // 上传文件。
-            string localFile = function.getPath(data);
+            string localFile = function.getPath(PathName + data);
             string filePath = data.TrimStart('/');
             if (!data.StartsWith(PathName))
             {

+ 6 - 6
Areas/Admin/Views/BsServer/Advertisment/Add.cshtml

@@ -66,7 +66,7 @@
                     <div class="layui-form-item layui-form-text">
                         <label class="layui-form-label">内容</label>
                         <div class="layui-input-block">
-<textarea class="layui-textarea" id="Contents" name="Contents" placeholder="请输入内容" style="width:100%;height:500px;"></textarea>
+                            <textarea class="layui-textarea" id="Contents" name="Contents" placeholder="请输入内容" style="width:100%;height:500px;"></textarea>
                         </div>
                     </div>
                     <div class="layui-form-item">
@@ -109,7 +109,7 @@
     </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
+    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script src="/other/mybjq/kindeditor-min.js"></script>
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
@@ -206,10 +206,10 @@
 
 
             //上传文件
-            WebUploadJs('PicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("AdvertismentPicPath"))),  function (filename) {
-$('#PicPathImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
-$('#PicPath').val(filename);
-});
+            WebUploadJs('PicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("AdvertismentPicPath"))),  function (filename) {
+                $('#PicPathImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
+                $('#PicPath').val(filename);
+            });
 
 
             //穿梭框

+ 1 - 1
Areas/Admin/Views/BsServer/Advertisment/Edit.cshtml

@@ -213,7 +213,7 @@
 
 
             //上传文件
-            WebUploadJs('PicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("AdvertismentPicPath"))),  function (filename) {
+            WebUploadJs('PicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("AdvertismentPicPath"))),  function (filename) {
                 $('#PicPathImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
                 $('#PicPath').val(filename);
             });

+ 1 - 1
Areas/Admin/Views/BsServer/Col/Add.cshtml

@@ -202,7 +202,7 @@
 
 
             //上传文件
-            WebUploadJs('ColPicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ColColPicPath"))),  function (filename) {
+            WebUploadJs('ColPicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ColColPicPath"))),  function (filename) {
 $('#ColPicPathImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#ColPicPath').val(filename);
 });

+ 1 - 1
Areas/Admin/Views/BsServer/Col/Edit.cshtml

@@ -211,7 +211,7 @@
 
 
             //上传文件
-            WebUploadJs('ColPicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ColColPicPath"))),  function (filename) {
+            WebUploadJs('ColPicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ColColPicPath"))),  function (filename) {
                 $('#ColPicPathImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
                 $('#ColPicPath').val(filename);
             });

+ 1 - 1
Areas/Admin/Views/BsServer/MsgPersonal/Add.cshtml

@@ -284,7 +284,7 @@
             
 
             //上传文件
-            WebUploadJs('BgPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MsgPersonalBgPic"))), function (filename) {
+            WebUploadJs('BgPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MsgPersonalBgPic"))), function (filename) {
 $('#BgPicImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#BgPic').val(filename);
 });

+ 1 - 1
Areas/Admin/Views/BsServer/MsgPersonal/Edit.cshtml

@@ -288,7 +288,7 @@
             
 
             //上传文件
-            WebUploadJs('BgPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MsgPersonalBgPic"))), function (filename) {
+            WebUploadJs('BgPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MsgPersonalBgPic"))), function (filename) {
 $('#BgPicImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#BgPic').val(filename);
 });

+ 1 - 1
Areas/Admin/Views/BsServer/MsgPlacard/Add.cshtml

@@ -340,7 +340,7 @@
 
 
             //上传文件
-            WebUploadJs('BgPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MsgPlacardBgPic"))), function (filename) {
+            WebUploadJs('BgPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MsgPlacardBgPic"))), function (filename) {
             $('#BgPicImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#BgPic').val(filename);
             });

+ 1 - 1
Areas/Admin/Views/BsServer/MsgPlacard/Edit.cshtml

@@ -379,7 +379,7 @@
 
 
             //上传文件
-            WebUploadJs('BgPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MsgPlacardBgPic"))), function (filename) {
+            WebUploadJs('BgPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MsgPlacardBgPic"))), function (filename) {
             $('#BgPicImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#BgPic').val(filename);
             });

+ 2 - 2
Areas/Admin/Views/BsServer/SystemSet/Add.cshtml

@@ -269,11 +269,11 @@
             
 
             //上传文件
-            WebUploadJs('UploadWaterPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', {}, {},  function (filename) {
+            WebUploadJs('UploadWaterPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', {}, {},  function (filename) {
 $('#UploadWaterPathImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#UploadWaterPath').val(filename);
 });
-WebUploadJs('LogoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', {}, {},  function (filename) {
+WebUploadJs('LogoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', {}, {},  function (filename) {
 $('#LogoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#Logo').val(filename);
 });

+ 2 - 2
Areas/Admin/Views/BsServer/SystemSet/Edit.cshtml

@@ -321,11 +321,11 @@
 
 
             //上传文件
-            WebUploadJs('UploadWaterPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', {}, {},  function (filename) {
+            WebUploadJs('UploadWaterPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', {}, {},  function (filename) {
                 $('#UploadWaterPathImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
                 $('#UploadWaterPath').val(filename);
             });
-            WebUploadJs('LogoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', {}, {},  function (filename) {
+            WebUploadJs('LogoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', {}, {},  function (filename) {
                 $('#LogoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
                 $('#Logo').val(filename);
             });

+ 5 - 5
Areas/Admin/Views/CashServer/UserIdentity/Add.cshtml

@@ -298,15 +298,15 @@
             
 
             //上传文件
-            WebUploadJs('CertFrontImageBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentityCertFrontImage"))), function (filename) {
+            WebUploadJs('CertFrontImageBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentityCertFrontImage"))), function (filename) {
 $('#CertFrontImageImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#CertFrontImage').val(filename);
 });
-WebUploadJs('CertReverseImageBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentityCertReverseImage"))), function (filename) {
+WebUploadJs('CertReverseImageBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentityCertReverseImage"))), function (filename) {
 $('#CertReverseImageImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#CertReverseImage').val(filename);
 });
-WebUploadJs('FaceVideoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentityFaceVideo"))), function (filename) {
+WebUploadJs('FaceVideoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentityFaceVideo"))), function (filename) {
 $('#FaceVideoFile').html(filename+'<a style="margin-left:20px;text-decoration:underline;color:cornflowerblue;" href="' + osshost + filename + '" target="_blank">点击查看附件</a>');
 $('#FaceVideo').val(filename);
 setTimeout(function () {
@@ -316,11 +316,11 @@ $("#FaceVideoProgressBar").css("display", "none");
 $("#FaceVideoProgressBar").css("display", "block");
 element.progress('FaceVideoProgress', file.percent+'%');
 });
-WebUploadJs('LivingImageBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentityLivingImage"))), function (filename) {
+WebUploadJs('LivingImageBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentityLivingImage"))), function (filename) {
 $('#LivingImageImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#LivingImage').val(filename);
 });
-WebUploadJs('SignImageUrlBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentitySignImageUrl"))), function (filename) {
+WebUploadJs('SignImageUrlBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentitySignImageUrl"))), function (filename) {
 $('#SignImageUrlImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#SignImageUrl').val(filename);
 });

+ 5 - 5
Areas/Admin/Views/CashServer/UserIdentity/Edit.cshtml

@@ -315,15 +315,15 @@
             
 
             //上传文件
-            WebUploadJs('CertFrontImageBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentityCertFrontImage"))), function (filename) {
+            WebUploadJs('CertFrontImageBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentityCertFrontImage"))), function (filename) {
 $('#CertFrontImageImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#CertFrontImage').val(filename);
 });
-WebUploadJs('CertReverseImageBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentityCertReverseImage"))), function (filename) {
+WebUploadJs('CertReverseImageBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentityCertReverseImage"))), function (filename) {
 $('#CertReverseImageImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#CertReverseImage').val(filename);
 });
-WebUploadJs('FaceVideoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentityFaceVideo"))), function (filename) {
+WebUploadJs('FaceVideoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentityFaceVideo"))), function (filename) {
 $('#FaceVideoFile').html(filename+'<a style="margin-left:20px;text-decoration:underline;color:cornflowerblue;" href="' + osshost + filename + '" target="_blank">点击查看附件</a>');
 $('#FaceVideo').val(filename);
 setTimeout(function () {
@@ -333,11 +333,11 @@ $("#FaceVideoProgressBar").css("display", "none");
 $("#FaceVideoProgressBar").css("display", "block");
 element.progress('FaceVideoProgress', file.percent+'%');
 });
-WebUploadJs('LivingImageBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentityLivingImage"))), function (filename) {
+WebUploadJs('LivingImageBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentityLivingImage"))), function (filename) {
 $('#LivingImageImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#LivingImage').val(filename);
 });
-WebUploadJs('SignImageUrlBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentitySignImageUrl"))), function (filename) {
+WebUploadJs('SignImageUrlBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentitySignImageUrl"))), function (filename) {
 $('#SignImageUrlImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#SignImageUrl').val(filename);
 });

+ 1 - 1
Areas/Admin/Views/MainServer/ActivityInfo/Add.cshtml

@@ -322,7 +322,7 @@ trigger: 'click'
 
 
             //上传文件
-            WebUploadJs('ActBannerBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ActivityInfoActBanner"))), function (filename) {
+            WebUploadJs('ActBannerBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ActivityInfoActBanner"))), function (filename) {
 $('#ActBannerImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#ActBanner').val(filename);
 });

+ 1 - 1
Areas/Admin/Views/MainServer/ActivityInfo/Edit.cshtml

@@ -340,7 +340,7 @@ trigger: 'click'
 
 
             //上传文件
-            WebUploadJs('ActBannerBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ActivityInfoActBanner"))), function (filename) {
+            WebUploadJs('ActBannerBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ActivityInfoActBanner"))), function (filename) {
 $('#ActBannerImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#ActBanner').val(filename);
 });

+ 1 - 1
Areas/Admin/Views/MainServer/AppVideo/Add.cshtml

@@ -210,7 +210,7 @@
             
 
             //上传文件
-            WebUploadJs('BannerPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("AppVideoBannerPic"))), function (filename) {
+            WebUploadJs('BannerPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("AppVideoBannerPic"))), function (filename) {
 $('#BannerPicImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#BannerPic').val(filename);
 });

+ 1 - 1
Areas/Admin/Views/MainServer/AppVideo/Edit.cshtml

@@ -216,7 +216,7 @@
             
 
             //上传文件
-            WebUploadJs('BannerPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("AppVideoBannerPic"))), function (filename) {
+            WebUploadJs('BannerPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("AppVideoBannerPic"))), function (filename) {
 $('#BannerPicImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#BannerPic').val(filename);
 });

+ 2 - 2
Areas/Admin/Views/MainServer/AppVideoList/Add.cshtml

@@ -229,7 +229,7 @@
             
 
             //上传文件
-            WebUploadJs('VideoUrlBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("AppVideoListVideoUrl"))), function (filename) {
+            WebUploadJs('VideoUrlBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("AppVideoListVideoUrl"))), function (filename) {
 $('#VideoUrlFile').html(filename+'<a style="margin-left:20px;text-decoration:underline;color:cornflowerblue;" href="' + osshost + filename + '" target="_blank">点击查看附件</a>');
 $('#VideoUrl').val(filename);
 setTimeout(function () {
@@ -239,7 +239,7 @@ $("#VideoUrlProgressBar").css("display", "none");
 $("#VideoUrlProgressBar").css("display", "block");
 element.progress('VideoUrlProgress', file.percent+'%');
 });
-WebUploadJs('BgPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("AppVideoListBgPic"))), function (filename) {
+WebUploadJs('BgPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("AppVideoListBgPic"))), function (filename) {
 $('#BgPicImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#BgPic').val(filename);
 });

+ 2 - 2
Areas/Admin/Views/MainServer/AppVideoList/Edit.cshtml

@@ -234,7 +234,7 @@
             
 
             //上传文件
-            WebUploadJs('VideoUrlBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("AppVideoListVideoUrl"))), function (filename) {
+            WebUploadJs('VideoUrlBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("AppVideoListVideoUrl"))), function (filename) {
 $('#VideoUrlFile').html(filename+'<a style="margin-left:20px;text-decoration:underline;color:cornflowerblue;" href="' + osshost + filename + '" target="_blank">点击查看附件</a>');
 $('#VideoUrl').val(filename);
 setTimeout(function () {
@@ -244,7 +244,7 @@ $("#VideoUrlProgressBar").css("display", "none");
 $("#VideoUrlProgressBar").css("display", "block");
 element.progress('VideoUrlProgress', file.percent+'%');
 });
-WebUploadJs('BgPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("AppVideoListBgPic"))), function (filename) {
+WebUploadJs('BgPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("AppVideoListBgPic"))), function (filename) {
 $('#BgPicImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#BgPic').val(filename);
 });

+ 1 - 1
Areas/Admin/Views/MainServer/Consumers/Add.cshtml

@@ -240,7 +240,7 @@
             
 
             //上传文件
-            WebUploadJs('HeadPhotoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ConsumersHeadPhoto"))), function (filename) {
+            WebUploadJs('HeadPhotoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ConsumersHeadPhoto"))), function (filename) {
 $('#HeadPhotoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#HeadPhoto').val(filename);
 });

+ 1 - 1
Areas/Admin/Views/MainServer/Consumers/Edit.cshtml

@@ -246,7 +246,7 @@
             
 
             //上传文件
-            WebUploadJs('HeadPhotoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ConsumersHeadPhoto"))), function (filename) {
+            WebUploadJs('HeadPhotoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ConsumersHeadPhoto"))), function (filename) {
 $('#HeadPhotoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#HeadPhoto').val(filename);
 });

+ 1 - 1
Areas/Admin/Views/MainServer/IndexIconList/Add.cshtml

@@ -210,7 +210,7 @@
             
 
             //上传文件
-            WebUploadJs('IconBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("IndexIconListIcon"))), function (filename) {
+            WebUploadJs('IconBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("IndexIconListIcon"))), function (filename) {
 $('#IconImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#Icon').val(filename);
 });

+ 1 - 1
Areas/Admin/Views/MainServer/IndexIconList/Edit.cshtml

@@ -216,7 +216,7 @@
             
 
             //上传文件
-            WebUploadJs('IconBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("IndexIconListIcon"))), function (filename) {
+            WebUploadJs('IconBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("IndexIconListIcon"))), function (filename) {
 $('#IconImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#Icon').val(filename);
 });

+ 1 - 1
Areas/Admin/Views/MainServer/MainCol/Add.cshtml

@@ -277,7 +277,7 @@
             
 
             //上传文件
-            WebUploadJs('ColPicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ColColPicPath"))), function (filename) {
+            WebUploadJs('ColPicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ColColPicPath"))), function (filename) {
 $('#ColPicPathImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#ColPicPath').val(filename);
 });

+ 1 - 1
Areas/Admin/Views/MainServer/MainCol/Edit.cshtml

@@ -283,7 +283,7 @@
             
 
             //上传文件
-            WebUploadJs('ColPicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ColColPicPath"))), function (filename) {
+            WebUploadJs('ColPicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ColColPicPath"))), function (filename) {
 $('#ColPicPathImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#ColPicPath').val(filename);
 });

+ 17 - 17
Areas/Admin/Views/MainServer/MerchantAddInfo/Add.cshtml

@@ -892,71 +892,71 @@
 
 
             //上传文件
-            WebUploadJs('LicenseCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoLicenseCopy"))), function (filename) {
+            WebUploadJs('LicenseCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoLicenseCopy"))), function (filename) {
             $('#LicenseCopyImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#LicenseCopy').val(filename);
             });
-            WebUploadJs('CertCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoCertCopy"))), function (filename) {
+            WebUploadJs('CertCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoCertCopy"))), function (filename) {
             $('#CertCopyImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#CertCopy').val(filename);
             });
-            WebUploadJs('OrganizationCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoOrganizationCopy"))), function (filename) {
+            WebUploadJs('OrganizationCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoOrganizationCopy"))), function (filename) {
             $('#OrganizationCopyImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#OrganizationCopy').val(filename);
             });
-            WebUploadJs('CertificateLetterCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoCertificateLetterCopy"))), function (filename) {
+            WebUploadJs('CertificateLetterCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoCertificateLetterCopy"))), function (filename) {
             $('#CertificateLetterCopyImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#CertificateLetterCopy').val(filename);
             });
-            WebUploadJs('UboInfoIdCardCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoUboInfoIdCardCopy"))), function (filename) {
+            WebUploadJs('UboInfoIdCardCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoUboInfoIdCardCopy"))), function (filename) {
             $('#UboInfoIdCardCopyImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#UboInfoIdCardCopy').val(filename);
             });
-            WebUploadJs('UboInfoIdCardNationalBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoUboInfoIdCardNational"))), function (filename) {
+            WebUploadJs('UboInfoIdCardNationalBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoUboInfoIdCardNational"))), function (filename) {
             $('#UboInfoIdCardNationalImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#UboInfoIdCardNational').val(filename);
             });
-            WebUploadJs('UboInfoIdDocCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoUboInfoIdDocCopy"))), function (filename) {
+            WebUploadJs('UboInfoIdDocCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoUboInfoIdDocCopy"))), function (filename) {
             $('#UboInfoIdDocCopyImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#UboInfoIdDocCopy').val(filename);
             });
-            WebUploadJs('StoreEntrancePicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoStoreEntrancePic"))), function (filename) {
+            WebUploadJs('StoreEntrancePicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoStoreEntrancePic"))), function (filename) {
             $('#StoreEntrancePicImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#StoreEntrancePic').val(filename);
             });
-            WebUploadJs('IndoorPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoIndoorPic"))), function (filename) {
+            WebUploadJs('IndoorPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoIndoorPic"))), function (filename) {
             $('#IndoorPicImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#IndoorPic').val(filename);
             });
-            WebUploadJs('MpPicsBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoMpPics"))), function (filename) {
+            WebUploadJs('MpPicsBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoMpPics"))), function (filename) {
             $('#MpPicsImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#MpPics').val(filename);
             });
-            WebUploadJs('MiniProgramPicsBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoMiniProgramPics"))), function (filename) {
+            WebUploadJs('MiniProgramPicsBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoMiniProgramPics"))), function (filename) {
             $('#MiniProgramPicsImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#MiniProgramPics').val(filename);
             });
-            WebUploadJs('AppPicsBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoAppPics"))), function (filename) {
+            WebUploadJs('AppPicsBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoAppPics"))), function (filename) {
             $('#AppPicsImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#AppPics').val(filename);
             });
-            WebUploadJs('WebAuthorisationBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoWebAuthorisation"))), function (filename) {
+            WebUploadJs('WebAuthorisationBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoWebAuthorisation"))), function (filename) {
             $('#WebAuthorisationImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#WebAuthorisation').val(filename);
             });
-            WebUploadJs('WeworkPicsBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoWeworkPics"))), function (filename) {
+            WebUploadJs('WeworkPicsBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoWeworkPics"))), function (filename) {
             $('#WeworkPicsImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#WeworkPics').val(filename);
             });
-            WebUploadJs('QualificationsBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoQualifications"))), function (filename) {
+            WebUploadJs('QualificationsBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoQualifications"))), function (filename) {
             $('#QualificationsImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#Qualifications').val(filename);
             });
-            WebUploadJs('IdCardCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoIdCardCopy"))), function (filename) {
+            WebUploadJs('IdCardCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoIdCardCopy"))), function (filename) {
             $('#IdCardCopyImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#IdCardCopy').val(filename);
             });
-            WebUploadJs('IdCardNationalBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoIdCardNational"))), function (filename) {
+            WebUploadJs('IdCardNationalBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoIdCardNational"))), function (filename) {
             $('#IdCardNationalImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#IdCardNational').val(filename);
             });

+ 17 - 17
Areas/Admin/Views/MainServer/MerchantAddInfo/Edit.cshtml

@@ -1063,71 +1063,71 @@
 
 
             //上传文件
-            WebUploadJs('LicenseCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoLicenseCopy"))), function (filename) {
+            WebUploadJs('LicenseCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoLicenseCopy"))), function (filename) {
             $('#LicenseCopyImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#LicenseCopy').val(filename);
             });
-            WebUploadJs('CertCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoCertCopy"))), function (filename) {
+            WebUploadJs('CertCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoCertCopy"))), function (filename) {
             $('#CertCopyImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#CertCopy').val(filename);
             });
-            WebUploadJs('OrganizationCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoOrganizationCopy"))), function (filename) {
+            WebUploadJs('OrganizationCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoOrganizationCopy"))), function (filename) {
             $('#OrganizationCopyImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#OrganizationCopy').val(filename);
             });
-            WebUploadJs('CertificateLetterCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoCertificateLetterCopy"))), function (filename) {
+            WebUploadJs('CertificateLetterCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoCertificateLetterCopy"))), function (filename) {
             $('#CertificateLetterCopyImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#CertificateLetterCopy').val(filename);
             });
-            WebUploadJs('UboInfoIdCardCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoUboInfoIdCardCopy"))), function (filename) {
+            WebUploadJs('UboInfoIdCardCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoUboInfoIdCardCopy"))), function (filename) {
             $('#UboInfoIdCardCopyImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#UboInfoIdCardCopy').val(filename);
             });
-            WebUploadJs('UboInfoIdCardNationalBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoUboInfoIdCardNational"))), function (filename) {
+            WebUploadJs('UboInfoIdCardNationalBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoUboInfoIdCardNational"))), function (filename) {
             $('#UboInfoIdCardNationalImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#UboInfoIdCardNational').val(filename);
             });
-            WebUploadJs('UboInfoIdDocCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoUboInfoIdDocCopy"))), function (filename) {
+            WebUploadJs('UboInfoIdDocCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoUboInfoIdDocCopy"))), function (filename) {
             $('#UboInfoIdDocCopyImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#UboInfoIdDocCopy').val(filename);
             });
-            WebUploadJs('StoreEntrancePicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoStoreEntrancePic"))), function (filename) {
+            WebUploadJs('StoreEntrancePicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoStoreEntrancePic"))), function (filename) {
             $('#StoreEntrancePicImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#StoreEntrancePic').val(filename);
             });
-            WebUploadJs('IndoorPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoIndoorPic"))), function (filename) {
+            WebUploadJs('IndoorPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoIndoorPic"))), function (filename) {
             $('#IndoorPicImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#IndoorPic').val(filename);
             });
-            WebUploadJs('MpPicsBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoMpPics"))), function (filename) {
+            WebUploadJs('MpPicsBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoMpPics"))), function (filename) {
             $('#MpPicsImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#MpPics').val(filename);
             });
-            WebUploadJs('MiniProgramPicsBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoMiniProgramPics"))), function (filename) {
+            WebUploadJs('MiniProgramPicsBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoMiniProgramPics"))), function (filename) {
             $('#MiniProgramPicsImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#MiniProgramPics').val(filename);
             });
-            WebUploadJs('AppPicsBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoAppPics"))), function (filename) {
+            WebUploadJs('AppPicsBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoAppPics"))), function (filename) {
             $('#AppPicsImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#AppPics').val(filename);
             });
-            WebUploadJs('WebAuthorisationBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoWebAuthorisation"))), function (filename) {
+            WebUploadJs('WebAuthorisationBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoWebAuthorisation"))), function (filename) {
             $('#WebAuthorisationImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#WebAuthorisation').val(filename);
             });
-            WebUploadJs('WeworkPicsBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoWeworkPics"))), function (filename) {
+            WebUploadJs('WeworkPicsBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoWeworkPics"))), function (filename) {
             $('#WeworkPicsImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#WeworkPics').val(filename);
             });
-            WebUploadJs('QualificationsBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoQualifications"))), function (filename) {
+            WebUploadJs('QualificationsBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoQualifications"))), function (filename) {
             $('#QualificationsImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#Qualifications').val(filename);
             });
-            WebUploadJs('IdCardCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoIdCardCopy"))), function (filename) {
+            WebUploadJs('IdCardCopyBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoIdCardCopy"))), function (filename) {
             $('#IdCardCopyImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#IdCardCopy').val(filename);
             });
-            WebUploadJs('IdCardNationalBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoIdCardNational"))), function (filename) {
+            WebUploadJs('IdCardNationalBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantAddInfoIdCardNational"))), function (filename) {
             $('#IdCardNationalImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
             $('#IdCardNational').val(filename);
             });

+ 1 - 1
Areas/Admin/Views/MainServer/MerchantCol/Add.cshtml

@@ -218,7 +218,7 @@
 
 
             //上传文件
-            WebUploadJs('ColPicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantColColPicPath"))),  function (filename) {
+            WebUploadJs('ColPicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantColColPicPath"))),  function (filename) {
 $('#ColPicPathImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#ColPicPath').val(filename);
 });

+ 1 - 1
Areas/Admin/Views/MainServer/MerchantCol/Edit.cshtml

@@ -226,7 +226,7 @@
 
 
             //上传文件
-            WebUploadJs('ColPicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantColColPicPath"))),  function (filename) {
+            WebUploadJs('ColPicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantColColPicPath"))),  function (filename) {
                 $('#ColPicPathImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
                 $('#ColPicPath').val(filename);
             });

+ 2 - 2
Areas/Admin/Views/MainServer/Merchants/Add.cshtml

@@ -346,11 +346,11 @@
 
 
             //上传文件
-            WebUploadJs('LogoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantsLogo"))),  function (filename) {
+            WebUploadJs('LogoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantsLogo"))),  function (filename) {
                 $('#LogoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
                 $('#Logo').val(filename);
             });
-            WebUploadJs('BusinessLicenseBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantsBusinessLicense"))),  function (filename) {
+            WebUploadJs('BusinessLicenseBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantsBusinessLicense"))),  function (filename) {
                 $('#BusinessLicenseImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
                 $('#BusinessLicense').val(filename);
             });

+ 2 - 2
Areas/Admin/Views/MainServer/Merchants/AdminInfo.cshtml

@@ -205,11 +205,11 @@
             });
 
             //上传文件
-            WebUploadJs('LogoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantsLogo"))),  function (filename) {
+            WebUploadJs('LogoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantsLogo"))),  function (filename) {
                 $('#LogoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
                 $('#Logo').val(filename);
             });
-            WebUploadJs('BusinessLicenseBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantsBusinessLicense"))),  function (filename) {
+            WebUploadJs('BusinessLicenseBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantsBusinessLicense"))),  function (filename) {
                 $('#BusinessLicenseImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
                 $('#BusinessLicense').val(filename);
             });

+ 2 - 2
Areas/Admin/Views/MainServer/Merchants/Edit.cshtml

@@ -358,11 +358,11 @@
 
 
             //上传文件
-            WebUploadJs('LogoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantsLogo"))),  function (filename) {
+            WebUploadJs('LogoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantsLogo"))),  function (filename) {
 $('#LogoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#Logo').val(filename);
 });
-WebUploadJs('BusinessLicenseBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantsBusinessLicense"))),  function (filename) {
+WebUploadJs('BusinessLicenseBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MerchantsBusinessLicense"))),  function (filename) {
 $('#BusinessLicenseImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#BusinessLicense').val(filename);
 });

+ 1 - 1
Areas/Admin/Views/MainServer/OrderProduct/Add.cshtml

@@ -257,7 +257,7 @@
             
 
             //上传文件
-            WebUploadJs('ProductPhotoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', {}, {},  function (filename) {
+            WebUploadJs('ProductPhotoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', {}, {},  function (filename) {
 $('#ProductPhotoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#ProductPhoto').val(filename);
 });

+ 1 - 1
Areas/Admin/Views/MainServer/OrderProduct/Edit.cshtml

@@ -266,7 +266,7 @@
             
 
             //上传文件
-            WebUploadJs('ProductPhotoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', {}, {},  function (filename) {
+            WebUploadJs('ProductPhotoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', {}, {},  function (filename) {
 $('#ProductPhotoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#ProductPhoto').val(filename);
 });

+ 1 - 1
Areas/Admin/Views/MainServer/OrderRefund/Add.cshtml

@@ -279,7 +279,7 @@
             
 
             //上传文件
-            WebUploadJs('PhotosBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', {}, {},  function (filename) {
+            WebUploadJs('PhotosBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', {}, {},  function (filename) {
 $('#PhotosImage').append('<div style="float:left; width:85px; height:120px; margin:10px; padding:10px; border:1px solid #cccccc; text-align:center;"><div style="height:85px;"><img src="' + osshost + filename + '" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')" /></div><input type="text" placeholder="图片说明" value="" style="width:85px; margin-top:5px; font-size:12px;" /><br><a href="javascript:;" onclick="movePrev(this,\'Photos\')" style="color:#000; font-size:12px; padding:0px 2px;">左移</a><a href="javascript:;" onclick="moveNext(this,\'Photos\')" style="color:#000; font-size:12px; padding:0px 2px;">右移</a><a href="javascript:;" onclick="deletePic(this,\'Photos\')" style="color:#000; font-size:12px; padding:0px 2px;">删除</a></div>')
 });
 

+ 1 - 1
Areas/Admin/Views/MainServer/OrderRefund/Edit.cshtml

@@ -398,7 +398,7 @@ string right = ViewBag.right as string;
 
 
                 //上传文件
-                WebUploadJs('PhotosBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', {}, {},  function (filename) {
+                WebUploadJs('PhotosBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', {}, {},  function (filename) {
                     $('#PhotosImage').append(
                         '<div style="float:left; width:85px; height:120px; margin:10px; padding:10px; border:1px solid #cccccc; text-align:center;"><div style="height:85px;"><img src="' +
                         osshost + filename +

+ 1 - 1
Areas/Admin/Views/MainServer/ProductComment/Add.cshtml

@@ -245,7 +245,7 @@
             
 
             //上传文件
-            WebUploadJs('PhotoListBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', {}, {},  function (filename) {
+            WebUploadJs('PhotoListBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', {}, {},  function (filename) {
 $('#PhotoListImage').append('<div style="float:left; width:85px; height:120px; margin:10px; padding:10px; border:1px solid #cccccc; text-align:center;"><div style="height:85px;"><img src="' + osshost + filename + '" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')" /></div><input type="text" placeholder="图片说明" value="" style="width:85px; margin-top:5px; font-size:12px;" /><br><a href="javascript:;" onclick="movePrev(this,\'PhotoList\')" style="color:#000; font-size:12px; padding:0px 2px;">左移</a><a href="javascript:;" onclick="moveNext(this,\'PhotoList\')" style="color:#000; font-size:12px; padding:0px 2px;">右移</a><a href="javascript:;" onclick="deletePic(this,\'PhotoList\')" style="color:#000; font-size:12px; padding:0px 2px;">删除</a></div>')
 });
 

+ 1 - 1
Areas/Admin/Views/MainServer/ProductComment/Edit.cshtml

@@ -300,7 +300,7 @@ string right = ViewBag.right as string;
 
                 //上传文件
                 WebUploadJs('PhotoListBtn',
-                    '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', {}, {},
+                    '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', {}, {},
                     function (filename) {
                         $('#PhotoListImage').append(
                             '<div style="float:left; width:85px; height:120px; margin:10px; padding:10px; border:1px solid #cccccc; text-align:center;"><div style="height:85px;"><img src="' +

+ 1 - 1
Areas/Admin/Views/MainServer/Products/Add.cshtml

@@ -470,7 +470,7 @@
 
 
                 //上传文件
-                WebUploadJs('DetailPicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ProductsDetailPicPath"))),  function (filename) {
+                WebUploadJs('DetailPicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ProductsDetailPicPath"))),  function (filename) {
                     $('#DetailPicPathImage').append('<div style="float:left; width:285px; height:320px; margin:10px; padding:10px; border:1px solid #cccccc; text-align:center;"><div style="height:285px;"><img src="' + osshost + filename + '" style="max-width:285px; max-height:285px;" onclick="showBigPic(\'' + osshost + filename + '\')" /></div><input type="text" placeholder="图片说明" value="" style="width:285px; margin-top:5px; font-size:12px;" /><br><a href="javascript:;" onclick="movePrev(this,\'DetailPicPath\')" style="color:#000; font-size:12px; padding:0px 2px;">左移</a><a href="javascript:;" onclick="moveNext(this,\'DetailPicPath\')" style="color:#000; font-size:12px; padding:0px 2px;">右移</a><a href="javascript:;" onclick="deletePic(this,\'DetailPicPath\')" style="color:#000; font-size:12px; padding:0px 2px;">删除</a><a href="javascript:;" onclick="setListPhoto(\'' + filename + '\')" style="color:#000; font-size:12px; padding:0px 2px;">设为缩略图</a></div>');
                 });
 

+ 1 - 1
Areas/Admin/Views/MainServer/Products/Edit.cshtml

@@ -487,7 +487,7 @@
 
 
                 //上传文件
-                WebUploadJs('DetailPicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ProductsDetailPicPath"))),  function (filename) {
+                WebUploadJs('DetailPicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ProductsDetailPicPath"))),  function (filename) {
                     $('#DetailPicPathImage').append('<div style="float:left; width:285px; height:320px; margin:10px; padding:10px; border:1px solid #cccccc; text-align:center;"><div style="height:285px;"><img src="' + osshost + filename + '" style="max-width:285px; max-height:285px;" onclick="showBigPic(\'' + osshost + filename + '\')" /></div><input type="text" placeholder="图片说明" value="" style="width:285px; margin-top:5px; font-size:12px;" /><br><a href="javascript:;" onclick="movePrev(this,\'DetailPicPath\')" style="color:#000; font-size:12px; padding:0px 2px;">左移</a><a href="javascript:;" onclick="moveNext(this,\'DetailPicPath\')" style="color:#000; font-size:12px; padding:0px 2px;">右移</a><a href="javascript:;" onclick="deletePic(this,\'DetailPicPath\')" style="color:#000; font-size:12px; padding:0px 2px;">删除</a><a href="javascript:;" onclick="setListPhoto(\'' + filename + '\')" style="color:#000; font-size:12px; padding:0px 2px;">设为缩略图</a></div>')
                 });
 

+ 1 - 1
Areas/Admin/Views/MainServer/StoreHouse/Import.cshtml

@@ -120,7 +120,7 @@
             
 
             //上传文件
-            WebUploadJs('ExcelPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', {width:0,height:0,quality:0},{max_file_size:1048576},  function (filename) {
+            WebUploadJs('ExcelPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', {width:0,height:0,quality:0},{max_file_size:1048576},  function (filename) {
                 $('#ExcelPathFile').html(filename);
                 $('#ExcelPath').val(filename);
             });

+ 1 - 1
Areas/Admin/Views/MainServer/UserCardForWeChat/Add.cshtml

@@ -314,7 +314,7 @@
             
 
             //上传文件
-            WebUploadJs('LogoUrlBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserCardForWeChatLogoUrl"))), function (filename) {
+            WebUploadJs('LogoUrlBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserCardForWeChatLogoUrl"))), function (filename) {
 $('#LogoUrlImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#LogoUrl').val(filename);
 });

+ 1 - 1
Areas/Admin/Views/MainServer/UserCardForWeChat/Edit.cshtml

@@ -323,7 +323,7 @@
             
 
             //上传文件
-            WebUploadJs('LogoUrlBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserCardForWeChatLogoUrl"))), function (filename) {
+            WebUploadJs('LogoUrlBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserCardForWeChatLogoUrl"))), function (filename) {
 $('#LogoUrlImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#LogoUrl').val(filename);
 });

+ 1 - 1
Areas/Admin/Views/MainServer/UserCashRecord/Import.cshtml

@@ -107,7 +107,7 @@
             
 
             //上传文件
-            WebUploadJs('ExcelPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', {width:0,height:0,quality:0},{max_file_size:1048576},  function (filename) {
+            WebUploadJs('ExcelPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', {width:0,height:0,quality:0},{max_file_size:1048576},  function (filename) {
                 $('#ExcelPathFile').html(filename);
                 $('#ExcelPath').val(filename);
             });

+ 1 - 1
Areas/Admin/Views/MainServer/UserCenterIconList/Add.cshtml

@@ -210,7 +210,7 @@
             
 
             //上传文件
-            WebUploadJs('IconBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserCenterIconListIcon"))), function (filename) {
+            WebUploadJs('IconBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserCenterIconListIcon"))), function (filename) {
 $('#IconImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#Icon').val(filename);
 });

+ 1 - 1
Areas/Admin/Views/MainServer/UserCenterIconList/Edit.cshtml

@@ -216,7 +216,7 @@
             
 
             //上传文件
-            WebUploadJs('IconBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserCenterIconListIcon"))), function (filename) {
+            WebUploadJs('IconBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserCenterIconListIcon"))), function (filename) {
 $('#IconImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 $('#Icon').val(filename);
 });

+ 1 - 1
Areas/Admin/Views/MainServer/Users/Add.cshtml

@@ -222,7 +222,7 @@
             });
 
             //上传文件
-            WebUploadJs('HeadPhotoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UsersHeadPhoto"))),  function (filename) {
+            WebUploadJs('HeadPhotoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UsersHeadPhoto"))),  function (filename) {
                 $('#HeadPhotoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
                 $('#HeadPhoto').val(filename);
             });

+ 1 - 1
Areas/Admin/Views/MainServer/Users/Edit.cshtml

@@ -246,7 +246,7 @@
             });
 
             //上传文件
-            WebUploadJs('HeadPhotoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UsersHeadPhoto"))),  function (filename) {
+            WebUploadJs('HeadPhotoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UsersHeadPhoto"))),  function (filename) {
                 $('#HeadPhotoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
                 $('#HeadPhoto').val(filename);
             });

+ 1 - 1
Areas/Admin/Views/MainServer/Users/ProfitSet.cshtml

@@ -222,7 +222,7 @@
             });
 
             //上传文件
-            WebUploadJs('HeadPhotoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UsersHeadPhoto"))),  function (filename) {
+            WebUploadJs('HeadPhotoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UsersHeadPhoto"))),  function (filename) {
                 $('#HeadPhotoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
                 $('#HeadPhoto').val(filename);
             });

+ 2 - 2
Areas/Api/Controllers/PublicMethodController.cs

@@ -58,10 +58,10 @@ namespace MySystem.Areas.Api.Controllers
         public object EditorUpload([FromForm] IFormCollection rf)
         {
             //文件保存目录路径
-            String savePath = "/up/";
+            String savePath = "/up/v2/";
 
             //文件保存目录URL
-            String saveUrl = "/up/";
+            String saveUrl = "/up/v2/";
 
             //定义允许上传的文件扩展名
             Hashtable extTable = new Hashtable();

+ 5 - 5
Startup.cs

@@ -133,11 +133,11 @@ namespace MySystem
                     pattern: "{controller=Home}/{action=Index}/{Id?}");
             });
 
-            ResetUserTradeService.Instance.Start();
-            ResetMerchantTradeService.Instance.Start();
-            SycnProfitServiceV2.Instance.Start();
-            ExcelHelper.Instance.Start();
-            TestHelper.Instance.Start();
+            // ResetUserTradeService.Instance.Start();
+            // ResetMerchantTradeService.Instance.Start();
+            // SycnProfitServiceV2.Instance.Start();
+            // ExcelHelper.Instance.Start();
+            // TestHelper.Instance.Start();
         }
 
 

+ 1 - 0
appsettings.json

@@ -15,6 +15,7 @@
     "WebServiceUrl": "",
     "DbSchemeUrl": "",
     "Host": "http://test.bs.kexiaoshuang.com/",
+    "OssHost": "http://oss.kexiaoshuang.com",
     "Database": "KxsMainServer",
     "SqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer2;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer2;charset=utf8;",
     "StatSqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer2;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer2;charset=utf8;ConnectionTimeout=600;DefaultCommandTimeout=600;",

+ 2 - 2
wwwroot/other/mybjq/asp.net/upload_json.ashx.cs

@@ -20,10 +20,10 @@ namespace MySystem.mybjq.asp.net
             String aspxUrl = context.Request.Path.Substring(0, context.Request.Path.LastIndexOf("/") + 1);
 
             //文件保存目录路径
-            String savePath = "/up/";
+            String savePath = "/up/v2/";
 
             //文件保存目录URL
-            String saveUrl = "/up/";
+            String saveUrl = "/up/v2/";
 
             //定义允许上传的文件扩展名
             Hashtable extTable = new Hashtable();

+ 4 - 3
wwwroot/other/mybjq/asp.net/upload_json1.ashx

@@ -24,10 +24,10 @@ public class Upload : IHttpHandler
         String aspxUrl = context.Request.Path.Substring(0, context.Request.Path.LastIndexOf("/") + 1);
 
         //文件保存目录路径
-        String savePath = "/up/";
+        String savePath = "/up/v2/";
 
         //文件保存目录URL
-        String saveUrl = "/up/";
+        String saveUrl = "/up/v2/";
 
         //定义允许上传的文件扩展名
         Hashtable extTable = new Hashtable();
@@ -112,7 +112,8 @@ public class Upload : IHttpHandler
 
         Hashtable hash = new Hashtable();
         hash["error"] = 0;
-        hash["url"] = fileUrl;
+        hash["url"] = MySystem.OssHelper.Instance.SourceHost + fileUrl;
+        MySystem.OssHelper.Instance.ScanQueue(fileUrl, "");
         context.Response.AddHeader("Content-Type", "text/html; charset=UTF-8");
         context.Response.Write(JsonMapper.ToJson(hash));
         context.Response.End();

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
wwwroot/other/oss/upload-min-oss.js


Разлика између датотеке није приказан због своје велике величине
+ 3 - 0
wwwroot/other/oss/upload-min-oss.jsold


Неке датотеке нису приказане због велике количине промена