From e900ab9b4cdc473708386d36c84de096feccd090 Mon Sep 17 00:00:00 2001 From: atao Date: Tue, 27 Jun 2017 18:02:25 +0800 Subject: [PATCH] 提交代码 --- .gitignore | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/main/java/com/jfinal/weixin/sdk/api/MenuApi.java | 4 ++-- src/main/java/com/jfinal/weixin/sdk/utils/JsonUtils.java | 2 +- src/main/java/com/jfinal/weixin/sdk/utils/XmlHelper.java | 4 ++-- src/main/java/com/rnt/controller/WeixinPayController.java | 6 +++--- src/main/resources/a_little_config.txt | 38 +++++++++++++++++++------------------- src/main/webapp/WEB-INF/pages/check.html | 2 +- src/main/webapp/WEB-INF/pages/select.html | 6 +++--- src/main/webapp/static/js/url.js | 4 ++-- 9 files changed, 127 insertions(+), 33 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1ced0ab --- /dev/null +++ b/.gitignore @@ -0,0 +1,94 @@ +# Created by .ignore support plugin (hsz.mobi) +### Example user template template +### Example user template + +# IntelliJ project files +.idea +*.iml +out +gen### Eclipse template + +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.recommenders + +# Eclipse Core +.project + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# PyDev specific (Python IDE for Eclipse) +*.pydevproject + +# CDT-specific (C/C++ Development Tooling) +.cproject + +# JDT-specific (Eclipse Java Development Tools) +.classpath + +# Java annotation processor (APT) +.factorypath + +# PDT-specific (PHP Development Tools) +.buildpath + +# sbteclipse plugin +.target + +# Tern plugin +.tern-project + +# TeXlipse plugin +.texlipse + +# STS (Spring Tool Suite) +.springBeans + +# Code Recommenders +.recommenders/ + +# Scala IDE specific (Scala & Java development for Eclipse) +.cache-main +.scala_dependencies +.worksheet +### SVN template +.svn/ +### Java template +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +.gitignore +.idea/ +src/main/java/com/rnt/plugins/ diff --git a/src/main/java/com/jfinal/weixin/sdk/api/MenuApi.java b/src/main/java/com/jfinal/weixin/sdk/api/MenuApi.java index 558c2f7..798aaa6 100644 --- a/src/main/java/com/jfinal/weixin/sdk/api/MenuApi.java +++ b/src/main/java/com/jfinal/weixin/sdk/api/MenuApi.java @@ -121,12 +121,12 @@ public class MenuApi { "{"+ "\"type\":\"view\","+ "\"name\":\"支付\","+ - "\"url\":\"http://dwmyqq.natappfree.cc/pay/selectCarView\""+ + "\"url\":\"http://atao.s1.natapp.cc/pay/selectCarView\""+ "},"+ "{"+ "\"type\":\"view\","+ "\"name\":\"月卡\","+ - "\"url\":\"http://dwmyqq.natappfree.cc/park/parkListView\""+ + "\"url\":\"http://atao.s1.natapp.cc/park/parkListView\""+ "},"+ "{"+ "\"name\":\"关于我们\","+ diff --git a/src/main/java/com/jfinal/weixin/sdk/utils/JsonUtils.java b/src/main/java/com/jfinal/weixin/sdk/utils/JsonUtils.java index 6f0ae04..3b0948b 100644 --- a/src/main/java/com/jfinal/weixin/sdk/utils/JsonUtils.java +++ b/src/main/java/com/jfinal/weixin/sdk/utils/JsonUtils.java @@ -78,7 +78,7 @@ public final class JsonUtils { Json jsonToUse = null; // com.fasterxml.jackson.databind.ObjectMapper? if (ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", JsonUtils.class.getClassLoader())) { - jsonToUse = new JsonUtils.Jackson(); + jsonToUse = new Jackson(); } // com.alibaba.fastjson.JSONObject? else if (ClassUtils.isPresent("com.alibaba.fastjson.JSONObject", JsonUtils.class.getClassLoader())) { diff --git a/src/main/java/com/jfinal/weixin/sdk/utils/XmlHelper.java b/src/main/java/com/jfinal/weixin/sdk/utils/XmlHelper.java index 3591d78..ef5bda4 100644 --- a/src/main/java/com/jfinal/weixin/sdk/utils/XmlHelper.java +++ b/src/main/java/com/jfinal/weixin/sdk/utils/XmlHelper.java @@ -189,11 +189,11 @@ public class XmlHelper { } private static DocumentBuilderFactory getDocumentBuilderFactory(){ - return XmlHelper.XmlHelperHolder.documentBuilderFactory; + return XmlHelperHolder.documentBuilderFactory; } private static XPathFactory getXPathFactory() { - return XmlHelper.XmlHelperHolder.xPathFactory; + return XmlHelperHolder.xPathFactory; } /** diff --git a/src/main/java/com/rnt/controller/WeixinPayController.java b/src/main/java/com/rnt/controller/WeixinPayController.java index 5042b33..887c08f 100644 --- a/src/main/java/com/rnt/controller/WeixinPayController.java +++ b/src/main/java/com/rnt/controller/WeixinPayController.java @@ -56,7 +56,6 @@ import com.rnt.vo.ParkLotCardVO; import com.xiaoleilu.hutool.date.DateField; import com.xiaoleilu.hutool.date.DateUtil; import org.beetl.sql.core.kit.StringKit; -import org.springframework.beans.BeanUtils; /** * 感谢 *半杯* 童鞋联调支付API @@ -1131,10 +1130,11 @@ public class WeixinPayController extends Controller { * 检查输入的车牌号是否存订单(带核算／待支付／已完成).
*/ public void parkOrderForNotPayExist(){ - BizResult result = new BizResult(); + BizResult result = new BizResult<>(); String carNum = this.getPara("carNum"); logger.info("开始校验输入车牌是否存在待核算订单..入参＝"+carNum); String rs =""; + OrderVO OrderVO = new OrderVO(); try{ if(StringKit.isNotBlank(carNum)){ OrderService orderService = Duang.duang(OrderService.class); @@ -1166,7 +1166,7 @@ public class WeixinPayController extends Controller { }catch(Exception e){ e.printStackTrace(); } - logger.info("结束校验输入车牌是否存在待核算订单..结果＝"+JSONObject.toJSONString(result)); + logger.info("结束校验输入车牌是否存在待核算订单..响应＝"+JSONObject.toJSONString(result)); this.renderJson(result); } diff --git a/src/main/resources/a_little_config.txt b/src/main/resources/a_little_config.txt index a60637c..624139b 100644 --- a/src/main/resources/a_little_config.txt +++ b/src/main/resources/a_little_config.txt @@ -3,17 +3,17 @@ devMode = true ######## park库 -#park.druid.url=jdbc:mysql://61.177.139.228:13906/zteits-park?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true -#park.druid.username=zteits -#park.druid.password=Zteits;123456 +park.druid.url=jdbc:mysql://61.177.139.228:13906/zteits-park?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true +park.druid.username=zteits +park.druid.password=Zteits;123456 #park.druid.url=jdbc:mysql://127.0.0.1:3306/zteits-park?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true #park.druid.username=root #park.druid.password=Admin!@# -park.druid.url=jdbc:mysql://192.168.1.167:3306/zteits-park?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true -park.druid.username=root -park.druid.password=root +#park.druid.url=jdbc:mysql://192.168.1.167:3306/zteits-park?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true +#park.druid.username=root +#park.druid.password=root park.druid.initialSize=1 park.druid.minIdle=1 park.druid.maxActive=20 @@ -32,13 +32,13 @@ park.druid.testOnWhileIdle=true #zf.druid.password=root -#zf.druid.url=jdbc:mysql://61.177.139.228:13906/zteits-zf?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true -#zf.druid.username=zteits -#zf.druid.password=Zteits;123456 +zf.druid.url=jdbc:mysql://61.177.139.228:13906/zteits-zf?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true +zf.druid.username=zteits +zf.druid.password=Zteits;123456 -zf.druid.url=jdbc:mysql://192.168.1.167:3306/zteits-zf?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true -zf.druid.username=root -zf.druid.password=root +#zf.druid.url=jdbc:mysql://192.168.1.167:3306/zteits-zf?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true +#zf.druid.username=root +#zf.druid.password=root zf.druid.initialSize=1 zf.druid.minIdle=1 @@ -62,22 +62,22 @@ redis.port=6379 token=mytoken # 测试用的账号 -appId=wx077cae81383034aa -appSecret=d4624c36b6795d1d99dcf0547af5443d - #appId=wx271a27f6ad9b8704 #appSecret=1aee0b25571ffcbb1f6d3e52d5054c79 +appId=wx271a27f6ad9b8704 +appSecret=1aee0b25571ffcbb1f6d3e52d5054c79 + #是否对消息进行加密，是否对消息进行加密，对应于微信平台的消息加解密方式，false支持明文模式及兼容模式，true支持安全模式及兼容模式 #encryptMessage=true #encodingAesKey=yourEncodingAesKey #路径配置 -#app.host=http://dwmyqq.natappfree.cc -#app.staticHost=http://dwmyqq.natappfree.cc/static +#app.host=http://p6esgw.natappfree.cc +#app.staticHost=http://p6esgw.natappfree.cc/static -app.host=http://dwmyqq.natappfree.cc -app.staticHost=http://dwmyqq.natappfree.cc/static +app.host=http://atao.s1.natapp.cc +app.staticHost=http://atao.s1.natapp.cc/static #weixin pay #是否支持信用卡支付 diff --git a/src/main/webapp/WEB-INF/pages/check.html b/src/main/webapp/WEB-INF/pages/check.html index 5900e30..251f631 100644 --- a/src/main/webapp/WEB-INF/pages/check.html +++ b/src/main/webapp/WEB-INF/pages/check.html @@ -69,7 +69,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/pages/select.html b/src/main/webapp/WEB-INF/pages/select.html index aa2027f..3b366ae 100644 --- a/src/main/webapp/WEB-INF/pages/select.html +++ b/src/main/webapp/WEB-INF/pages/select.html @@ -169,7 +169,7 @@ $('#view_now').on('click',function () { }; //根据车牌号查询带支付的订单是否存在 // - + jsutil.defaultReq( mUrl.parkOrderForNotPayExist , {"carNum":val}, @@ -185,11 +185,11 @@ $('#view_now').on('click',function () { }else{ window.location.href= mUrl.queryOrderCheckErrorView+"&carNum="+val; } - + } }); - + }else{ diff --git a/src/main/webapp/static/js/url.js b/src/main/webapp/static/js/url.js index d3968ab..4fe9b32 100644 --- a/src/main/webapp/static/js/url.js +++ b/src/main/webapp/static/js/url.js @@ -1,6 +1,6 @@ var mUrl = mUrl || {}; -//var webPath = 'http://p6esgw.natappfree.cc'; -var webPath = 'http://dwmyqq.natappfree.cc'; +var webPath = 'http://p6esgw.natappfree.cc'; +var webPath = 'http://atao.s1.natapp.cc'; mUrl.getCommonParam = function () { //获取公共参数 var openId = mUrl.getOpenId(); -- libgit2 0.21.4