wupengfei 2 years ago
parent
commit
c697463559
2 changed files with 7 additions and 4 deletions
  1. 5 2
      .idea/workspace.xml
  2. 2 2
      application/common.php

+ 5 - 2
.idea/workspace.xml

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="" />
+    <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/common.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common.php" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -186,7 +189,7 @@
       <workItem from="1668991533353" duration="2596000" />
       <workItem from="1669429338320" duration="861000" />
       <workItem from="1669448616248" duration="5065000" />
-      <workItem from="1669597148644" duration="2630000" />
+      <workItem from="1669597148644" duration="3078000" />
     </task>
     <servers />
   </component>

+ 2 - 2
application/common.php

@@ -342,10 +342,10 @@ function http_post_json($url, $jsonStr,$token_res)
 
 function encryptStr($str,$key,$base64 = true)
 {
-     $block = mcrypt_get_block_size('des','ecb');
+     @$block = mcrypt_get_block_size('des','ecb');
      $pad =  $block - (strlen($str)%$block);
      $str .= str_repeat(chr($pad),$pad);
-     $enc_str = mcrypt_encrypt(MCRYPT_DES,$key,$str,MCRYPT_MODE_ECB);
+     @$enc_str = mcrypt_encrypt(MCRYPT_DES,$key,$str,MCRYPT_MODE_ECB);
      return  $enc_str;
 }