Skip to content

G
gdtel-gztel-school-center
Commit a6e266a1 by 伍思炜
Options

更换短信平台

parent c16ecb8c
Showing with 203 additions and 83 deletions
apply-net/src/main/java/com/winsun/controller/SingleBroadToIntegrateController.java
......@@ -121,7 +121,7 @@ public class SingleBroadToIntegrateController {
if ((kdPhones != null && kdPhones.size() > 0) || (orders != null && orders.size() > 0)) {
String random = String.valueOf((int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000));
redisTemplate.opsForValue().set(SingleBroadToIntegrateController.TOINTEGRATE + phone, random, 30, TimeUnit.MINUTES);
SendSmsAndMail.sendSms(phone, random, "7");
SendSmsAndMail.sendSms(phone, random,null, "7");
}else{
return ResponseData.error("该号码不在优惠清单中");
}
......
apply-net/src/main/java/com/winsun/controller/codeManagerController.java
......@@ -119,7 +119,7 @@ public class codeManagerController {
// 新框架短信验证码保存在Redis，但由于业务需要使用原来方式，存在数据库里
redisTemplate.opsForValue().set(phone, String.valueOf(veCode), 30, TimeUnit.MINUTES);
saveAuthCodeUtil.saveAuthCode(phone, String.valueOf(veCode)); // 临时保存数据库
SendSmsAndMail.sendSms(phone,veCode + "","7");
SendSmsAndMail.sendSms(phone,veCode + "",null,"7");
log.info("验证码:" + veCode);
map.put("code",1);
}else{
......@@ -147,7 +147,7 @@ public class codeManagerController {
int veCode = (int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000);
redisTemplate.opsForValue().set(phone, String.valueOf(veCode), 30, TimeUnit.MINUTES);
saveAuthCodeUtil.saveAuthCode(phone, String.valueOf(veCode)); // 临时保存数据库
SendSmsAndMail.sendSms(phone,veCode + "","7");
SendSmsAndMail.sendSms(phone,veCode + "",null,"7");
log.info("验证码:" + veCode);
map.put("code",1);
} catch (Exception e) {
......
apply-net/src/main/resources/application-prod.yml
......@@ -120,6 +120,9 @@ spring:
exprie: 600
prohibition: 600
datasource:
url: jdbc:mysql://localhost:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
username: ENC(z8WG0Zar99IzLr3L9Z3mOw==)
password: ENC(r4U47DSf9LNRyoH/G6GxfA2w1JTZOwr7MREDyGA0PWM=)
druid:
WebStatFilter:
enabled: false
......@@ -133,9 +136,9 @@ spring:
max-active: 30
datasource:
master:
url: jdbc:mysql://localhost:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
username: ENC(z8WG0Zar99IzLr3L9Z3mOw==)
password: ENC(r4U47DSf9LNRyoH/G6GxfA2w1JTZOwr7MREDyGA0PWM=)
url: ${spring.datasource.url}
username: ${spring.datasource.username}
password: ${spring.datasource.password}
driver-class-name: com.mysql.cj.jdbc.Driver
devtools:
restart:
......
common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrders.java
......@@ -638,7 +638,7 @@ public class IntelligenceSendOrders {
try {
log.info("提交参数:" + order_dataJSON);
Constant.trustEveryone();
responese = Unirest.post("https://applet.mini189.cn/dev/generate")
responese = Unirest.post("https://applet.mini189.cn/prod/generate")
.header("Content-Type", "application/json;charset=UTF-8")
.header("X-Sign", sign)
.body(order_dataJSON)
......@@ -735,7 +735,7 @@ public class IntelligenceSendOrders {
try {
log.info("提交参数:" + data);
Constant.trustEveryone();
kong.unirest.HttpResponse<String> responese = Unirest.get("https://applet.mini189.cn/dev/query/query-order-info?" + url_data)
kong.unirest.HttpResponse<String> responese = Unirest.get("https://applet.mini189.cn/prod/query/query-order-info?" + url_data)
.header("Content-Type", "application/json")
.header("X-Sign", sign)
.asString();
......@@ -788,7 +788,7 @@ public class IntelligenceSendOrders {
/**
* 公共方法
*
* @param order hhr_order 表的map数据
* @param orderMap hhr_order 表的map数据
* @param rightNowSend 是否马上下单，是则无视融合时间，不是则判断融合时间是否当天
* @throws Exception
*/
......@@ -998,7 +998,7 @@ public class IntelligenceSendOrders {
RestTemplate restTemplate = new RestTemplate();
log.info("提交参数:" + data);
Constant.trustEveryone();
responese = Unirest.get("https://applet.mini189.cn/dev/query/query-order-info?" + url_data)
responese = Unirest.get("https://applet.mini189.cn/prod/query/query-order-info?" + url_data)
.header("Content-Type", "application/json")
.header("X-Sign", sign)
.asString();
......
common/src/main/java/com/winsun/smsUtils/HttpUtil.java
......@@ -16,6 +16,11 @@ import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.util.EntityUtils;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.net.URL;
import java.net.URLConnection;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
......@@ -193,4 +198,44 @@ public class HttpUtil {
}
}
}
public static String post(String url, String body) {
System.out.println("body:" + System.lineSeparator() + body);
String result = "";
try {
OutputStreamWriter out = null;
BufferedReader in = null;
URL realUrl = new URL(url);
URLConnection conn = realUrl.openConnection();
// 设置连接参数
conn.setDoOutput(true);
conn.setDoInput(true);
conn.setConnectTimeout(5000);
conn.setReadTimeout(20000);
conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
// 提交数据
out = new OutputStreamWriter(conn.getOutputStream(), "UTF-8");
out.write(body);
out.flush();
// 读取返回数据
in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "UTF-8"));
String line = "";
boolean firstLine = true; // 读第一行不加换行符
while ((line = in.readLine()) != null) {
if (firstLine) {
firstLine = false;
} else {
result += System.lineSeparator();
}
result += line;
}
} catch (Exception e) {
e.printStackTrace();
}
return result;
}
}
common/src/main/java/com/winsun/smsUtils/SendSmsAndMail.java
......@@ -2,13 +2,31 @@ package com.winsun.smsUtils;
import lombok.extern.slf4j.Slf4j;
import net.sf.json.JSONObject;
import org.apache.commons.codec.digest.DigestUtils;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.*;
@Slf4j
public class SendSmsAndMail {
/**
* url前半部分
*/
public static final String BASE_URL = "https://openapi.danmi.com/distributor/sendSMS";
/**
* 开发者注册后系统自动生成的账号，可在官网登录后查看
*/
public static final String ACCOUNT_SID = "2acd89bd98ff690b1a0f8a7c0afefd18";
/**
* 开发者注册后系统自动生成的TOKEN，可在官网登录后查看
*/
public static final String AUTH_TOKEN = "171a104a486f28af727c9c69207fc365";
public static void main(String[] args) {
/*public static void main(String[] args) {
ArrayList<String> obj = new ArrayList<String>();
List<String> list = Arrays.asList(
"13697427771/t1836@sise.cn/660040Abca"
......@@ -26,13 +44,52 @@ public class SendSmsAndMail {
// 生成url
// log.info(res);
}*/
public static String sendSms(String contactPhone,String speed,String name,String t) throws Exception {
StringBuilder sb = new StringBuilder();
sb.append("accountSid").append("=").append(ACCOUNT_SID);
sb.append("&to").append("=").append(contactPhone);
if ("2".equals(t)){
sb.append("&param").append("=").append(URLEncoder.encode(speed,"UTF-8"));
//【飞young校园】尊敬的客户，您已成功下单！如需了解订单详情请点击@_url_@，如有任何问题请点击订单详情页面右上角，咨询客服。
sb.append("&templateid").append("=").append("319129");
}else if ("3".equals(t)){
sb.append("&param").append("=").append(URLEncoder.encode(speed,"UTF-8"));
//【飞young校园】尊敬的用户：您已完成手机卡的活体认证，请在5分钟后插卡拨打电话进行激活。
sb.append("&templateid").append("=").append("319133");
}else if ("7".equals(t)){
sb.append("&param").append("=").append(URLEncoder.encode(speed,"UTF-8"));
//【飞young校园】您获取的验证码为：@_code_@ 半小时后过期，请及时使用。
sb.append("&templateid").append("=").append("319126");
}else if ("11".equals(t)){
sb.append("&param").append("=").append(URLEncoder.encode(speed+","+name,"UTF-8"));
//【飞young校园】尊敬的用户，您的订单已受理成功！按照国家实名制规定，请您收到手机卡后尽快进行实名激活。快递公司：@_company_@；单号：@_kuaidi_order_@
sb.append("&templateid").append("=").append("319135");
}else if ("12".equals(t)){
sb.append("&param").append("=").append(URLEncoder.encode(speed+","+name,"UTF-8"));
//【飞young校园】尊敬的用户：您好！您的校园宽带已开通，宽带账号：@_kd_@，登录密码：@_pass_@ ！请保存好账号密码，如有疑问可咨询学校网络中心。祝您生活愉快！
sb.append("&templateid").append("=").append("319128");
}else if ("14".equals(t)){
sb.append("&param").append("=").append(URLEncoder.encode("","UTF-8"));
//【飞young校园】尊敬的用户：您的校园宽带开通失败，详细原因可向学校网络中心咨询，协商解决后重新下单，祝您生活愉快！
sb.append("&templateid").append("=").append("319134");
}
String body = sb.toString() + createCommonParam(ACCOUNT_SID, AUTH_TOKEN);
log.info("send body:" + body);
try {
HttpUtil.post(BASE_URL, body);
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
/**
* @param contactPhone
* 接收短信的手机号
* (旧)接收短信的手机号
*/
public static String sendSms(String contactPhone,String preurl,String t) {
public static String oldSendSms(String contactPhone,String preurl,String t) {
String url = "https://ytx.21cn.com/sendApi//send/smv"; // 生产
String accessTokenJsonString = new GetAccessToken().getAccessToken();// 获得accessToken
......@@ -109,7 +166,7 @@ public class SendSmsAndMail {
}
public static String sendSms2(String contactPhone,String speed,String name,String t) {
public static String oldSendSms2(String contactPhone,String speed,String name,String t) {
String url = "https://ytx.21cn.com/sendApi//send/smv"; // 生产
String accessTokenJsonString = new GetAccessToken().getAccessToken();// 获得accessToken
......@@ -140,10 +197,10 @@ public class SendSmsAndMail {
requestData.put("smsTemplateId", "00QiOt2Pjygy");// 短信模板id 创建成功
requestData.put("data", "{\"company\":\"" + speed + "\",\"kuaidi_order\":\""+name+"\"}"); // 数据
}else if(t.equals("12")){
//【飞young校园】尊敬的用户：您好！您的校园宽带已开通，宽带账号：@_kd_@，登录密码：@_pass_@ ！请保存好账号密码，如有疑问可咨询学校网络中心。祝您生活愉快！
requestData.put("smsTemplateId", "00TOMT9K3UPo");// 短信模板id 创建成功
requestData.put("data", "{\"kd\":\"" + speed + "\",\"pass\":\""+name+"\"}"); // 数据
}
//【飞young校园】尊敬的用户：您好！您的校园宽带已开通，宽带账号：@_kd_@，登录密码：@_pass_@ ！请保存好账号密码，如有疑问可咨询学校网络中心。祝您生活愉快！
requestData.put("smsTemplateId", "00TOMT9K3UPo");// 短信模板id 创建成功
requestData.put("data", "{\"kd\":\"" + speed + "\",\"pass\":\""+name+"\"}"); // 数据
}
requestData.put("requestId", String.valueOf(System.currentTimeMillis())); // 16位请求标识码
......@@ -158,4 +215,17 @@ public class SendSmsAndMail {
return null;
}
/**
* 构造通用参数timestamp、sig和respDataType
*
* @return
*/
public static String createCommonParam(String sid,String token) {
// 时间戳
long timestamp = System.currentTimeMillis();
// 签名
String sig = DigestUtils.md5Hex(sid + token + timestamp);
return "&timestamp=" + timestamp + "&sig=" + sig + "&respDataType=JSON";
}
}
core-service/src/main/java/com/winsun/item/modular/system/controller/GetPhoneCodeController.java
......@@ -106,7 +106,7 @@ public class GetPhoneCodeController extends BaseController {
} else {
if (user.getPhone().length() == 11) {
saveAuthCodeUtil.saveAuthCode(user.getPhone(), verificationCode); //临时保存数据库
SendSmsAndMail.sendSms(user.getPhone(), verificationCode, "7");
SendSmsAndMail.sendSms(user.getPhone(), verificationCode, "","7");
sent.put("message", "发送成功");
sent.put("code", 200);
} else {
......@@ -156,7 +156,7 @@ public class GetPhoneCodeController extends BaseController {
} else {
if (user.getPhone().length() == 11) {
saveAuthCodeUtil.saveAuthCode(user.getPhone(), verificationCode); // 临时保存数据库
SendSmsAndMail.sendSms(user.getPhone(), verificationCode, "7");
SendSmsAndMail.sendSms(user.getPhone(), verificationCode, "", "7");
sent.put("message", "发送成功");
sent.put("code", 200);
} else {
......@@ -197,7 +197,7 @@ public class GetPhoneCodeController extends BaseController {
Map<String, Object> sent = new HashMap<>();
try {
if (user.getPhone().length() == 11) {
SendSmsAndMail.sendSms(user.getPhone(), verificationCode, "7");
SendSmsAndMail.sendSms(user.getPhone(), verificationCode, "", "7");
} else {
sent.put("code", 400);
sent.put("message", "当前用户手机号码不合法！");
......
core-service/src/main/java/com/winsun/item/modular/system/controller/LoginPwdController.java
......@@ -380,7 +380,7 @@ public class LoginPwdController extends BaseController {
sent.put("code", 400);
try {
if (user.getPhone().length() == 11) {
SendSmsAndMail.sendSms(user.getPhone(), verificationCode, "7");
SendSmsAndMail.sendSms(user.getPhone(), verificationCode, "", "7");
sent.put("message", "操作成功");
// sent.put("message", "发送成功");
sent.put("code", 200);
......
core-service/src/test/java/com/winsun/user/UserTestHelper.java
package com.winsun.user;
import com.winsun.base.AppApplicationBaseIT;
import com.winsun.item.modular.system.dao.UserMapper;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
/**
* 用户测试
* @author Liph
* @datetime 2020-01-20/1/9 09:43
*/
@Slf4j
public class UserTestHelper extends AppApplicationBaseIT {
@Autowired
private UserMapper mapper;
/*@Autowired
private IntelligenceSendOrder intelligenceSendOrder;*/
@Test
public void decryptPwd() {
// final String account = "18028801118";
// User user = mapper.getByAccount(account);
// if(user == null) {
// throw new NullPointerException("解密用户信息失败，用户不存在");
// }
// log.info(user.getPassword());
// // 证明MD5无法解密
// ResponseData<String> pwdDecrypt = LoginUtils.pwdDecrypt(user.getPassword());
// log.info("{}", pwdDecrypt.getData());
//package com.winsun.user;
//
// String orderSeq = RandomUtil.RandomNumber(32);
// System.out.println(orderSeq);
//intelligenceSendOrder.queryStatus("iczrnmals07dq3im35c1",null);
System.out.println(1234);
}
}
//import com.winsun.base.AppApplicationBaseIT;
//import com.winsun.item.modular.system.dao.UserMapper;
//import com.winsun.outSideSystem.IntelligenceSendOrder;
//import lombok.extern.slf4j.Slf4j;
//import org.junit.Test;
//import org.springframework.beans.factory.annotation.Autowired;
//
///**
// * 用户测试
// * @author Liph
// * @datetime 2020-01-20/1/9 09:43
// */
//@Slf4j
//public class UserTestHelper extends AppApplicationBaseIT {
//
// @Autowired
// private UserMapper mapper;
//
// @Autowired
// private IntelligenceSendOrder intelligenceSendOrder;
// @Test
// public void decryptPwd() {
//// final String account = "18028801118";
//// User user = mapper.getByAccount(account);
//// if(user == null) {
//// throw new NullPointerException("解密用户信息失败，用户不存在");
//// }
//// log.info(user.getPassword());
//// // 证明MD5无法解密
//// ResponseData<String> pwdDecrypt = LoginUtils.pwdDecrypt(user.getPassword());
//// log.info("{}", pwdDecrypt.getData());
////
//// String orderSeq = RandomUtil.RandomNumber(32);
//// System.out.println(orderSeq);
//
// //intelligenceSendOrder.queryStatus("iczrnmals07dq3im35c1",null);
// System.out.println(1234);
// }
//}
new-user/src/main/java/com/winsun/controller/PackageNewClothes.java
......@@ -177,7 +177,7 @@ public class PackageNewClothes {
, @RequestParam(value = "idCard") String idCard, @RequestParam(value = "cardAddress") String cardAddress, @RequestParam("signUrl") String signUrl, @RequestParam("businessNumber") String businessNumber
, @RequestParam(value = "clazz") String clazz, @RequestParam(value = "userSchool") String userSchool
, @RequestParam(value = "isFromRh", required = false) String isFromRh
, @RequestParam(value = "sell", required = false) String sell) {
, @RequestParam(value = "sell", required = false) String sell) throws Exception {
if (sell != null && StringUtils.isNumeric(sell)) {
} else {
......@@ -332,7 +332,7 @@ public class PackageNewClothes {
String url = "https://dx.dianyuanjiangli.com/mobile/#/hhr/handleSuccessful?orderId=" + id;
log.info("预制卡订单查询短信地址:" + url);
log.info("联系号码：" + contactNumber);
SendSmsAndMail.sendSms(contactNumber, url, "2");
SendSmsAndMail.sendSms(contactNumber, url, null, "2");
if (orderInsert == 1 && orderCardAddressInsert == 1) {
appMapper.inserOrderHis(id, "资料已提交", date, customerName);
return ResponseData.success(id);
......@@ -373,7 +373,7 @@ public class PackageNewClothes {
, @RequestParam("businessNumber") String businessNumber, @RequestParam("signUrl") String signUrl
, @RequestParam(value = "userSchool") String userSchool, @RequestParam(value = "cardAddress") String cardAddress
, @RequestParam(value = "isFromRh", required = false) String isFromRh
, @RequestParam(value = "sell", required = false) String sell) {
, @RequestParam(value = "sell", required = false) String sell) throws Exception {
if (sell != null && StringUtils.isNumeric(sell)) {
} else {
......@@ -519,7 +519,7 @@ public class PackageNewClothes {
String url = "https://dx.dianyuanjiangli.com/mobile/#/hhr/handleSuccessful?orderId=" + id;
log.info("天翼学生卡订单查询短信地址:" + url);
log.info("联系号码：" + contactNumber);
SendSmsAndMail.sendSms(contactNumber, url, "2");
SendSmsAndMail.sendSms(contactNumber, url, null, "2");
if (insert == 1) {
appMapper.inserOrderHis(id, "资料已提交", date, customerName);
return ResponseData.success(id);
......@@ -551,7 +551,7 @@ public class PackageNewClothes {
, @RequestParam(value = "remarks", required = false) String remarks, @RequestParam(value = "kapin") String kapin, @RequestParam("signUrl") String signUrl
, @RequestParam(value = "idCard") String idCard, @RequestParam(value = "userSchool") String userSchool
, @RequestParam(value = "isFromRh", required = false) String isFromRh
, @RequestParam(value = "sell", required = false) String sell) {
, @RequestParam(value = "sell", required = false) String sell) throws Exception {
if (sell != null && StringUtils.isNumeric(sell)) {
} else {
......@@ -731,7 +731,7 @@ public class PackageNewClothes {
String url = "https://dx.dianyuanjiangli.com/mobile/#/hhr/handleSuccessful?orderId=" + id;
log.info("小白卡订单查询短信地址:" + url);
log.info("联系号码：" + contactNumber);
SendSmsAndMail.sendSms(contactNumber, url, "2");
SendSmsAndMail.sendSms(contactNumber, url, null, "2");
if (insert == 1) {
appMapper.inserOrderHis(id, "资料提交成功,等待上传证件", date, customerName);
if (StringUtils.isNotEmpty(isFromRh)) {
......
new-user/src/main/java/com/winsun/controller/StartSelectController.java
......@@ -103,7 +103,7 @@ public class StartSelectController {
int veCode = (int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000);
redisTemplate.opsForValue().set(phone, String.valueOf(veCode), 30, TimeUnit.MINUTES);
saveAuthCodeUtil.saveAuthCode(phone,veCode+"");
SendSmsAndMail.sendSms(phone,veCode + "","7");
SendSmsAndMail.sendSms(phone,veCode + "",null,"7");
log.info("验证码:" + veCode);
map.put("code",1);
} catch (Exception e) {
......
old-user/src/main/java/com/winsun/controller/ChooseController.java
......@@ -192,7 +192,7 @@ public class ChooseController {
}
if (order.getOrderStatus().equals("待活体")) {
if (map.get("orderState").toString().equals("13") || map.get("orderState").toString().equals("3")) {
System.out.println(SendSmsAndMail.sendSms(order.getContactNumber(), "", "3"));
System.out.println(SendSmsAndMail.sendSms(order.getContactNumber(), "", "","3"));
Map<String, Object> map2 = new HashMap<>();
map2.put("order_status", "已完成");
......
old-user/src/main/java/com/winsun/controller/PackageUpgradeController.java
......@@ -77,7 +77,7 @@ public class PackageUpgradeController extends BaseController {
* @return
*/
@RequestMapping(value = "sendVerificationCode", method = RequestMethod.POST)
public ResponseData<Map<String, Object>> sendVerificationCode(@RequestParam("selectOrder") String selectOrder, @RequestParam(value = "servId", required = false) String servId) {
public ResponseData<Map<String, Object>> sendVerificationCode(@RequestParam("selectOrder") String selectOrder, @RequestParam(value = "servId", required = false) String servId) throws Exception {
if (StringUtils.isNotBlank(servId)) {
PackageUpgrade packageUpgrade = appMapper.selectById(servId);
String s = String.valueOf((int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000));
......@@ -147,7 +147,7 @@ public class PackageUpgradeController extends BaseController {
String s = String.valueOf((int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000));
log.info("验证码:" + s);
saveAuthCodeUtil.saveAuthCode(selectOrder, s); // 临时保存数据库
SendSmsAndMail.sendSms(selectOrder,s,"7");
SendSmsAndMail.sendSms(selectOrder,s,"","7");
redisTemplate.opsForValue().set(selectOrder, s, 30, TimeUnit.MINUTES);
return ResponseData.success(objMap, "已发送验证码到手机：" + nbr.substring(0, 3) + "****" + nbr.substring(7, 11));
}
......@@ -221,7 +221,7 @@ public class PackageUpgradeController extends BaseController {
String s = String.valueOf((int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000));
log.info("验证码:" + s);
saveAuthCodeUtil.saveAuthCode(acc_nbr, s); // 临时保存数据库
SendSmsAndMail.sendSms(acc_nbr,s,"7");
SendSmsAndMail.sendSms(acc_nbr,s,"","7");
redisTemplate.opsForValue().set(acc_nbr, s, 30, TimeUnit.MINUTES);
return ResponseData.success(map, "已发送验证码到手机：" + acc_nbr.substring(0, 3) + "****" + acc_nbr.substring(7, 11));
......
pom.xml
......@@ -101,8 +101,9 @@
<dependency>
<artifactId>druid-spring-boot-starter</artifactId>
<groupId>com.alibaba</groupId>
<version>${druid.version}</version>
<version>1.2.8</version>
</dependency>
</dependencies>
</dependencyManagement>
......
service-manager/src/main/java/com/winsun/controller/IntelligentPlatformPushController.java
......@@ -133,7 +133,7 @@ public class IntelligentPlatformPushController {
history.setOperator("智能平台推送");
orderHistoryMapper.insert(history);
//要加一个短信
SendSmsAndMail.sendSms(list.get(0).getContactNumber(),"", "14");
SendSmsAndMail.sendSms(list.get(0).getContactNumber(),"", "","14");
} catch (Exception e) {
log.error("智能平台推送信息接口插入异常",e.getMessage(), e);
}
......
service-manager/src/main/java/com/winsun/controller/OrderController.java
......@@ -1446,7 +1446,7 @@ public class OrderController extends BaseController {
* @return
*/
@Permission(menuname = "上传快递清单", value = "importExpressDelivery", method = RequestMethod.POST)
public ResponseData<String> importExpressDelivery(@RequestParam(name = "file") MultipartFile file) {
public ResponseData<String> importExpressDelivery(@RequestParam(name = "file") MultipartFile file) throws Exception {
StringBuffer error = new StringBuffer();
if (!StringUtils.endsWithAny(file.getOriginalFilename(), "xlsx", "xls")) {
return ResponseData.error("手工上传数据仅支持Excel文件，其他格式不支持！");
......@@ -1608,7 +1608,7 @@ public class OrderController extends BaseController {
integer = orderMapper.updateOrderKDIsNotNullByTime(orderNumber, company, kuaidiOrder, sendType, orderStatus, successTime, kuaidiTime, businessIccid);
}
// 发送短信
SendSmsAndMail.sendSms2(order.getContactNumber(), company, kuaidiOrder, "11");
SendSmsAndMail.sendSms(order.getContactNumber(), company, kuaidiOrder, "11");
}
if (integer == 1) {
number++;
......@@ -2713,7 +2713,7 @@ public class OrderController extends BaseController {
@Permission(menuname = "填写快递单号", value = "setKuanDiData", method = RequestMethod.POST)
public ResponseData setKuanDiData(@RequestParam("orderId") String orderId,
@RequestParam("company") String company,
@RequestParam("kuaidiOrder") String kuaidiOrder) {
@RequestParam("kuaidiOrder") String kuaidiOrder) throws Exception {
ShiroUser user = getShiroUser();
if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "系统管理员", "县分管理员（订单）", "受理人员", "楼长", "快递公司"))) {
......@@ -2759,7 +2759,7 @@ public class OrderController extends BaseController {
orderMapper.update(order, wrapper);
// 发送短信
SendSmsAndMail.sendSms2(databaseOrder.getContactNumber(), company, kuaidiOrder, "11");
SendSmsAndMail.sendSms(databaseOrder.getContactNumber(), company, kuaidiOrder, "11");
return ResponseData.success();
}
......
service-manager/src/main/java/com/winsun/controller/PersonalCenterController.java
......@@ -262,7 +262,7 @@ public class PersonalCenterController extends BaseController {
stringRedisTemplate.opsForValue().set(code, verificationCode, CODETIME, TimeUnit.MILLISECONDS);
try {
if (sysUser.getPhone().length() == 11) {
SendSmsAndMail.sendSms(sysUser.getPhone(), verificationCode, "7");
SendSmsAndMail.sendSms(sysUser.getPhone(), verificationCode, "", "7");
return ResponseData.success("发送成功！");
} else {
return ResponseData.error("当前用户手机号码不合法！");
......
service-manager/src/main/java/com/winsun/controller/SalesListMobileController.java
......@@ -113,7 +113,7 @@ public class SalesListMobileController extends BaseController {
if (phone.length() == 11){
saveAuthCodeUtil.saveAuthCode(phone,verificationCode); // 临时保存数据库
SendSmsAndMail.sendSms(phone, verificationCode, "7");
SendSmsAndMail.sendSms(phone, verificationCode, "", "7");
sent.put("message", "发送成功");
sent.put("code", 200);
}else {
......
service-manager/src/main/java/com/winsun/controller/supervisorController.java
......@@ -255,7 +255,7 @@ public class supervisorController extends BaseController {
* @return
*/
@Permission(menuname = "待配送",value = "daiPeiSongUpdate", method = RequestMethod.POST)
public ResponseData<String> daiPeiSongUpdate(@RequestParam("orderId") String orderId, @RequestParam("kuaidiOrder") String kuaidiOrder, @RequestParam(value = "expressDelivery") String expressDelivery) {
public ResponseData<String> daiPeiSongUpdate(@RequestParam("orderId") String orderId, @RequestParam("kuaidiOrder") String kuaidiOrder, @RequestParam(value = "expressDelivery") String expressDelivery) throws Exception {
/* ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
......@@ -294,7 +294,7 @@ public class supervisorController extends BaseController {
//user.getName()
log.info("联系号码：" + order.getContactNumber());
// 发送短信
SendSmsAndMail.sendSms2(order.getContactNumber(), expressDelivery, kuaidiOrder, "11");
SendSmsAndMail.sendSms(order.getContactNumber(), expressDelivery, kuaidiOrder, "11");
orderMapper.inserOrderHis(orderId, "提交成功，" + dataMapping.get("order_status"), new Date(), "测试");
return ResponseData.success("修改快递单号成功！");
}
......
task/src/main/java/com/winsun/TimingTask/OrderTask.java
......@@ -240,7 +240,7 @@ public class OrderTask {
}
// 下发短信
SendSmsAndMail.sendSms2(order.getContactNumber(),
SendSmsAndMail.sendSms(order.getContactNumber(),
order.getNetNumber(),
order.getNetPassword(), "12");
} else if ("作废".equals(orderStatus.get("订单状态名称")) || "下单异常".equals(orderStatus.get("订单状态名称"))) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment