Merge branch 'ChangChun_Base' of http://app.puruiit.cn:9092/INSU/MedicalInsurance into ChangChun_Base

.vs/VSWorkspaceState.json

@@ -2,6 +2,5 @@
   "ExpandedNodes": [
     ""
   ],
-  "SelectedNode": "\\NanChangMI.sln",
   "PreviewInSolutionExplorer": false
 }

Helper/JsonHelper.cs

@@ -583,50 +583,37 @@ namespace PTMedicalInsurance.Helper
         {
             #region【测试环境】
 
-            //应用ID
-            Global.inf.appId = "FA70F8091A534E7DB3D12766F9CAE199";
-            //Global.inf.appId = "57E2D561E97141A3871DEFB410ADD920"; 
-            //应用秘钥
-            Global.inf.Secret = "2DCA1A6F04EE4314941ABE2A6C592DF6";
-            //Global.inf.Secret = "F30D0D261BA04063A0BCAEF19F8ADBCC";
-            //应用私钥
-            Global.inf.privateKey = "cr8HO5r701/d+AsOgxFS2cwtQRF1KMEiw/OR7sddI5M=";    //中心邮件下发 
-            //Global.inf.privateKey = "AKyhfvPbT+tIJHJkZSDILrw7t+FOG1U58UcupYYTzCOj";  //中心Demo
-            //应用公钥
-            //Global.inf.publicKey = "BKRejz4MwM8G8Krc4hyIIvhphvwrQpnHIsGWTd0sn0TJYr2eKJGAv87AKnrT8pL50H6hdVHdU0FFaL18GApDEbU"; //中心邮件下发
-            Global.inf.publicKey = "BIRfPWjNpLsi3lZ6H91EfG6p09L0mmLZMNMjt/jcn8P9L5peCheEgxMtPe+dNtzhQ9x40xxi6lD3Q0xA31/hXFE=";  //中心Demo
-
-            //Global.inf.cardURL = "http://10.126.105.66/hsa-hgs-adapt/api/card/initDll";   //测试环境
-            Global.inf.presCenterURL = "http://10.49.24.54:8080/epc/api";
+            ////应用ID
+            //Global.inf.appId = "FA70F8091A534E7DB3D12766F9CAE199";
+            ////Global.inf.appId = "57E2D561E97141A3871DEFB410ADD920"; 
+            ////应用秘钥
+            //Global.inf.Secret = "2DCA1A6F04EE4314941ABE2A6C592DF6";
+            ////Global.inf.Secret = "F30D0D261BA04063A0BCAEF19F8ADBCC";
+            ////应用私钥
+            //Global.inf.privateKey = "cr8HO5r701/d+AsOgxFS2cwtQRF1KMEiw/OR7sddI5M=";    //中心邮件下发 
+            ////Global.inf.privateKey = "AKyhfvPbT+tIJHJkZSDILrw7t+FOG1U58UcupYYTzCOj";  //中心Demo
+            ////应用公钥
+            ////Global.inf.publicKey = "BKRejz4MwM8G8Krc4hyIIvhphvwrQpnHIsGWTd0sn0TJYr2eKJGAv87AKnrT8pL50H6hdVHdU0FFaL18GApDEbU"; //中心邮件下发
+            //Global.inf.publicKey = "BIRfPWjNpLsi3lZ6H91EfG6p09L0mmLZMNMjt/jcn8P9L5peCheEgxMtPe+dNtzhQ9x40xxi6lD3Q0xA31/hXFE=";  //中心Demo
+
+            ////Global.inf.cardURL = "http://10.126.105.66/hsa-hgs-adapt/api/card/initDll";   //测试环境
+            //Global.inf.presCenterURL = "http://10.49.24.54:8080/epc/api";
 
             #endregion
 
             #region【正式环境】
-            //if (Global.inf.interfaceDr == 21) //兰2
-            //{
-            //    //应用ID
-            //    Global.inf.appId = "4D967CAB5DA44E3583F4246D7FE897F0";
-            //    //应用秘钥
-            //    Global.inf.Secret = "586BD24D03E5481C8AE4FE9DD8424FFE";
-            //    //应用私钥
-            //    Global.inf.privateKey = "XTbX+Tt1np5Fma0+twhYi+vtM4J0UJ8VX5fFEZ7t/ro=";
-            //    //应用公钥            
-            //    Global.inf.publicKey = "BIFd2+2CgjuPAj5FMj5L/L3azTWu86suPtlIJkCo8zjQ44R7SQUUkTgZGdVelRQCM5pW+x9tZGzDPaUNbfD499w=";
-            //}
-            //else if (Global.inf.interfaceDr == 25) //兰1
-            //{
-            //    //应用ID
-            //    Global.inf.appId = "6C9B786AF7E848B29B0EF5783D630263";
-            //    //应用秘钥
-            //    Global.inf.Secret = "6055AE5A9CAD4D9BA8A98EB20431364E";
-            //    //应用私钥
-            //    Global.inf.privateKey = "AKReZmOYcTOdbrnlZZFIXn8LQSHPzdAK1Q0CXDnE4Jhk";
-            //    //应用公钥            
-            //    Global.inf.publicKey = "BIFd2+2CgjuPAj5FMj5L/L3azTWu86suPtlIJkCo8zjQ44R7SQUUkTgZGdVelRQCM5pW+x9tZGzDPaUNbfD499w=";
-            //}
 
-            //Global.inf.presCenterURL = "http://10.49.24.54:8080/epc/api";
-            //Global.inf.presCenterURL = "http://10.139.97.79:80/epc/api";
+            //    //应用ID密钥id
+                Global.inf.appId = "CBBDEB9E72BC42D1A4C20A3206B1E6F4";
+            //    //应用秘钥密钥key
+                Global.inf.Secret = "025631D740774B838C3CBAD1199514A7";
+                //应用私钥定点医药机构私钥
+               Global.inf.privateKey = "ArOPNBtbxNQrNNwvO/YUhn43UR9Bjp24E/C/PgYs5dE=";
+            //    //应用公钥   医保电子处方中心公钥         
+                Global.inf.publicKey = "BHTbGNrSN9jgidrQY8C57RvcAlAZu1N2cgX88P3mOFvNibSa0wpmEWiyisSXblp/bp/DfaXdTjw/LKZMt8yxN0Y=";
+
+
+            Global.inf.presCenterURL = "http://10.49.24.194:8080/epc/api";
             #endregion
 
             Global.writeLog("密钥id：" + Global.inf.appId);