BJ_ZTEITS-Developers / zteits-rnt-wx

Commit e900ab9b4cdc473708386d36c84de096feccd090

Authored by atao
1 parent 0b3bb3d3

提交代码

Inline Side-by-side
Showing 9 changed files with 127 additions and 33 deletions
.gitignore 0 → 100644
  View file @e900ab9
  1 +# Created by .ignore support plugin (hsz.mobi)
  2 +### Example user template template
  3 +### Example user template
  4 +
  5 +# IntelliJ project files
  6 +.idea
  7 +*.iml
  8 +out
  9 +gen### Eclipse template
  10 +
  11 +.metadata
  12 +bin/
  13 +tmp/
  14 +*.tmp
  15 +*.bak
  16 +*.swp
  17 +*~.nib
  18 +local.properties
  19 +.settings/
  20 +.loadpath
  21 +.recommenders
  22 +
  23 +# Eclipse Core
  24 +.project
  25 +
  26 +# External tool builders
  27 +.externalToolBuilders/
  28 +
  29 +# Locally stored "Eclipse launch configurations"
  30 +*.launch
  31 +
  32 +# PyDev specific (Python IDE for Eclipse)
  33 +*.pydevproject
  34 +
  35 +# CDT-specific (C/C++ Development Tooling)
  36 +.cproject
  37 +
  38 +# JDT-specific (Eclipse Java Development Tools)
  39 +.classpath
  40 +
  41 +# Java annotation processor (APT)
  42 +.factorypath
  43 +
  44 +# PDT-specific (PHP Development Tools)
  45 +.buildpath
  46 +
  47 +# sbteclipse plugin
  48 +.target
  49 +
  50 +# Tern plugin
  51 +.tern-project
  52 +
  53 +# TeXlipse plugin
  54 +.texlipse
  55 +
  56 +# STS (Spring Tool Suite)
  57 +.springBeans
  58 +
  59 +# Code Recommenders
  60 +.recommenders/
  61 +
  62 +# Scala IDE specific (Scala & Java development for Eclipse)
  63 +.cache-main
  64 +.scala_dependencies
  65 +.worksheet
  66 +### SVN template
  67 +.svn/
  68 +### Java template
  69 +# Compiled class file
  70 +*.class
  71 +
  72 +# Log file
  73 +*.log
  74 +
  75 +# BlueJ files
  76 +*.ctxt
  77 +
  78 +# Mobile Tools for Java (J2ME)
  79 +.mtj.tmp/
  80 +
  81 +# Package Files #
  82 +*.jar
  83 +*.war
  84 +*.ear
  85 +*.zip
  86 +*.tar.gz
  87 +*.rar
  88 +
  89 +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
  90 +hs_err_pid*
  91 +
  92 +.gitignore
  93 +.idea/
  94 +src/main/java/com/rnt/plugins/
... ...
src/main/java/com/jfinal/weixin/sdk/api/MenuApi.java
  View file @e900ab9
