author:dukun

describ:更新回调

deventor-cor/src/main/java/com/bluefire/deventorcor/util/CallBackUtil.java

@@ -6,6 +6,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.*;
 import org.springframework.stereotype.Component;
+import org.springframework.util.MimeType;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.Map;
@@ -28,9 +29,14 @@ public class CallBackUtil {
 
     static {
         headers = new HttpHeaders();
-        MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
-        headers.setContentType(type);
-        headers.add("Accept", MediaType.APPLICATION_JSON.toString());
+
+        //MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
+        //MediaType type = MediaType.parseMediaType("text/html; charset=UTF-8");
+        //headers.setContentType(type);
+
+        headers.setContentType(MediaType.APPLICATION_JSON);
+
+        headers.add("Accept", MediaType.ALL_VALUE);
     }
 
     /**
@@ -50,28 +56,34 @@ public class CallBackUtil {
         /**
          * 将请求的数据封装成json格式
          */
-        HttpEntity<String> formEntity = new HttpEntity<String>(cardSecretStatus.toJson().toJSONString(), headers);
-        ResponseEntity<JSONObject> response = restTemplate.postForEntity(callbackUrl, formEntity, JSONObject.class);
+        //HttpEntity<String> formEntity = new HttpEntity<String>(cardSecretStatus.toJson().toJSONString(), headers);
+
+        HttpEntity<CallbackCardSecretStatus> formEntity = new HttpEntity<CallbackCardSecretStatus>(cardSecretStatus, headers);
+        log.info("request is : {} , url is : {}",cardSecretStatus.toJson().toJSONString(), callbackUrl);
+
+        //ResponseEntity<JSONObject> response = restTemplate.postForEntity(callbackUrl, formEntity, JSONObject.class);
+        ResponseEntity<String> response = restTemplate.postForEntity(callbackUrl, formEntity, String.class);
+        log.info("response code is : {} ,  body is : {}",response.getStatusCodeValue(), response.getBody());
 
         /**
          * 判断回调是否成功，返回的body 数据为1 代表返回成功
          */
-        if (response.getStatusCode() == HttpStatus.OK) {
-            JSONObject tmp = response.getBody();
-            if(tmp.getInteger("status") == 1){
-                log.info("request is : {}, response is : {} ",cardSecretStatus.toJson().toJSONString() ,tmp.toJSONString());
-            }else{
-                log.info("卡密通知结果回调失败,发送信息为 {} ", cardSecretStatus.toJson().toJSONString());
-            }
-
-
-        }else {
-            /**
-             * 回调地址连接不成功的日志
-             */
-            log.error("回调网络连接失败url: {} , response is : {},", callbackUrl, response.getBody());
-
-        }
+//        if (response.getStatusCode() == HttpStatus.OK) {
+//            JSONObject tmp = response.getBody();
+//            if(tmp.getInteger("status") == 1){
+//                log.info("request is : {}, response is : {} ",cardSecretStatus.toJson().toJSONString() ,tmp.toJSONString());
+//            }else{
+//                log.info("卡密通知结果回调失败,发送信息为 {} ", cardSecretStatus.toJson().toJSONString());
+//            }
+//
+//
+//        }else {
+//            /**
+//             * 回调地址连接不成功的日志
+//             */
+//            log.error("回调网络连接失败url: {} , response is : {},", callbackUrl, response.getBody());
+//
+//        }
 
 
     }

deventor-unicom-carmi/src/main/java/com/bluefire/deventorunicomcarmi/service/impl/UnicomCardSecretImpl.java

@@ -44,6 +44,8 @@ public class UnicomCardSecretImpl extends ServiceImpl<UnicomCarmiMapper, UnicomC
 
     private String callbackUrl;
 
+    private final static String partnerId = "108463 ";
+
     private final static String  partnerKey = "tdz5xjtmuymkrhbx460iwv8kyw9hasqa";
 
     private final static String key = "9lI82q3eBZhdwk7b";//aes加密密钥
@@ -51,6 +53,8 @@ public class UnicomCardSecretImpl extends ServiceImpl<UnicomCarmiMapper, UnicomC
     private final static AES aes = SecureUtil.aes(key.getBytes());
 
 
