Merge branch 'master' of http://118.178.224.202:3000/ewide/zsxt_nbzs_h5

Ewide.Nbzs.BackWorkerService/DbManage.cs

@@ -46,9 +46,9 @@ namespace Ewide.Nbzs.BackWorkerService
         {
             return GetDbClient().GetConnection(id);
         }
-        public static string GetHashKey()
+        public static string GetZlbSecretKey()
         {
-            return App.GetConfig<string>("AesHashKey");
+            return App.GetConfig<string>("ZlbSecretKey");
         }
     }
 }

Ewide.Nbzs.BackWorkerService/Worker.cs

@@ -136,8 +136,8 @@ namespace Ewide.Nbzs.BackWorkerService
                     var listNonResidentialAgreement = db_Product_Conn.Queryable<NonResidentialAgreement>().Where(p => p.ProjectID == projectId).ToList();
                     listNonResidentialAgreement.ForEach(p =>
                     {
-                        p.ExpropriatedCardNo = AESEncryption.Encrypt(p.ExpropriatedCardNo, DbManage.GetHashKey());
+                        p.ExpropriatedCardNo = MD5Encryption.Encrypt(p.ExpropriatedCardNo);
-                        p.ExpropriatedPhone = AESEncryption.Encrypt(p.ExpropriatedPhone, DbManage.GetHashKey());
+                        p.ExpropriatedPhone = MD5Encryption.Encrypt(p.ExpropriatedPhone);
                     });
                     //_cache.SetString($"CacheData-NonResidentialAgreement-{projectId}", JSON.Serialize(listNonResidentialAgreement), new DistributedCacheEntryOptions
                     //{
@@ -160,8 +160,8 @@ namespace Ewide.Nbzs.BackWorkerService
                     var listResidentialAgreement = db_Product_Conn.Queryable<ResidentialAgreement>().Where(p => p.ProjectID == projectId).ToList();
                     listResidentialAgreement.ForEach(p =>
                     {
-                        p.ExpropriatedCardNo = AESEncryption.Encrypt(p.ExpropriatedCardNo, DbManage.GetHashKey());
+                        p.ExpropriatedCardNo = MD5Encryption.Encrypt(p.ExpropriatedCardNo);
-                        p.ExpropriatedPhone = AESEncryption.Encrypt(p.ExpropriatedPhone, DbManage.GetHashKey());
+                        p.ExpropriatedPhone = MD5Encryption.Encrypt(p.ExpropriatedPhone);
                     });
                     //_cache.SetString($"CacheData-ResidentialAgreement-{projectId}", JSON.Serialize(listResidentialAgreement), new DistributedCacheEntryOptions
                     //{
@@ -219,8 +219,8 @@ namespace Ewide.Nbzs.BackWorkerService
                     var listNonInvestigateTable = db_Product_Conn.Queryable<NonResidentialInvestigateTable>().Where(p => p.ProjectId == projectId).ToList();
                     listNonInvestigateTable.ForEach(p =>
                     {
-                        p.PropertyRightPrsonCardNo = AESEncryption.Encrypt(p.PropertyRightPrsonCardNo, DbManage.GetHashKey());
+                        p.PropertyRightPrsonCardNo = MD5Encryption.Encrypt(p.PropertyRightPrsonCardNo);
-                        p.TheLegalRepresentativePhone = AESEncryption.Encrypt(p.TheLegalRepresentativePhone, DbManage.GetHashKey());
+                        p.TheLegalRepresentativePhone = MD5Encryption.Encrypt(p.TheLegalRepresentativePhone);
                     });
                     //_cache.SetString($"CacheData-NonResidentialInvestigateTable-{projectId}", JSON.Serialize(listNonInvestigateTable), new DistributedCacheEntryOptions
                     //{
@@ -241,8 +241,8 @@ namespace Ewide.Nbzs.BackWorkerService
                     var listInvestigateTable = db_Product_Conn.Queryable<InvestigateTable>().Where(p => p.ProjectId == projectId).ToList();
                     listInvestigateTable.ForEach(p =>
                     {
-                        p.ExpropriatedCardNo = AESEncryption.Encrypt(p.ExpropriatedCardNo, DbManage.GetHashKey());
+                        p.ExpropriatedCardNo = MD5Encryption.Encrypt(p.ExpropriatedCardNo);
-                        p.ExpropriatedPhone = AESEncryption.Encrypt(p.ExpropriatedPhone, DbManage.GetHashKey());
+                        p.ExpropriatedPhone = MD5Encryption.Encrypt(p.ExpropriatedPhone);
                     });
                     //_cache.SetString($"CacheData-InvestigateTable-{projectId}", JSON.Serialize(listInvestigateTable), new DistributedCacheEntryOptions
                     //{

Ewide.Nbzs.BackWorkerService/appsettings.json

@@ -35,6 +35,6 @@
       "ConnectionString": "data source=118.178.224.202;initial catalog=NbzsZlb;persist security info=True;user id=KYSQLSERVERADMIN;password=KYDBLogin20161103...;MultipleActiveResultSets=True;App=EntityFramework"
     }
   ],
