DuGuYang 1 tahun lalu
induk
melakukan
4815e77be9

+ 1 - 0
Config/Base.cs

@@ -11,6 +11,7 @@ namespace AppConfig
         public static string SqlConnStr1 = ConfigurationManager.AppSettings["SqlConnStr1"].ToString();
         public static string SqlConnStr2 = ConfigurationManager.AppSettings["SqlConnStr2"].ToString();
         public static string Host = Library.ConfigurationManager.AppSettings["Host"].ToString();
+        public static string OssHost = Library.ConfigurationManager.AppSettings["OssHost"].ToString();
         public static string SourceHost = Library.ConfigurationManager.AppSettings["SourceHost"].ToString();
         public static string Database = Library.ConfigurationManager.AppSettings["Database"].ToString();
         public static string defaultImage = Library.ConfigurationManager.AppSettings["Host"].ToString() + "/skin/app/default/static/images/default.jpg";

+ 2 - 1
Util/HaoDa/HaoDaHelper.cs

@@ -219,7 +219,8 @@ namespace MySystem
             {
                 return "";
             }
-            FileItem item = new FileItem(function.getPath(value.Split(',')[0]));
+            FileItem item = PublicFunction.GetNetFileItem(AppConfig.Base.OssHost + value.Split(',')[0]);
+            // FileItem item = new FileItem(function.getPath(value.Split(',')[0]));
             Dictionary<string, FileItem> files = new Dictionary<string, FileItem>();
             files.Add("file", item);
             var upLoadInfo = JsonMapper.ToObject(HaoDaHelper.Instance.DoPost(BoxRequestUrl + "/api/file/v1/upload_file", token, file, files, "utf-8"));

+ 1 - 1
Util/Main2/MerchantChangeSettlementCardRecordUtil.cs

@@ -115,7 +115,6 @@ namespace MySystem.Service.Main2
                 }).Entity;
             }
             maindb.SaveChanges();
-            maindb.Dispose();
 
             //实体赋值
             var request = ChangeMerchantCardSetUtil.SetValue(merchantChangeSettlementCardRecord, MerchantId);
@@ -140,6 +139,7 @@ namespace MySystem.Service.Main2
                 }
             }
 
+            maindb.Dispose();
             return "success";
         }
         #endregion

+ 73 - 0
Util/PublicFunction.cs

@@ -10,6 +10,7 @@ using Microsoft.IdentityModel.Tokens;
 using System.Security.Claims;
 using System.IdentityModel.Tokens.Jwt;
 using System.Text;
+using Aop.Api.Util;
 
 namespace MySystem
 {
@@ -213,5 +214,77 @@ namespace MySystem
             return new JwtSecurityTokenHandler().WriteToken(securityToken);
         }
         #endregion
+    
+    
+        public static decimal NumberFormat(decimal number, int floatCount = 2)
+        {
+            string str = number.ToString();
+            if (str.Contains("."))
+            {
+                string[] list = str.Split('.');
+                if (list[1].Length > floatCount)
+                {
+                    str = list[0] + "." + list[1].Substring(0, floatCount);
+                }
+            }
+            else
+            {
+                str += ".00";
+            }
+            return decimal.Parse(str);
+        }
+    
+
+
+
+
+        #region 获取网络文件内容
+
+        public static string GetNetFileContent(string url)
+        {
+            string textContent = "";     
+            using (var client = new System.Net.WebClient())
+            {
+                try
+                {
+                    textContent = client.DownloadString(url); // 通过 DownloadString 方法获取网页内容
+                }
+                catch (Exception ex)
+                {
+                    function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString() + "\n\n", "获取网络文件内容异常");
+                }
+            }
+            return textContent;
+        }
+
+        public static byte[] GetNetFileData(string url)
+        {
+            byte[] textContent = new byte[] { };
+            using (var client = new System.Net.WebClient())
+            {
+                try
+                {
+                    textContent = client.DownloadData(url); // 通过 DownloadString 方法获取网页内容
+                }
+                catch (Exception ex)
+                {
+                    function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString() + "\n\n", "获取网络文件流异常");
+                }
+            }
+            return textContent;
+        }
+
+        public static FileItem GetNetFileItem(string url)
+        {
+            string fileName = url;
+            if(fileName.Contains("/"))
+            {
+                fileName = fileName.Substring(fileName.LastIndexOf("/") + 1);
+            }
+            FileItem item = new FileItem(fileName, GetNetFileData(url));
+            return item;
+        }
+
+        #endregion
     }
 }

+ 5 - 5
appsettings.Development.json

@@ -9,7 +9,7 @@
   "AllowedHosts": "*",
   "Setting": {
     "Host": "http://localhost:5701/",
-    "OssHost": "http://mpap.kexiaoshuang.com",
+    "OssHost": "https://laikeba.oss-cn-chengdu.aliyuncs.com",
     "SourceHost": "http://mpap.kexiaoshuang.com",
     "Database": "MpAdminServer",
     "KxsSqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;",
@@ -20,10 +20,10 @@
     "RedisConnStr": "47.109.31.237:6379,password=klm@redis,DefaultDatabase=5,poolsize=500,preheat=50,asyncPipeline=true",
     "IOSAppVersion": "1.0.0",
     "AndroidAppVersion": "1.0.0",
-    "OSSKey": "",
-    "OSSSecret": "",
-    "OSSEndpoint": "",
-    "OSSBucketName": "",
+    "OSSKey": "LTAI5tJsPaNzqCSMCPwb8zfz",
+    "OSSSecret": "efM31Up75fQcgZ32U6xvAciagceQae",
+    "OSSEndpoint": "oss-cn-chengdu.aliyuncs.com",
+    "OSSBucketName": "laikeba",
     "AppSource": "/skin/app/default/",
     "JwtSecret": "JvDHuowbOnWiyxMIFc9gG5rw1LSSc0xx68L31oRfxS0",
     "JwtIss": "MpAdminServer",