+
+
     /**
      * 存储卡密
      *
@@ -74,9 +78,14 @@ public class UnicomCardSecretImpl extends ServiceImpl<UnicomCarmiMapper, UnicomC
 
         String sign = DigestUtils.md5Hex(signSlice);
 
+        //解密
+        String cardSecret = aes.decryptStr(cardSecretInfo.getCardSecret(), CharsetUtil.CHARSET_UTF_8);
+
         QueryWrapper<UnicomCardSecretEntity> queryWrapper = new QueryWrapper<>();
-        QueryWrapper<UnicomCardSecretEntity> wrapper = queryWrapper.eq("card_secret", cardSecretInfo.getCardSecret());
+        QueryWrapper<UnicomCardSecretEntity> wrapper = queryWrapper.eq("card_secret",cardSecret);
         UnicomCardSecretEntity cardSecretEntity = this.baseMapper.selectOne(wrapper);
+        System.out.println(cardSecretEntity);
+        log.info(cardSecretEntity.toString());
 
         /**
          * 校验时间
@@ -108,8 +117,7 @@ public class UnicomCardSecretImpl extends ServiceImpl<UnicomCarmiMapper, UnicomC
         //UnicomCardSecretEntity unicomCardSecret = new UnicomCardSecretEntity();
 
 
-        //解密
-        String cardSecret = aes.decryptStr(cardSecretInfo.getCardSecret(), CharsetUtil.CHARSET_UTF_8);
+
 
         unicomCardSecret.setTimestamp(now);
         unicomCardSecret.setCardSecret(cardSecret);
@@ -243,11 +251,13 @@ public class UnicomCardSecretImpl extends ServiceImpl<UnicomCarmiMapper, UnicomC
         }
 
         //log.info(callbackUrl);
-        String partnerId = "108463 ";
+
         String nonce = UUID.randomUUID().toString().replace("-", "");
-        log.info(nonce);
+
         Long timestamp = System.currentTimeMillis() / 1000;
 
+        //cardSecret = aes.encryptHex(cardSecret, CharsetUtil.CHARSET_UTF_8);
+
         String signSlice = String.format("%s%s%s%s%s%s%s",
                 partnerId, nonce, cardSecret,
                 cardSecretStatus.getStatus(),
@@ -263,7 +273,7 @@ public class UnicomCardSecretImpl extends ServiceImpl<UnicomCarmiMapper, UnicomC
         cardSecretStatus.setTimestamp(timestamp);
         cardSecretStatus.setCardSecret(cardSecret);
 
-        log.info(cardSecretStatus.toString());
+
         callBackUtil.callbackCardSecret(cardSecretStatus, callbackUrl);
 
         return result;

deventor-unicom-carmi/src/test/test-unicom-carmi-give.py

@@ -1,9 +1,9 @@
 import requests
 
-url = 'http://47.108.14.99:8086/unicom/card/secret/give'
-#url = 'http://localhost:8086/unicom/card/secret/give'
+#url = 'http://47.108.14.99:8086/unicom/card/secret/give'
+url = 'http://localhost:8086/unicom/card/secret/give'
 
-params1 = {'facePrice': 30}
+params1 = {'facePrice': 50}
 response = requests.get(url = url,params = params1)
 print(response.status_code)
 print(response.text)

deventor-unicom-carmi/src/test/test-unicom-carmi-push.py

@@ -11,8 +11,8 @@ partnerKey = 'tdz5xjtmuymkrhbx460iwv8kyw9hasqa'
 nonce = ''.join(random.sample(string.ascii_letters+string.digits,32))
 #nonce = 'WUKRmNYGcFaqgy7Hl8dbLOMzrSQuPfZ1'
 #print(nonce)
-cardSecret = ''.join(random.sample(string.ascii_letters+string.digits,32))
-#cardSecret = 'GLDSZQ42eX8MB3V1fNsucghj9U5JrRlD'
+#cardSecret = ''.join(random.sample(string.ascii_letters+string.digits,32))
+cardSecret = '2434353536564645448'
 #key = ''.join(random.sample(string.ascii_letters+string.digits,16))
 
 #print(key)
@@ -20,9 +20,9 @@ cardSecret = ''.join(random.sample(string.ascii_letters+string.digits,32))
 key = '9lI82q3eBZhdwk7b'
 helo = MyHash()
 cardSecret = helo.My_Aes_Encrypt(key,cardSecret)
-#cardSecret = 'VxuJa8EW4zKfykwt92ZFqToeiLG3gsCY'
-facePrice = 30
-callbackUrl = 'http://127.0.0.1:9888'
+#cardSecret = ''
+facePrice = 50
+callbackUrl = 'https://admin.77shou.cn/index.php/Pinnotify/liantong.html'
 timestamp = int(time.time())
 pre_sign = '{}{}{}{}{}{}{}'.format(partnerId,nonce,cardSecret,facePrice,callbackUrl,timestamp,partnerKey)
 
@@ -49,7 +49,7 @@ http_header = {
 
 s = requests.session()
 s.keep_alive = False
-r_json = requests.post("http://47.108.14.99:8086/unicom/card/secret/push.json", data=data_json, headers=http_header)
-#r_json = requests.post("http://localhost:8086/unicom/card/secret/push.json", data=data_json, headers=http_header)
+#r_json = requests.post("http://47.108.14.99:8086/unicom/card/secret/push.json", data=data_json, headers=http_header)
+r_json = requests.post("http://localhost:8086/unicom/card/secret/push.json", data=data_json, headers=http_header)
 #r_json = requests.post("http://47.108.14.99:8085/sup/order/add", data=data_json, headers=http_header)
 print( r_json.text )

deventor-unicom-carmi/src/test/test-unicom-carmi-update.py

@@ -3,7 +3,7 @@ import requests
 #url = 'http://47.108.14.99:8086/unicom/card/secret/update'
 url = 'http://localhost:8086/unicom/card/secret/update'
 
-params1 = {'cardSecret': 'zO1PZKnDrJEp3VlNATj7BygvUY8c4LqI','flag':False}
+params1 = {'cardSecret': '2434353536564645448','flag':False}
 response = requests.put(url = url,params = params1)
 print(response.status_code)
 print(response.text)