... ... @@ -121,12 +121,12 @@ public class MenuApi {
121 121 "{"+
122 122 "\"type\":\"view\","+
123 123 "\"name\":\"支付\","+
124   - "\"url\":\"http://dwmyqq.natappfree.cc/pay/selectCarView\""+
  124 + "\"url\":\"http://atao.s1.natapp.cc/pay/selectCarView\""+
125 125 "},"+
126 126 "{"+
127 127 "\"type\":\"view\","+
128 128 "\"name\":\"月卡\","+
129   - "\"url\":\"http://dwmyqq.natappfree.cc/park/parkListView\""+
  129 + "\"url\":\"http://atao.s1.natapp.cc/park/parkListView\""+
130 130 "},"+
131 131 "{"+
132 132 "\"name\":\"关于我们\","+
... ...
src/main/java/com/jfinal/weixin/sdk/utils/JsonUtils.java
  View file @e900ab9
... ... @@ -78,7 +78,7 @@ public final class JsonUtils {
78 78 Json jsonToUse = null;
79 79 // com.fasterxml.jackson.databind.ObjectMapper?
80 80 if (ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", JsonUtils.class.getClassLoader())) {
81   - jsonToUse = new JsonUtils.Jackson();
  81 + jsonToUse = new Jackson();
82 82 }
83 83 // com.alibaba.fastjson.JSONObject?
84 84 else if (ClassUtils.isPresent("com.alibaba.fastjson.JSONObject", JsonUtils.class.getClassLoader())) {
... ...
src/main/java/com/jfinal/weixin/sdk/utils/XmlHelper.java
  View file @e900ab9
... ... @@ -189,11 +189,11 @@ public class XmlHelper {
189 189 }
190 190  
191 191 private static DocumentBuilderFactory getDocumentBuilderFactory(){
192   - return XmlHelper.XmlHelperHolder.documentBuilderFactory;
  192 + return XmlHelperHolder.documentBuilderFactory;
193 193 }
194 194  
195 195 private static XPathFactory getXPathFactory() {
196   - return XmlHelper.XmlHelperHolder.xPathFactory;
  196 + return XmlHelperHolder.xPathFactory;
197 197 }
198 198  
199 199 /**
... ...
src/main/java/com/rnt/controller/WeixinPayController.java
  View file @e900ab9
... ... @@ -56,7 +56,6 @@ import com.rnt.vo.ParkLotCardVO;
56 56 import com.xiaoleilu.hutool.date.DateField;
57 57 import com.xiaoleilu.hutool.date.DateUtil;
58 58 import org.beetl.sql.core.kit.StringKit;
59   -import org.springframework.beans.BeanUtils;
60 59  
61 60 /**
62 61 * 感谢 *半杯* 童鞋联调支付API
... ... @@ -1131,10 +1130,11 @@ public class WeixinPayController extends Controller {
1131 1130 * 检查输入的车牌号是否存订单(带核算／待支付／已完成).<br/>
1132 1131 */
1133 1132 public void parkOrderForNotPayExist(){
1134   - BizResult<Order> result = new BizResult<Order>();
  1133 + BizResult<Order> result = new BizResult<>();
1135 1134 String carNum = this.getPara("carNum");
1136 1135 logger.info("开始校验输入车牌是否存在待核算订单..入参＝"+carNum);
1137 1136 String rs ="";
  1137 + OrderVO OrderVO = new OrderVO();
1138 1138 try{
1139 1139 if(StringKit.isNotBlank(carNum)){
1140 1140 OrderService orderService = Duang.duang(OrderService.class);
... ... @@ -1166,7 +1166,7 @@ public class WeixinPayController extends Controller {
1166 1166 }catch(Exception e){
1167 1167 e.printStackTrace();
1168 1168 }
1169   - logger.info("结束校验输入车牌是否存在待核算订单..结果＝"+JSONObject.toJSONString(result));
  1169 + logger.info("结束校验输入车牌是否存在待核算订单..响应＝"+JSONObject.toJSONString(result));
1170 1170 this.renderJson(result);
1171 1171  
1172 1172 }
... ...
src/main/resources/a_little_config.txt
  View file @e900ab9
... ... @@ -3,17 +3,17 @@ devMode = true
3 3  
4 4 ######## park库
5 5  
6   -#park.druid.url=jdbc:mysql://61.177.139.228:13906/zteits-park?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
7   -#park.druid.username=zteits
8   -#park.druid.password=Zteits;123456
  6 +park.druid.url=jdbc:mysql://61.177.139.228:13906/zteits-park?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
  7 +park.druid.username=zteits
  8 +park.druid.password=Zteits;123456
9 9  
10 10 #park.druid.url=jdbc:mysql://127.0.0.1:3306/zteits-park?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
11 11 #park.druid.username=root
12 12 #park.druid.password=Admin!@#
13 13  
14   -park.druid.url=jdbc:mysql://192.168.1.167:3306/zteits-park?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
15   -park.druid.username=root
16   -park.druid.password=root
  14 +#park.druid.url=jdbc:mysql://192.168.1.167:3306/zteits-park?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
  15 +#park.druid.username=root
  16 +#park.druid.password=root
17 17 park.druid.initialSize=1
18 18 park.druid.minIdle=1
19 19 park.druid.maxActive=20
... ... @@ -32,13 +32,13 @@ park.druid.testOnWhileIdle=true
32 32 #zf.druid.password=root
33 33  
34 34  
35   -#zf.druid.url=jdbc:mysql://61.177.139.228:13906/zteits-zf?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
36   -#zf.druid.username=zteits
37   -#zf.druid.password=Zteits;123456
  35 +zf.druid.url=jdbc:mysql://61.177.139.228:13906/zteits-zf?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
  36 +zf.druid.username=zteits
  37 +zf.druid.password=Zteits;123456
38 38  
39   -zf.druid.url=jdbc:mysql://192.168.1.167:3306/zteits-zf?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
40   -zf.druid.username=root
41   -zf.druid.password=root
  39 +#zf.druid.url=jdbc:mysql://192.168.1.167:3306/zteits-zf?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
  40 +#zf.druid.username=root
  41 +#zf.druid.password=root
42 42  
43 43 zf.druid.initialSize=1
44 44 zf.druid.minIdle=1
... ... @@ -62,22 +62,22 @@ redis.port=6379
62 62 token=mytoken
63 63  
64 64 # 测试用的账号
65   -appId=wx077cae81383034aa
66   -appSecret=d4624c36b6795d1d99dcf0547af5443d
67   -
68 65 #appId=wx271a27f6ad9b8704
69 66 #appSecret=1aee0b25571ffcbb1f6d3e52d5054c79
70 67  
  68 +appId=wx271a27f6ad9b8704
  69 +appSecret=1aee0b25571ffcbb1f6d3e52d5054c79
  70 +
71 71 #是否对消息进行加密，是否对消息进行加密，对应于微信平台的消息加解密方式，false支持明文模式及兼容模式，true支持安全模式及兼容模式
72 72 #encryptMessage=true
73 73 #encodingAesKey=yourEncodingAesKey
74 74  
75 75 #路径配置
76   -#app.host=http://dwmyqq.natappfree.cc
77   -#app.staticHost=http://dwmyqq.natappfree.cc/static
  76 +#app.host=http://p6esgw.natappfree.cc
  77 +#app.staticHost=http://p6esgw.natappfree.cc/static
78 78  
79   -app.host=http://dwmyqq.natappfree.cc
80   -app.staticHost=http://dwmyqq.natappfree.cc/static
  79 +app.host=http://atao.s1.natapp.cc
  80 +app.staticHost=http://atao.s1.natapp.cc/static
81 81  
82 82 #weixin pay
83 83 #是否支持信用卡支付
... ...
src/main/webapp/WEB-INF/pages/check.html
  View file @e900ab9
... ... @@ -69,7 +69,7 @@
69 69 <div class="weui-cell">
70 70 <div class="weui-cell__hd"><label for="" class="weui-label">当前车牌</label></div>
71 71 <div class="weui-cell__bd" id="carNumber">
72   -
  72 +
73 73 </div>
74 74 </div>
75 75  
... ...
src/main/webapp/WEB-INF/pages/select.html
  View file @e900ab9
... ... @@ -169,7 +169,7 @@ $(&#39;#view_now&#39;).on(&#39;click&#39;,function () {
169 169 };
170 170 //根据车牌号查询带支付的订单是否存在
171 171 //
172   -
  172 +
173 173 jsutil.defaultReq(
174 174 mUrl.parkOrderForNotPayExist ,
175 175 {"carNum":val},
... ... @@ -185,11 +185,11 @@ $(&#39;#view_now&#39;).on(&#39;click&#39;,function () {
185 185 }else{
186 186 window.location.href= mUrl.queryOrderCheckErrorView+"&carNum="+val;
187 187 }
188   -
  188 +
189 189 }
190 190  
191 191 });
192   -
  192 +
193 193  
194 194  
195 195 }else{
... ...
src/main/webapp/static/js/url.js
  View file @e900ab9
1 1 var mUrl = mUrl || {};
2   -//var webPath = 'http://p6esgw.natappfree.cc';
3   -var webPath = 'http://dwmyqq.natappfree.cc';
  2 +var webPath = 'http://p6esgw.natappfree.cc';
  3 +var webPath = 'http://atao.s1.natapp.cc';
4 4 mUrl.getCommonParam = function () {
5 5 //获取公共参数
6 6 var openId = mUrl.getOpenId();
... ...