diff --git a/src/main/java/com/rnt/service/OrderService.java b/src/main/java/com/rnt/service/OrderService.java index f587279..ef2c5a9 100644 --- a/src/main/java/com/rnt/service/OrderService.java +++ b/src/main/java/com/rnt/service/OrderService.java @@ -284,8 +284,11 @@ public class OrderService { sql.append(" from td_b_order a"); sql.append(" where a.order_state in(1,2,3)"); sql.append(" and a.car_number=?"); + sql.append(" order by a.create_date DESC"); Order order = new Order().findFirst(sql.toString(), carNum); + + return order; } diff --git a/src/main/java/com/rnt/utils/DateUtil.java b/src/main/java/com/rnt/utils/DateUtil.java index 9a679c5..1e0e352 100644 --- a/src/main/java/com/rnt/utils/DateUtil.java +++ b/src/main/java/com/rnt/utils/DateUtil.java @@ -836,7 +836,7 @@ public class DateUtil { } public static void main(String[] args) { - String str = DateUtil.secondToTime(500000); + String str = DateUtil.secondToTime(7000); System.out.println(str); } } diff --git a/src/main/resources/a_little_config.txt b/src/main/resources/a_little_config.txt index f55ab2a..2e9d9aa 100644 --- a/src/main/resources/a_little_config.txt +++ b/src/main/resources/a_little_config.txt @@ -3,17 +3,11 @@ 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://10.117.185.28:3306/zt_park?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true +park.druid.username=park +park.druid.password=MySQL5.7;123 -#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.initialSize=1 park.druid.minIdle=1 park.druid.maxActive=20 @@ -27,18 +21,9 @@ park.druid.testOnReturn=false park.druid.testOnWhileIdle=true ####### zf库 -#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://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://10.117.185.28:3306/zt_order?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true +zf.druid.username=order +zf.druid.password=MySQL5.7;123 zf.druid.initialSize=1 zf.druid.minIdle=1 @@ -61,27 +46,18 @@ redis.port=6379 # 微信服务器回调所用的 token token=mytoken -# 测试用的账号 -#appId=wx271a27f6ad9b8704 -#appSecret=1aee0b25571ffcbb1f6d3e52d5054c79 - -appId=wx271a27f6ad9b8704 -appSecret=1aee0b25571ffcbb1f6d3e52d5054c79 +appId=wx099b7a61d9867fe0 +appSecret=fc468de39e6fcf181982483331d08fbd #是否对消息进行加密,是否对消息进行加密,对应于微信平台的消息加解密方式,false支持明文模式及兼容模式,true支持安全模式及兼容模式 #encryptMessage=true #encodingAesKey=yourEncodingAesKey -#路径配置 -#app.host=http://p6esgw.natappfree.cc -#app.staticHost=http://p6esgw.natappfree.cc/static -#app.host=http://atao.s1.natapp.cc -#app.staticHost=http://atao.s1.natapp.cc/static +app.host=http://wxgzh.rnting.com/rnt-wx +app.staticHost=http://wxgzh.rnting.com/rnt-wx/static -app.host=http://localhost:8080 -app.staticHost=http://localhost:8080/static #weixin pay #是否支持信用卡支付 diff --git a/src/main/webapp/static/js/url.js b/src/main/webapp/static/js/url.js index e45c311..abf5d25 100644 --- a/src/main/webapp/static/js/url.js +++ b/src/main/webapp/static/js/url.js @@ -1,7 +1,7 @@ var mUrl = mUrl || {}; //var webPath = 'http://p6esgw.natappfree.cc'; //var webPath = 'http://atao.s1.natapp.cc'; -var webPath = 'http://localhost:8080'; +var webPath = 'http://wxgzh.rnting.com/rnt-wx'; mUrl.getCommonParam = function () { //获取公共参数 var openId = mUrl.getOpenId();