BJ_ZTEITS-Developers / zteits-rnt-wx

Commit e950ab14f6251a332a4fd8dd91a278e2f9320dda

Authored by 王富生
1 parent d16e502d

提交

Inline Side-by-side
Showing 4 changed files with 15 additions and 36 deletions
src/main/java/com/rnt/service/OrderService.java
  View file @e950ab1
... ... @@ -284,8 +284,11 @@ public class OrderService {
284 284 sql.append(" from td_b_order a");
285 285 sql.append(" where a.order_state in(1,2,3)");
286 286 sql.append(" and a.car_number=?");
  287 + sql.append(" order by a.create_date DESC");
287 288  
288 289 Order order = new Order().findFirst(sql.toString(), carNum);
  290 +
  291 +
289 292  
290 293 return order;
291 294 }
... ...
src/main/java/com/rnt/utils/DateUtil.java
  View file @e950ab1
... ... @@ -836,7 +836,7 @@ public class DateUtil {
836 836 }
837 837  
838 838 public static void main(String[] args) {
839   - String str = DateUtil.secondToTime(500000);
  839 + String str = DateUtil.secondToTime(7000);
840 840 System.out.println(str);
841 841 }
842 842 }
... ...
src/main/resources/a_little_config.txt
  View file @e950ab1
... ... @@ -3,17 +3,11 @@ 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://10.117.185.28:3306/zt_park?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
  7 +park.druid.username=park
  8 +park.druid.password=MySQL5.7;123
9 9  
10   -#park.druid.url=jdbc:mysql://127.0.0.1:3306/zteits-park?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
11   -#park.druid.username=root
12   -#park.druid.password=Admin!@#
13 10  
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 11 park.druid.initialSize=1
18 12 park.druid.minIdle=1
19 13 park.druid.maxActive=20
... ... @@ -27,18 +21,9 @@ park.druid.testOnReturn=false
27 21 park.druid.testOnWhileIdle=true
28 22  
29 23 ####### zf库
30   -#zf.druid.url=jdbc:mysql://192.168.1.167:3306/zteits-zf?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
31   -#zf.druid.username=root
32   -#zf.druid.password=root
33   -
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
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
  24 +zf.druid.url=jdbc:mysql://10.117.185.28:3306/zt_order?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
  25 +zf.druid.username=order
  26 +zf.druid.password=MySQL5.7;123
42 27  
43 28 zf.druid.initialSize=1
44 29 zf.druid.minIdle=1
... ... @@ -61,27 +46,18 @@ redis.port=6379
61 46 # 微信服务器回调所用的 token
62 47 token=mytoken
63 48  
64   -# 测试用的账号
65   -#appId=wx271a27f6ad9b8704
66   -#appSecret=1aee0b25571ffcbb1f6d3e52d5054c79
67   -
68   -appId=wx271a27f6ad9b8704
69   -appSecret=1aee0b25571ffcbb1f6d3e52d5054c79
  49 +appId=wx099b7a61d9867fe0
  50 +appSecret=fc468de39e6fcf181982483331d08fbd
70 51  
71 52 #是否对消息进行加密，是否对消息进行加密，对应于微信平台的消息加解密方式，false支持明文模式及兼容模式，true支持安全模式及兼容模式
72 53 #encryptMessage=true
73 54 #encodingAesKey=yourEncodingAesKey
74 55  
75   -#路径配置
76   -#app.host=http://p6esgw.natappfree.cc
77   -#app.staticHost=http://p6esgw.natappfree.cc/static
78 56  
79   -#app.host=http://atao.s1.natapp.cc
80   -#app.staticHost=http://atao.s1.natapp.cc/static
81 57  
  58 +app.host=http://wxgzh.rnting.com/rnt-wx
  59 +app.staticHost=http://wxgzh.rnting.com/rnt-wx/static
82 60  
83   -app.host=http://localhost:8080
84   -app.staticHost=http://localhost:8080/static
85 61  
86 62 #weixin pay
87 63 #是否支持信用卡支付
... ...
src/main/webapp/static/js/url.js
  View file @e950ab1
1 1 var mUrl = mUrl || {};
2 2 //var webPath = 'http://p6esgw.natappfree.cc';
3 3 //var webPath = 'http://atao.s1.natapp.cc';
4   -var webPath = 'http://localhost:8080';
  4 +var webPath = 'http://wxgzh.rnting.com/rnt-wx';
5 5 mUrl.getCommonParam = function () {
6 6 //获取公共参数
7 7 var openId = mUrl.getOpenId();
... ...