From 2d07ecf4a434a9d68d3ba82997916c5eade88d35 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 06 五月 2026 17:12:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/App_Start/WebApiConfig.cs | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/WebAPI/App_Start/WebApiConfig.cs b/WebAPI/App_Start/WebApiConfig.cs
index 2d52a8a..3d02acc 100644
--- a/WebAPI/App_Start/WebApiConfig.cs
+++ b/WebAPI/App_Start/WebApiConfig.cs
@@ -31,21 +31,16 @@
defaults: new { id = RouteParameter.Optional }
);
// 娉ㄥ唽绛惧悕
-<<<<<<< HEAD
//config.Filters.Add(new SignatureVerifyAttribute());
//// 鍏ㄥ眬鍚敤 JWT 璁よ瘉
//config.Filters.Add(new JwtAuthorizeAttribute());
//// 鍚敤JWT鍝嶅簲鎷︽埅鍣紝鑷姩鍒锋柊JWT
//config.MessageHandlers.Add(new TokenAppendHandler());
-=======
- // config.Filters.Add(new SignatureVerifyAttribute());
- //// 鍏ㄥ眬鍚敤 JWT 璁よ瘉
- // config.Filters.Add(new JwtAuthorizeAttribute());
- //// 鍚敤JWT鍝嶅簲鎷︽埅鍣紝鑷姩鍒锋柊JWT
- // config.MessageHandlers.Add(new TokenAppendHandler());
->>>>>>> ce72deb4068917547d97c3e8991dde8772728d25
+
+
+
}
}
}
--
Gitblit v1.9.1