Browse Source

调整信息警告

黄贺彬 6 năm trước cách đây
mục cha
commit
03e6e2d76f

+ 4 - 14
TEAMModelOS.SDK/Extension/JwtAuth/JwtHelper/RsaHelper.cs

@@ -49,17 +49,9 @@ namespace TEAMModelOS.SDK.Extension.JwtAuth.JwtHelper
             {
                 res = GetPem("RSA PRIVATE KEY", data);
             }
-            try
-            {
-              string  ss= res.ToJson();
-                RSACryptoServiceProvider rsa = DecodeRSAPrivateKey(res);
-                string s = rsa.ToString();
-                return rsa;
-            }
-            catch (Exception ex)
-            {
-            }
-            return null;
+            string ss = res.ToJson();
+            RSACryptoServiceProvider rsa = DecodeRSAPrivateKey(res);
+            return rsa;
         }
 
         private static RSACryptoServiceProvider DecodeRSAPrivateKey(byte[] privkey)
@@ -114,8 +106,6 @@ namespace TEAMModelOS.SDK.Extension.JwtAuth.JwtHelper
 
                 elems = GetIntegerSize(binr);
                 IQ = binr.ReadBytes(elems);
-
-
                 // ------- create RSACryptoServiceProvider instance and initialize with public key -----
                 CspParameters CspParameters = new CspParameters();
                 CspParameters.Flags = CspProviderFlags.UseMachineKeyStore;
@@ -134,7 +124,7 @@ namespace TEAMModelOS.SDK.Extension.JwtAuth.JwtHelper
             }
             catch (Exception ex)
             {
-                return null;
+                throw new Exception("",ex);
             }
             finally
             {

+ 1 - 1
TEAMModelOS.SDK/Extension/JwtAuth/Models/JwtSetting.cs

@@ -25,6 +25,6 @@ namespace TEAMModelOS.SDK.Extension.JwtAuth.Models
         /// <summary>
         /// JWT Secret Key
         /// </summary>
-        public string SecurityKey { get; set; }
+        //public string SecurityKey { get; set; }
     }
 }

+ 5 - 3
TEAMModelOS/Controllers/Common/LoginController.cs

@@ -69,7 +69,7 @@ namespace TEAMModelOS.Controllers.Common
         [AllowAnonymous]
         public BaseJosnRPCResponse Authorization()
         {
-            string jwtToken = "eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoiaHVhbmdoYiIsImVtYWlsIjoiaHVhbmdoYkBjZGhhYm9vay5jb20iLCJpYXQiOjE1NDg3MzA2MjMsIm5iZiI6MTU0ODczMDYyMywiZXhwIjoxNTQ4NzMwNjgzLCJhdWQiOiJIYWJvb2suVGVhbU1vZGVsLkNvbnRlc3QiLCJpc3MiOiJIYUJvb2siLCJyb2xlIjoiYWRtaW4scm9vdCJ9.acye5fBHttovBjr0JdDNvm8zVjuLukqyQZ_GPSN7t8aDBiKO8K80dMfefaYC7bF1VodzVFDKKEkieuq4NRnTjw";
+           // string jwtToken = "eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoiaHVhbmdoYiIsImVtYWlsIjoiaHVhbmdoYkBjZGhhYm9vay5jb20iLCJpYXQiOjE1NDg3MzA2MjMsIm5iZiI6MTU0ODczMDYyMywiZXhwIjoxNTQ4NzMwNjgzLCJhdWQiOiJIYWJvb2suVGVhbU1vZGVsLkNvbnRlc3QiLCJpc3MiOiJIYUJvb2siLCJyb2xlIjoiYWRtaW4scm9vdCJ9.acye5fBHttovBjr0JdDNvm8zVjuLukqyQZ_GPSN7t8aDBiKO8K80dMfefaYC7bF1VodzVFDKKEkieuq4NRnTjw";
             //ClaimModel claimModel =  JwtHelper.SerializeJWT(jwtToken);
             JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
             ClaimModel claimModel = new ClaimModel
@@ -79,8 +79,10 @@ namespace TEAMModelOS.Controllers.Common
             claimModel.Claims.Add(new Claim(JwtClaimTypes.Name, "huanghb"));
             claimModel.Claims.Add(new Claim(JwtClaimTypes.Email, "huanghb@cdhabook.com"));
             claimModel.Roles.Add("admin,root");
-            Dictionary<string, object> ext = new Dictionary<string, object>();
-            ext.Add("claimModel", claimModel);
+            Dictionary<string, object> ext = new Dictionary<string, object>
+            {
+                { "claimModel", claimModel }
+            };
 
             builder.Data(claimModel).CurrPage(1);
             return builder.Data(JwtHelper.IssueJWT(claimModel, _options.Value)).Extend(ext).build();