暂存

Areas/Api/Controllers/BaseController.cs

@@ -196,11 +196,10 @@ namespace MySystem.Areas.Api.Controllers
                 {
                     return picpath;
                 }
-                if(picpath.Contains("/v2/") || picpath.Contains("/upload/"))
+                if (picpath.StartsWith("/miniappHeadPhoto"))
                 {
                     return OssHost + picpath;
                 }
-                return SourceHost + picpath;
             }
             return OssHost + "/default.png";
         }
@@ -218,7 +217,7 @@ namespace MySystem.Areas.Api.Controllers
                 {
                     return picpath;
                 }
-                if(picpath.Contains("/v2/"))
+                if (picpath.Contains("/v2/"))
                 {
                     return OssHost + picpath;
                 }
@@ -246,9 +245,9 @@ namespace MySystem.Areas.Api.Controllers
                 {
                     string srcString = m.Value;
                     string picPath = srcString.Replace("src=\"", "").Replace("\"", "");
-                    if(!picPath.StartsWith("http"))
+                    if (!picPath.StartsWith("http"))
                     {
-                        if(picPath.Contains("/v2/") || picPath.Contains("/up/"))
+                        if (picPath.Contains("/v2/") || picPath.Contains("/up/"))
                         {
                             picPath = OssHost + picPath;
                         }

Areas/Api/Controllers/v1/MainServer/ConsumersController.cs

@@ -79,16 +79,18 @@ namespace MySystem.Areas.Api.Controllers.v1
         public JsonResult OssInfo()
         {
             Dictionary<string, object> Obj = new Dictionary<string, object>();
-            var OssUrl = "oss-cn-chengdu.aliyuncs.com";
-            var AccessKeyId = "LTAI5tNfshCAkuZkpxGTEoxb";
-            var AccessKeySecret = "gnLlKh1fRUsxf6Bio4b2284ZlqYx4H";
+            var time = DateTime.Now.ToString("yyyyMMdd");
+            var dir = "/miniappHeadPhoto/" + time.Substring(0, 4) + "/" + time.Substring(4, 2) + "/" + time.Substring(6, 2) + "/";
+            var OssUrl = "https://laikeba.oss-cn-chengdu.aliyuncs.com";
+            // https://laikeba.oss-cn-chengdu.aliyuncs.com/miniappHeadPhoto/2024/01/17/lkb-1705458639623.jpg
+            var AccessKeyId = "LTAI5tJsPaNzqCSMCPwb8zfz";
+            var AccessKeySecret = "efM31Up75fQcgZ32U6xvAciagceQae";
 
-            var dir = DateTime.Now.ToString("yyyyMMdd") + "/";
             // 构造OssClient实例。 endpoint 格式:https://oss-cn-beijing.aliyuncs.com
             var ossClient = new OssClient(OssUrl, AccessKeyId, AccessKeySecret);
             var config = new PolicyConditions();
             config.AddConditionItem(PolicyConditions.CondContentLengthRange, 1, 1024L * 1024 * 1024 * 5);// 文件大小范围：单位byte
-            // config.AddConditionItem(MatchMode.StartWith, PolicyConditions.CondKey, dir);
+            config.AddConditionItem(MatchMode.StartWith, PolicyConditions.CondKey, dir);
             // config.AddConditionItem(PolicyConditions.CondSuccessActionStatus, "200");
             var expire = DateTimeOffset.Now.AddMinutes(30);// 过期时间
             // 生成 Policy，并进行 Base64 编码
@@ -99,7 +101,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             var bytes = hmac.ComputeHash(Encoding.UTF8.GetBytes(policyBase64));
             var Signature = Convert.ToBase64String(bytes);
 
-            Obj.Add("OssUrl", OssUrl);
+            Obj.Add("OssUrl", OssUrl + dir);
             Obj.Add("AccessKeyId", AccessKeyId);
             Obj.Add("AccessKeySecret", AccessKeySecret);
             Obj.Add("Policy", policyBase64);

Areas/Api/Controllers/v1/MainServer/MerchantInfoController.cs

@@ -64,7 +64,8 @@ namespace MySystem.Areas.Api.Controllers.v1
             }
             condition += limitString;
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            DataTable dt = CustomerSqlConn.dtable("SELECT DISTINCT s.Name,s.Id,s.Kind,s.Areas,s.Address,s.Popularity,s.Longitude,s.Latitude,s.ServicePhone,s.CertMerchantName,s.MerchantShortname,s.StoreEntrancePic,s.BusinessName,s.distance FROM(SELECT aa.*, FORMAT(ST_DISTANCE(POINT(aa.Longitude, aa.Latitude), POINT(" + Longitude + ", " + Latitude + ")),2) AS distance FROM (SELECT a.Id,1 Kind,a.Name,a.Areas,a.Address,a.Popularity,a.Longitude,a.Latitude,b.ServicePhone,b.CertMerchantName,b.MerchantShortname,b.StoreEntrancePic,b.QualificationType BusinessName FROM(SELECT Id,Name,Areas,Address,Popularity,Longitude,Latitude,Mobile FROM QrCodePlateMainServer.MerchantInfo WHERE IsAct=1 AND (Status=2 OR QueryCount=2))a LEFT JOIN (SELECT Id,ServicePhone,CertMerchantName,MerchantShortname,StoreEntrancePic,SalesScenesType,Qualifications,QualificationType,BizAddressCode,BizStoreAddress FROM QrCodePlateMainServer.MerchantAddInfo)b ON a.Id=b.Id UNION ALL SELECT a.Id,2 Kind,a.Name,a.Areas,a.Address,a.Popularity,a.Longitude,a.Latitude,b.ServicePhone,b.CertMerchantName,b.MerchantShortname,b.StoreEntrancePic,c.Name BusinessName FROM(SELECT Id,Name,Areas,Address,Popularity,Longitude,Latitude,Mobile FROM QrCodePlateMainServer2.MerchantInfo WHERE IsAct=1 AND (Status=2 OR QueryCount=2))a LEFT JOIN (SELECT Id,ServicePhone,CertMerchantName,MerchantShortname,StoreEntrancePic,BusinessId,BizAddressCode,BizStoreAddress FROM QrCodePlateMainServer2.MerchantAddInfo)b ON a.Id=b.Id LEFT JOIN (SELECT * FROM BusinessScope)c ON b.BusinessId=c.Id)aa)s" + condition, AppConfig.Base.SqlConnStr);
+            var aa = "SELECT DISTINCT s.Name,s.Id,s.Kind,s.Areas,s.Address,s.Popularity,s.Longitude,s.Latitude,s.ServicePhone,s.CertMerchantName,s.MerchantShortname,s.StoreEntrancePic,s.BusinessName,s.distance FROM(SELECT aa.*, FORMAT(ST_DISTANCE_SPHERE(POINT(aa.Longitude, aa.Latitude), POINT(" + Longitude + ", " + Latitude + ")),2) AS distance FROM (SELECT a.Id,1 Kind,a.Name,a.Areas,a.Address,a.Popularity,a.Longitude,a.Latitude,b.ServicePhone,b.CertMerchantName,b.MerchantShortname,b.StoreEntrancePic,b.QualificationType BusinessName FROM(SELECT Id,Name,Areas,Address,Popularity,Longitude,Latitude,Mobile FROM QrCodePlateMainServer.MerchantInfo WHERE IsAct=1 AND (Status=2 OR QueryCount=2))a LEFT JOIN (SELECT Id,ServicePhone,CertMerchantName,MerchantShortname,StoreEntrancePic,SalesScenesType,Qualifications,QualificationType,BizAddressCode,BizStoreAddress FROM QrCodePlateMainServer.MerchantAddInfo)b ON a.Id=b.Id UNION ALL SELECT a.Id,2 Kind,a.Name,a.Areas,a.Address,a.Popularity,a.Longitude,a.Latitude,b.ServicePhone,b.CertMerchantName,b.MerchantShortname,b.StoreEntrancePic,c.Name BusinessName FROM(SELECT Id,Name,Areas,Address,Popularity,Longitude,Latitude,Mobile FROM QrCodePlateMainServer2.MerchantInfo WHERE IsAct=1 AND (Status=2 OR QueryCount=2))a LEFT JOIN (SELECT Id,ServicePhone,CertMerchantName,MerchantShortname,StoreEntrancePic,BusinessId,BizAddressCode,BizStoreAddress FROM QrCodePlateMainServer2.MerchantAddInfo)b ON a.Id=b.Id LEFT JOIN (SELECT * FROM BusinessScope)c ON b.BusinessId=c.Id)aa)s" + condition;
+            DataTable dt = CustomerSqlConn.dtable("SELECT DISTINCT s.Name,s.Id,s.Kind,s.Areas,s.Address,s.Popularity,s.Longitude,s.Latitude,s.ServicePhone,s.CertMerchantName,s.MerchantShortname,s.StoreEntrancePic,s.BusinessName,s.distance FROM(SELECT aa.*, FORMAT(ST_DISTANCE_SPHERE(POINT(aa.Longitude, aa.Latitude), POINT(" + Longitude + ", " + Latitude + ")),2) AS distance FROM (SELECT a.Id,1 Kind,a.Name,a.Areas,a.Address,a.Popularity,a.Longitude,a.Latitude,b.ServicePhone,b.CertMerchantName,b.MerchantShortname,b.StoreEntrancePic,b.QualificationType BusinessName FROM(SELECT Id,Name,Areas,Address,Popularity,Longitude,Latitude,Mobile FROM QrCodePlateMainServer.MerchantInfo WHERE IsAct=1 AND (Status=2 OR QueryCount=2))a LEFT JOIN (SELECT Id,ServicePhone,CertMerchantName,MerchantShortname,StoreEntrancePic,SalesScenesType,Qualifications,QualificationType,BizAddressCode,BizStoreAddress FROM QrCodePlateMainServer.MerchantAddInfo)b ON a.Id=b.Id UNION ALL SELECT a.Id,2 Kind,a.Name,a.Areas,a.Address,a.Popularity,a.Longitude,a.Latitude,b.ServicePhone,b.CertMerchantName,b.MerchantShortname,b.StoreEntrancePic,c.Name BusinessName FROM(SELECT Id,Name,Areas,Address,Popularity,Longitude,Latitude,Mobile FROM QrCodePlateMainServer2.MerchantInfo WHERE IsAct=1 AND (Status=2 OR QueryCount=2))a LEFT JOIN (SELECT Id,ServicePhone,CertMerchantName,MerchantShortname,StoreEntrancePic,BusinessId,BizAddressCode,BizStoreAddress FROM QrCodePlateMainServer2.MerchantAddInfo)b ON a.Id=b.Id LEFT JOIN (SELECT * FROM BusinessScope)c ON b.BusinessId=c.Id)aa)s" + condition, AppConfig.Base.SqlConnStr);
             foreach (DataRow dr in dt.Rows)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
@@ -107,6 +108,9 @@ namespace MySystem.Areas.Api.Controllers.v1
             {
                 var merAddInfo = Services.Main.MerchantAddInfoService.Query(Id);
                 var merInfo = Services.Main.MerchantInfoService.Query(Id);
+                var info = maindb.MerchantInfo.FirstOrDefault(m => m.Id == Id) ?? new MainModels.MerchantInfo();
+                info.Popularity += 1;
+                maindb.SaveChanges();
                 BusinessName = merAddInfo.QualificationType;
 
                 string[] Atlas = new string[0];
@@ -130,6 +134,9 @@ namespace MySystem.Areas.Api.Controllers.v1
             {
                 var merAddInfo = Services.Main2.MerchantAddInfoService.Query(Id);
                 var merInfo = Services.Main2.MerchantInfoService.Query(Id);
+                var info = maindb2.MerchantInfo.FirstOrDefault(m => m.Id == Id) ?? new MainModels2.MerchantInfo();
+                info.Popularity += 1;
+                maindb2.SaveChanges();
                 BusinessName = Services.Main2.BusinessScopeService.Query(merAddInfo.BusinessId).Name;
 
                 string[] Atlas = new string[0];
@@ -143,7 +150,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 Obj.Add("BusinessName", BusinessName); //经营类型
                 Obj.Add("BusinessHours", merInfo.BusinessHours == null ? "周一至周五 09:00-22:00" : "周一至周五 09:00 - 22:00"); //营业时间
                 Obj.Add("MerchantMobile", merInfo.Mobile); //商户电话
-                Obj.Add("Introduction", merInfo.BriefIntroduction == null ? "待完善..." : "待完善..."); //商户简介
+                Obj.Add("Introduction", merInfo.BriefIntroduction == null ? "暂无信息..." : "暂无信息..."); //商户简介
                 Obj.Add("Longitude", merInfo.Longitude); //经度
                 Obj.Add("Latitude", merInfo.Latitude); //纬度
                 Obj.Add("StoreEntrancePic", Atlas[0]); //门店门头照片

Areas/Api/Controllers/v1/MainServer/PageInfoController.cs

@@ -44,7 +44,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             foreach (DataRow dr in dt.Rows)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("Title", dr["SeoTitle"].ToString()); //标题
+                curData.Add("Title", dr["Title"].ToString()); //标题
                 curData.Add("Contents", dr["Contents"].ToString()); //创建时间
                 dataList.Add(curData);
             }

appsettings.Development.json

@@ -13,7 +13,7 @@
     "Host2": "http://test.mpap2.kexiaoshuang.com/",
     "SourceHost": "http://test.mpap.kexiaoshuang.com/",
     "SpHost": "http://test.mpsp.kexiaoshuang.com/",
-    "OssHost": "http://oss.qrcodeplate.com",
+    "OssHost": "https://oss-cn-chengdu.aliyuncs.com/",
     "QrCodeHost": "http://test.mpap.kexiaoshuang.com/",
     "Database": "ApServer",
     "KxsSqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;",