DriverFBTravel/guns-admin/pom.xml
@@ -9,8 +9,9 @@ <relativePath>../pom.xml</relativePath> </parent> <artifactId>guns-admin</artifactId> <artifactId>driver</artifactId> <name>guns-admin</name> <version>1.0.0</version> <description>guns 的spring boot版本</description> <packaging>jar</packaging> DriverFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java
@@ -265,17 +265,11 @@ public void wxPayCrossCity(HttpServletRequest request, HttpServletResponse response){ try { Map<String, String> map = payMoneyUtil.weixinpayCallback(request); // System.err.println(JSON.toJSONString(map)); if(null != map){ String out_trade_no = map.get("out_trade_no"); String transaction_id = map.get("transaction_id"); String result = map.get("result"); if(ToolUtil.isNotEmpty(out_trade_no) && ToolUtil.isNotEmpty(transaction_id)){ PrintWriter out = response.getWriter(); out.write(result); out.flush(); out.close(); String[] split = out_trade_no.split("_"); Integer id = Integer.valueOf(split[0]); Integer type = Integer.valueOf(split[1]); @@ -284,6 +278,10 @@ orderCrossCityService.payOrderCrossCityCallback(id, transaction_id, 1); break; } PrintWriter out = response.getWriter(); out.write(result); out.flush(); out.close(); } } }catch (Exception e){ DriverFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -724,8 +724,6 @@ pushUtil.pushDriverPosition(orderCrossCity.getId(), 3); } }).start(); systemNoticeService.addSystemNotice(1, "您已使用" + (type == 1 ? "微信" : "支付宝") + "成功完成出行订单支付，谢谢使用！", orderCrossCity.getUserId()); } } DriverFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java
@@ -21,8 +21,8 @@ // 设置鉴权参数，初始化客户端 private DefaultProfile profile = DefaultProfile.getProfile( "cn-hangzhou",// 地域ID "LTAI5tLz3gjFn53JyYopYoSU",// 您的AccessKey ID "XR1Nk7gkgpM0bsxmXcHlpQYt9VAXCE");// 您的AccessKey Secret "LTAI5tLG4USDdqBL9fPVCTKk",// 您的AccessKey ID "zOM2Dz6PhElQZlfO9dafDd7I0nApqx");// 您的AccessKey Secret private IAcsClient client = new DefaultAcsClient(profile); private static void log_print(String functionName, Object result) { @@ -70,7 +70,7 @@ // 接收短信的手机号码 request.putQueryParameter("PhoneNumbers", phone); // 短信签名名称。请在控制台签名管理页面签名名称一列查看（必须是已添加、并通过审核的短信签名）。 request.putQueryParameter("SignName", "福伴"); request.putQueryParameter("SignName", "云南翔蝠科技"); // 短信模板ID request.putQueryParameter("TemplateCode", templateCode); // 短信模板变量对应的实际值，JSON格式。 DriverFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/JGPushUtil.java
@@ -20,6 +20,9 @@ @Component public class JGPushUtil { @Value("${jiguang.open}") private Boolean open; @Value("${jiguang.appKey-driver}") private String appKeyDriver; @@ -59,6 +62,9 @@ * @param content */ public void push(Integer type, String content, String...tags){ if(!open){ return; } String masterSecret = (type == 1 ? masterSecretDriver : masterSecretDispatch); String appKey = (type == 1 ? appKeyDriver : appKeyDispatch); JPushClient jpushClient = new JPushClient(masterSecret, appKey, null, ClientConfig.getInstance()); @@ -75,6 +81,9 @@ public void push(Integer type, String content, String title, Map<String, String> map, String...tags){ if(!open){ return; } String masterSecret = (type == 1 ? masterSecretDriver : masterSecretDispatch); String appKey = (type == 1 ? appKeyDriver : appKeyDispatch); JPushClient jpushClient = new JPushClient(masterSecret, appKey, null, ClientConfig.getInstance()); DriverFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PayMoneyUtil.java
@@ -366,7 +366,7 @@ map2.put("nonceStr", map1.get("nonce_str")); map2.put("package", "prepay_id=" + prepay_id); map2.put("signType", "MD5"); map2.put("timeStamp", new Date().getTime() + ""); map2.put("timeStamp", System.currentTimeMillis() + ""); String s2 = this.weixinSignature(map2); map2.put("prepay_id", prepay_id); @@ -388,7 +388,7 @@ map3.put("package", "Sign=WXPay"); map3.put("partnerid", mchId); map3.put("prepayid", prepay_id); map3.put("timestamp", new Date().getTime() / 1000); map3.put("timestamp", System.currentTimeMillis() / 1000); String s1 = this.weixinSignature(map3); map3.put("sign", s1); System.err.println(map3); @@ -526,7 +526,7 @@ map2.put("package", "Sign=WXPay"); map2.put("partnerid", mchId); map2.put("prepayid", prepay_id); map2.put("timestamp", new Date().getTime() + ""); map2.put("timestamp", System.currentTimeMillis() + ""); String s1 = this.weixinSignature(map2); map2.put("pac", "Sign=WXPay"); @@ -721,13 +721,14 @@ * @return * @throws Exception */ public ResultUtil queryWXOrder() throws Exception{ public ResultUtil<Map<String, String>> queryWXOrder(String out_trade_no, String transaction_id) throws Exception{ String url = "https://api.mch.weixin.qq.com/pay/orderquery"; String nonce_str = UUIDUtil.getRandomCode(16); Map<String, Object> map = new HashMap<>(); map.put("appid", appid); map.put("mch_id", mchId); map.put("transaction_id", nonce_str);//微信订单号 map.put("out_trade_no", out_trade_no);//商户订单号 map.put("transaction_id", transaction_id);//微信订单号 map.put("nonce_str", nonce_str);//随机字符串 String s = this.weixinSignature(map); map.put("sign", s); @@ -762,29 +763,18 @@ if("SUCCESS".equals(return_code)){ String result_code = map1.get("result_code"); if("SUCCESS".equals(result_code)){ String type = map1.get("trade_type"); switch (type){ case "JSAPI": break; case "NATIVE": String code_url = map1.get("code_url"); return ResultUtil.success(code_url); case "APP": String trade_state = map1.get("trade_state"); String time_end = map1.get("time_end"); Map<String, Object> map2 = new HashMap<>(); map2.put("trade_state", trade_state);//订单状态SUCCESS—支付成功，REFUND—转入退款，NOTPAY—未支付，CLOSED—已关闭，REVOKED—已撤销（刷卡支付），USERPAYING--用户支付中，PAYERROR--支付失败(其他原因，如银行返回失败) map2.put("time_end", time_end);//订单支付时间，格式为yyyyMMddHHmmss，如2009年12月25日9点10分10秒表示为20091225091010。 Map<String, String> map2 = new HashMap<>(); map2.put("trade_type", map1.get("trade_type")); map2.put("trade_state", map1.get("trade_state"));//订单状态SUCCESS—支付成功，REFUND—转入退款，NOTPAY—未支付，CLOSED—已关闭，REVOKED—已撤销（刷卡支付），USERPAYING--用户支付中，PAYERROR--支付失败(其他原因，如银行返回失败) map2.put("transaction_id", map1.get("transaction_id")); return ResultUtil.success(map2); } return null; }else{ System.err.println(map1.get("err_code_des")); return ResultUtil.error(map1.get("err_code_des")); } }else{ System.err.println(map1.get("return_msg") + appid + "----" + mchId); return ResultUtil.error(map1.get("return_msg"), new JSONObject()); return ResultUtil.error(map1.get("return_msg")); } }
@@ -270,14 +270,14 @@ //计算预计距离和剩余时间 String value = redisUtil.getValue("DRIVER" + String.valueOf(driverId)); if(null == value || "".equals(value)){ System.err.println("司机没有上传位置信息"); // System.err.println("司机没有上传位置信息"); return; } Map<String, String> distance = gdMapElectricFenceUtil.getDistance(value, startLonLat, 1); String d = "0"; String t = "0"; if(null == distance){ System.err.println("查询距离出错了"); // System.err.println("查询距离出错了"); return; }else{ d = new BigDecimal(distance.get("distance")).divide(new BigDecimal(1000), new MathContext(2, RoundingMode.HALF_EVEN)).setScale(2, BigDecimal.ROUND_HALF_EVEN).toString(); DriverFBTravel/guns-admin/src/main/resources/application.yml
@@ -106,6 +106,7 @@ --- jiguang: open: false appKey-driver: 1 #极光推送应用唯一标识 masterSecret-driver: 1 #用于服务器端 API 调用时与 AppKey 配合使用达到鉴权的目的 appKey-dispatch: 1 #极光推送应用唯一标识 ManagementFBTravel/guns-admin/pom.xml
@@ -4,8 +4,9 @@ <modelVersion>4.0.0</modelVersion> <artifactId>guns-admin</artifactId> <artifactId>management</artifactId> <name>guns-admin</name> <version>1.0.0</version> <description>guns 的spring boot版本</description> <parent> <groupId>com.stylefeng</groupId> ManagementFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java
@@ -12,8 +12,8 @@ public class OssUploadUtil { //OSS图片访问域名 public static String oss_domain = "https://fuban.oss-cn-chengdu.aliyuncs.com/"; public static String accessKeyId = "LTAI5tLz3gjFn53JyYopYoSU"; public static String accessKeySecret = "XR1Nk7gkgpM0bsxmXcHlpQYt9VAXCE"; public static String accessKeyId = "LTAI5tLG4USDdqBL9fPVCTKk"; public static String accessKeySecret = "zOM2Dz6PhElQZlfO9dafDd7I0nApqx"; public static String bucketName="fuban"; public static String endpoint = "oss-cn-chengdu.aliyuncs.com";
@@ -9,8 +9,9 @@ <relativePath>../pom.xml</relativePath> </parent> <artifactId>guns-admin</artifactId> <artifactId>user</artifactId> <name>guns-admin</name> <version>1.0.0</version> <description>guns 的spring boot版本</description> <packaging>jar</packaging> UserFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java
@@ -21,8 +21,8 @@ // 设置鉴权参数，初始化客户端 private DefaultProfile profile = DefaultProfile.getProfile( "cn-hangzhou",// 地域ID "LTAI5tLz3gjFn53JyYopYoSU",// 您的AccessKey ID "XR1Nk7gkgpM0bsxmXcHlpQYt9VAXCE");// 您的AccessKey Secret "LTAI5tLG4USDdqBL9fPVCTKk",// 您的AccessKey ID "zOM2Dz6PhElQZlfO9dafDd7I0nApqx");// 您的AccessKey Secret private IAcsClient client = new DefaultAcsClient(profile); private static void log_print(String functionName, Object result) { @@ -70,7 +70,7 @@ // 接收短信的手机号码 request.putQueryParameter("PhoneNumbers", phone); // 短信签名名称。请在控制台签名管理页面签名名称一列查看（必须是已添加、并通过审核的短信签名）。 request.putQueryParameter("SignName", "福伴"); request.putQueryParameter("SignName", "云南翔蝠科技"); // 短信模板ID request.putQueryParameter("TemplateCode", templateCode); // 短信模板变量对应的实际值，JSON格式。 UserFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java
@@ -12,8 +12,8 @@ public class OssUploadUtil { //OSS图片访问域名 public static String oss_domain = "https://fuban.oss-cn-chengdu.aliyuncs.com/"; public static String accessKeyId = "LTAI5tLz3gjFn53JyYopYoSU"; public static String accessKeySecret = "XR1Nk7gkgpM0bsxmXcHlpQYt9VAXCE"; public static String accessKeyId = "LTAI5tLG4USDdqBL9fPVCTKk"; public static String accessKeySecret = "zOM2Dz6PhElQZlfO9dafDd7I0nApqx"; public static String bucketName="fuban"; public static String endpoint = "oss-cn-chengdu.aliyuncs.com";
