fix

AutoTurnOver.Utility/BrowseLogAttribute.cs

@@ -10,7 +10,7 @@ using ConfigManagerConf = Bailun.ServiceFabric.ConfigManagerConf;
 
 namespace AutoTurnOver.Utility
 {
-    public class BrowseLogAttribute : ActionFilterAttribute
+    public class BrowseLogAttribute_bak : ActionFilterAttribute
     {
         /// <summary>
         /// 项目id 
@@ -39,7 +39,7 @@ namespace AutoTurnOver.Utility
         /// <param name="moduleName">模块名称</param>
         /// <param name="operationType">操作类型 (0查、1增、2删、3修改)</param>
         /// <param name="remark">备注信息</param>
-        public BrowseLogAttribute(string projectCode, string moduleName, int operationType, string remark = "")
+        public BrowseLogAttribute_bak(string projectCode, string moduleName, int operationType, string remark = "")
         {
             _projectCode = projectCode;
             _moduleName = moduleName;
@@ -96,7 +96,7 @@ namespace AutoTurnOver.Utility
 
                 //服务配置获取失败直接赋值给url进行日志记录若解决获取配置问题可取消注释 源码：
                 var url = ConfigHelper.GetValue("BrowseLogSetting:Url");
-                //var url = "http://saas.admin.bailuntec.com/Api/Ssoadmin/operationloginfo/addoperationloginfo";
+                //var url = "https://saas.admin.bailuntec.com/Api/Ssoadmin/operationloginfo/addoperationloginfo";
 
                 var logRes = PostAsync<AddOperationLogInfoInput, AddOperationLogInfoOutput>(url, input);
 

AutoTurnOver/Common/BrowseLogAttribute.cs

+using AutoTurnOver.Utility;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoTurnOver.Common
+{
+    public class BrowseLogAttribute : ActionFilterAttribute
+    {
+        /// <summary>
+        /// 项目id 
+        /// </summary>
+        private readonly string _projectCode;
+
+        /// <summary>
+        /// 模块名称
+        /// </summary>
+        private readonly string _moduleName;
+
+        /// <summary>
+        /// 备注信息
+        /// </summary>
+        private readonly string _remark;
+
+        /// <summary>
+        /// 操作类型 (0查、1增、2删、3修改)
+        /// </summary>
+        private readonly int _operationType;
+
+        /// <summary>
+        /// 此特性负责写浏览日志
+        /// </summary>
+        /// <param name="projectId">项目id</param>
+        /// <param name="moduleName">模块名称</param>
+        /// <param name="operationType">操作类型 (0查、1增、2删、3修改)</param>
+        /// <param name="remark">备注信息</param>
+        public BrowseLogAttribute(string projectCode, string moduleName, int operationType, string remark = "")
+        {
+            _projectCode = projectCode;
+            _moduleName = moduleName;
+            _operationType = operationType;
+            _remark = remark;
+        }
+
+        public override void OnActionExecuted(ActionExecutedContext context)
+        {
+            try
+            {
+                //获取appsetting配置失败暂时直接赋值开启是否开启日志记录功能 “yes”/“no”
+                string canLogValue = "yes";
+                // string canLogValue = ConfigManagerConf.GetValue("BrowseLogSetting:CanLog");
+                if (canLogValue != "yes")
+                {
+                    return;
+                }
+                var user = AutoUtility.GetUser();
+                var userId = "0";
+                //if (userId == null)
+                //{
+                //    return;
+                //}
+                var userName = user.UserName; ;
+                var companyId = "1" ;
+
+                // 执行结果
+                var isSuccessed = true;
+                // 执行失败的信息
+                var execFaildMsg = "";
+
+                if (context.Exception != null && context.Result == null)
+                {
+                    // 方法执行失败  有异常
+                    isSuccessed = false;
+                    execFaildMsg = context.Exception.Message;
+                }
+
+                // 组装写日志的入参
+                var input = new AddOperationLogInfoInput
+                {
+                    UserId = 0,//Convert.ToInt32(userId ?? 0),
+                    UserName = userName ?? "system",
+                    ProjectCode = _projectCode,
+                    OperationType = _operationType,
+                    OperationContent = _moduleName,
+                    OperationTime = DateTime.Now,
+                    IsSuccessed = isSuccessed,
+                    FailInfo = execFaildMsg,
+                    Remarks = _remark,
+                    CompanyId = companyId ?? "1"
+                };
+
+                //服务配置获取失败直接赋值给url进行日志记录若解决获取配置问题可取消注释 源码：
+                var url = ConfigHelper.GetValue("BrowseLogSetting:Url");
+                //var url = "https://saas.admin.bailuntec.com/Api/Ssoadmin/operationloginfo/addoperationloginfo";
+
+                var logRes = PostAsync<AddOperationLogInfoInput, AddOperationLogInfoOutput>(url, input);
+
+                if (logRes.StatusCode != 200)
+                {
+                    Console.WriteLine($"写浏览日志失败:{logRes.Message}");
+                }
+
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+            }
+        }
+        /// <summary>
+        /// HttpClient实现Post请求
+        /// </summary>
+        /// <typeparam name="T1">传入对象类型</typeparam>
+        /// <typeparam name="T2">返回对象类型</typeparam>
+        /// <param name="url"></param>
+        /// <param name="content"></param>
+        /// <returns></returns>
+        public static T2 PostAsync<T1, T2>(string url, T1 content) where T2 : new()
+        {
+            if (string.IsNullOrWhiteSpace(url) || content == null)
+            {
+                return new T2();
+            }
+            try
+            {
+                //设置内容压缩
+                var handler = new HttpClientHandler() { AutomaticDecompression = DecompressionMethods.GZip };
+                using (var client = new HttpClient(handler))
+                {
+
+                    client.DefaultRequestHeaders.Accept.Clear();
+                    client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+                    var postDataJson = JsonConvert.SerializeObject(content, new JsonSerializerSettings()
+                    {
+                        ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
+                        NullValueHandling = NullValueHandling.Ignore
+                    });
+
+                    var response = client.PostAsync(url, new StringContent(postDataJson, Encoding.UTF8, "application/json")).Result;
+                    //var response = client.PostAsJsonAsync<T1>(url, content).Result;
+                    if (response.IsSuccessStatusCode)
+                    {
+                        var reponseResult = response.Content.ReadAsStringAsync().Result;
+                        var result = JsonConvert.DeserializeObject<T2>(reponseResult, new JsonSerializerSettings()
+                        {
+                            ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
+                            NullValueHandling = NullValueHandling.Ignore
+                        });
+
+                        return result;
+                    }
+                    return JsonConvert.DeserializeObject<T2>(null, new JsonSerializerSettings()
+                    {
+                        ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
+                        NullValueHandling = NullValueHandling.Ignore
+                    });
+                    //return new T2() { Message = "HTTP响应失败", };
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        public class AddOperationLogInfoOutput
+        {
+            /// <summary>
+            /// 信息
+            /// </summary>
+            [JsonProperty("message")]
+            public string Message { get; set; }
+
+            /// <summary>
+            /// 结果
+            /// </summary>
+            [JsonProperty("result")]
+            public object Result { get; set; }
+
+            /// <summary>
+            /// 状态码
+            /// </summary>
+            [JsonProperty("statusCode")]
+            public int StatusCode { get; set; }
+        }
+        public class AddOperationLogInfoInput
+        {
+            /// <summary>
+            /// 
+            /// </summary>
+            public int UserId { get; set; }
+            /// <summary>
+            /// 系统id
+            /// </summary>
+
+            public int ProjectId { get; set; }
+
+            /// <summary>
+            /// 系统代码
+            /// </summary>
+            public string ProjectCode { get; set; }
+
+            /// <summary>
+            /// 
+            /// </summary>
+
+            public string UserName { get; set; }
+
+            /// <summary>
+            /// 公司id
+            /// </summary>
+            public string CompanyId { get; set; }
+
+            /// <summary>
+            /// 操作类型（0查、1增、2删、3修改）
+            /// </summary>
+
+            public int OperationType { get; set; }
+            /// <summary>
+            /// 操作内容
+            /// </summary>
+            public string OperationContent { get; set; }
+            /// <summary>
+            /// 操作时间
+            /// </summary>
+            public DateTime OperationTime { get; set; }
+            /// <summary>
+            /// 是否操作成功
+            /// </summary>
+            public bool IsSuccessed { get; set; }
+
+            /// <summary>
+            /// 失败原因
+            /// </summary>
+            public string FailInfo { get; set; }
+
+            /// <summary>
+            /// 备注
+            /// </summary>
+            public string Remarks { get; set; }
+        }
+    }
+}

AutoTurnOver/Controllers/JitTagController.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using AutoTurnOver.Common;
 using AutoTurnOver.Models;
 using AutoTurnOver.Utility;
 using Microsoft.AspNetCore.Http;

AutoTurnOver/Controllers/NotStockController.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using AutoTurnOver.Common;
 using AutoTurnOver.Models;
 using AutoTurnOver.Utility;
 using Microsoft.AspNetCore.Http;