-  "AesHashKey": "A4D58EAF1948B29E5954B3DB425D5F2C",
+  "ZlbSecretKey": "A4D58EAF1948B29E5954B3DB425D5F2C",
   "RedisConfig": "10.19.94.250:6380,password=nbzszlb!@#"
 }

Ewide.Nbzs.Entity/Extends/H5IndexPrjModel.cs

@@ -21,7 +21,7 @@ namespace Ewide.Nbzs.Entity.Extends
     public class Fhpgs
     {
         public string Id { get; set; }
-        [Newtonsoft.Json.JsonIgnore]
+        //[Newtonsoft.Json.JsonIgnore]
         public string dcbId { get; set; }
         public string PrjId { get; set; }
         public string AssessmentNo { get; set; }
@@ -35,7 +35,7 @@ namespace Ewide.Nbzs.Entity.Extends
     public class Bcxy
     {
         public string Id { get; set; }
-        [Newtonsoft.Json.JsonIgnore]
+        //[Newtonsoft.Json.JsonIgnore]
         public string dcbId { get; set; }
         public string PrjId { get; set; }
         public string XyNo { get; set; }
@@ -66,7 +66,7 @@ namespace Ewide.Nbzs.Entity.Extends
         /// </summary>
         public string Area { get; set; }
         public string Name { get; set; }
-        [Newtonsoft.Json.JsonIgnore]
+        //[Newtonsoft.Json.JsonIgnore]
         public string AreaID { get; set; }
         /// <summary>
         /// 征收部门

Ewide.NbzsZheliban/Service/DataService.cs

@@ -97,8 +97,9 @@ namespace Ewide.NbzsZheliban.Service
         /// </summary>
         /// <param name="cardno"></param>
         /// <returns></returns>
-        private async Task<List<Dcbs>> GetzzDcbsAsync(string cardno)
+        private async Task<List<Dcbs>> GetzzDcbsAsync(string _cardno)
         {
+            var cardno = MD5Encryption.Encrypt(_cardno);
             var list = _cache.Get<List<Dcbs>>("CacheData-InvestigateTable");
             if (list != null && list.Count > 0)
                 return list.Where(p => p.ExpropriatedCardNo == cardno).ToList();
@@ -111,8 +112,9 @@ namespace Ewide.NbzsZheliban.Service
         /// </summary>
         /// <param name="cardno"></param>
         /// <returns></returns>
-        private async Task<List<Dcbs>> GetfzzDcbsAsync(string cardno)
+        private async Task<List<Dcbs>> GetfzzDcbsAsync(string _cardno)
         {
+            var cardno = MD5Encryption.Encrypt(_cardno);
             var list = _cache.Get<List<Dcbs>>("CacheData-NonResidentialInvestigateTable");
             if (list != null && list.Count > 0)
                 return list.Where(p => p.ExpropriatedCardNo == cardno).ToList();
@@ -233,7 +235,7 @@ namespace Ewide.NbzsZheliban.Service
             var dbTicket = db.Queryable<zjzwfwTickets>().Where(p => p.Ticket == ticket && p.ExpireTime > DateTime.Now).OrderBy(p => p.CreateTime, OrderByType.Desc).First();
             if (dbTicket != null)
             {
-                var OriginalResponse = AESEncryption.Decrypt(dbTicket.OriginalResponse, Common.GetHashKey());
+                var OriginalResponse = DESCEncryption.Decrypt(dbTicket.OriginalResponse, Common.GetZlbSecretKey());
                 return JObject.Parse(OriginalResponse);
             }
             else
@@ -287,11 +289,11 @@ namespace Ewide.NbzsZheliban.Service
                 {
                     ID = Guid.NewGuid().ToString(),
                     Ticket = ticket,
-                    IdCardNo = AESEncryption.Encrypt(userinfoObj["idnum"].ToString(), Common.GetHashKey()),
+                    IdCardNo = MD5Encryption.Encrypt(userinfoObj["idnum"].ToString()),
                     UserName = userinfoObj["username"].ToString(),
                     ExpireTime = DateTime.Now.AddHours(4),//浙里办的token时效也是4个小时
                     CreateTime = DateTime.Now,
-                    OriginalResponse = AESEncryption.Encrypt(userinfoRsltStr, Common.GetHashKey())
+                    OriginalResponse = DESCEncryption.Encrypt(userinfoRsltStr, Common.GetZlbSecretKey())
                 }).ExecuteCommand();
                 if (temp1 <= 0)
                     throw Oops.Oh("出现异常,请联系管理员");

Ewide.NbzsZheliban/Tools/Common.cs

@@ -9,9 +9,9 @@ namespace Ewide.NbzsZheliban.Tools
 {
     public class Common
     {
-        public static string GetHashKey()
+        public static string GetZlbSecretKey()
         {
-            return App.GetConfig<string>("AesHashKey");
+            return App.GetConfig<string>("ZlbSecretKey");
         }
     }
 }