修改验证码

common/src/main/java/com/jpsoft/bus/modules/common/utils/SMSUtil.java

@@ -86,10 +86,10 @@ public class SMSUtil {
 	 * @param phones 手机号,多个以英文逗号","隔开
 	 * @param signName 签名：目前仅支持"荆鹏云平台","速乐购"两种签名
 	 * @param smsTemplateCode 短信模版ID
-	 * @param json 短信模板变量，传参规则{"key":"value"}，key的名字须和申请模板中的变量名一致，多个变量之间以逗号隔开。示例：针对模板“验证码${code}，您正在进行${product}身份验证，打死不要告诉别人哦！”，传参时需传入{"code":"1234","product":"alidayu"}
+	 * @param jsonStr 短信模板变量，传参规则{"key":"value"}，key的名字须和申请模板中的变量名一致，多个变量之间以逗号隔开。示例：针对模板“验证码${code}，您正在进行${product}身份验证，打死不要告诉别人哦！”，传参时需传入{"code":"1234","product":"alidayu"}
 	 * @return
 	 */
-	public static MessageResult send(String phones, String signName, String smsTemplateCode, JSONObject json){
+	public static MessageResult send(String phones, String signName, String smsTemplateCode, String jsonStr){
 
 		boolean success = true;
 		String msg = "发送成功";
@@ -98,8 +98,8 @@ public class SMSUtil {
 		AlibabaAliqinFcSmsNumSendRequest req = new AlibabaAliqinFcSmsNumSendRequest();
 		req.setSmsType(SMS_TYPE);
 		req.setSmsFreeSignName(signName);
-		if(json != null){
-			req.setSmsParamString(json.toString());
+		if(jsonStr != null){
+			req.setSmsParamString(jsonStr);
 		}
 		req.setRecNum(phones);
 		req.setSmsTemplateCode(smsTemplateCode);

web/src/main/java/com/jpsoft/bus/modules/mobile/controller/PassengerApiController.java

@@ -147,7 +147,7 @@ public class PassengerApiController {
                 JSONObject verifyCodeJSON = new JSONObject();
                 verifyCodeJSON.put("code", verifyCode);
 
-                messageResult = SMSUtil.send(phone, "SMS_49390047", verifyCodeJSON.toString());
+                messageResult = SMSUtil.send(phone,"车信达" ,"SMS_49390047", verifyCodeJSON.toString());
 
                 //设置当前用户的验证码,5分钟内有效
                 redisTemplate.opsForValue().set(key, verifyCode, 5, TimeUnit.MINUTES);

web/src/main/resources/application-production.yml

@@ -3,9 +3,9 @@ spring:
     #    url: jdbc:log4jdbc:mysql://127.0.0.1:3306/smart-community?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
     #    username: root
     #    password: slgo^Root_!Q@W#E)P(O*I
-    url: jdbc:log4jdbc:mysql://hbjpsoft.mysql.rds.aliyuncs.com:3306/enterprise_federation?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-    username: bus
-    password: bus
+    url: jdbc:log4jdbc:mysql://mysql57/smart-bus?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    username: root
+    password: jpsoft8121234
   devtools:
     restart:
       enabled: true
@@ -23,7 +23,7 @@ spring:
     username: admin
     password: jpsoft
     #虚拟host 可以不设置,使用server默认host
-    virtual-host: enterprise-prod
+    virtual-host: smart-bus-test
 logger:
   level: WARN
   dir: /usr/local/tomcat/api-logs
@@ -36,7 +36,8 @@ springfox:
 
 wx:
   #荆楚云服务器内不能访问自身域名
-  commonAccessTokenUrl: http://192.168.0.1:8080/weixin/token
+  commonAccessTokenUrl: "http://ykt.xiaoxinda.com/weixin/token"
+  stationRemindTemplateId: "Ilxy2TX264A3RHqRyDZqL_xUDxi9OuBNeJoDOBfMRHg"
   pay:
     #车信达
     appId: wx93675268c87a5a46
@@ -56,14 +57,13 @@ wx:
     portalUrl: "http://xpgj.xiaoxinda.com/prod/business/#/"
 
   jpsoft:
-    appId: wx343bf93d2a3dc8af
-    appSecret: ac61fa669a7a79c7d2a8188ff7ddaef6
-    #mchId: 1509055881
-    mchId: 1531793091
+    appId: wx907e84ad32e6e142
+    appSecret: 1d891ee3f4cc8002ff0330d1e04acf2c
+    mchId: 1509055881
     subMchId: 1523544111
-    mchKey: jpsoft11111111111111111111111111
-    notifyUrl: http://xpgjapi.xiaoxinda.com/wxPay/wxJsapiPayNotify
-    refundUrl: http://xpgjapi.xiaoxinda.com/wxPay/wxJsapiRefundNotify
+    mchKey: xxd33333333333333333333333333333
+    notifyUrl: http://ykt-test.xiaoxinda.com/jp-housekeeper-server/wxPay/wxJsapiPayNotify
+    refundUrl: http://ykt-test.xiaoxinda.com/jp-housekeeper-server/wxPay/wxJsapiRefundNotify
     ip: 101.37.31.116
     certPath: /usr/local/tomcat/webapps/cert/xiaoxinda/apiclient_cert.p12
     temporaryUrl: http://ykt.xiaoxinda.com/wxPay/wxJsapiPayTemporaryNotify