短信接口更换

src/main/java/com/caimei/modules/newhome/service/CmInstrumentMaintenanceService.java

@@ -92,8 +92,8 @@ public class CmInstrumentMaintenanceService extends CrudService<CmInstrumentMain
     @Transactional(readOnly = false)
     public void update(CmInstrumentMaintenance cmInstrumentMaintenance) {
         CmInstrumentMaintenance dbbean = super.get(cmInstrumentMaintenance.getId());
-        String wwwServer = Global.getConfig("caimei.crm.server");
-        String msgLink = wwwServer + "maintain/page/$.shtml";
+        String wwwServer = Global.getConfig("wwwServer");
+        String msgLink = wwwServer + "/supplier/repair/detail.html?code=$";
         //用户分享链接
         CmInstrumentMaintenanceLinks link = cmInstrumentMaintenanceLinksDao.getShareLinkCode(cmInstrumentMaintenance.getId(), "1");
         String customerLink = "";

src/main/java/com/caimei/modules/opensearch/CoreServiceUitls.java

@@ -53,7 +53,7 @@ public class CoreServiceUitls {
         // 打印参数
         logger.info("更新索引uri：" + uri);
         // 发起Post请求
-        MultiValueMap<String, Integer> paramMap = new LinkedMultiValueMap<>();
+        MultiValueMap<String, String> paramMap = new LinkedMultiValueMap<>();
         String result = restTemplate.postForObject(uri, paramMap, String.class);
         logger.info("更新索引result：" + result);
     }

src/main/java/com/caimei/modules/sys/utils/SMSUtils.java

@@ -1,6 +1,10 @@
 package com.caimei.modules.sys.utils;
 
-import com.ruanwei.interfacej.SmsClientSend;
+import com.alibaba.fastjson.JSONObject;
+import com.thinkgem.jeesite.common.config.Global;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
 
 public class SMSUtils {
 	private static String url = "http://47.96.109.82:9999/sms.aspx";
@@ -9,13 +13,30 @@ public class SMSUtils {
 	private static String password = "CaimeiSMS999";
 	
 	public static boolean sendSms(String mobile, String content){
-		String res = SmsClientSend.sendSms(url, userid, account, password, mobile, content);
-		return res.indexOf("Success") != -1;
-//		System.out.println("手机号："+mobile +" -  内容："+content);
-//		return true;
+
+//		String res = SmsClientSend.sendSms(url, userid, account, password, mobile, content);
+//		return res.indexOf("Success") != -1;
+
+		// 获取core服务器地址
+		String coreServer = Global.getConfig("caimei.core");
+		RestTemplate restTemplate = new RestTemplate();
+		String uri = coreServer + "/tools/sms/send";
+		// 发起Post请求
+		MultiValueMap<String, String> paramMap = new LinkedMultiValueMap<>();
+		paramMap.add("mobile", mobile);
+		paramMap.add("content", content);
+		String result = restTemplate.postForObject(uri, paramMap, String.class);
+		System.out.println(result);
+		JSONObject json = (JSONObject) JSONObject.parse(result);
+		if (null != json && json.getInteger("code") == 0) {
+			return true;
+		} else {
+			return false;
+		}
 	}
-	
+
 	public static void main(String[] args) {
-		System.out.println(sendSms("13631650502", "您登录亲朋棋牌的手机短 信验证码是：7895，祝您游戏愉快！请确认账号是由本人操作"));
+		//System.out.println(sendSms("13631650502", "您登录亲朋棋牌的手机短 信验证码是：7895，祝您游戏愉快！请确认账号是由本人操作"));
+		System.out.println(sendSms("15814011616", "您短信验证码是：7895"));
 	}
 }

src/main/java/com/caimei/modules/weisha/service/CmOrganizeBuyerService.java

@@ -72,7 +72,7 @@ public class CmOrganizeBuyerService extends CrudService<CmOrganizeBuyerDao, CmOr
             //发送短信
             String mobile = cmOrganizeBuyer.getMobile();
             if (StringUtils.isNotEmpty(mobile)) {
-                SMSUtils.sendSms(mobile, "您的邀请码为：" + flag + "，在微信搜索“维沙采购商城”小程序，使用邀请码进行登录后，即可开始采购");
+                SMSUtils.sendSms(mobile, "您的邀请码为：" + flag + "，在微信搜索“维沙采购商城”小程序，使用邀请码进行登录后，即可开始采购。");
             }
         }
         cmOrganizeBuyer.setUpdateTime(date);
@@ -117,7 +117,7 @@ public class CmOrganizeBuyerService extends CrudService<CmOrganizeBuyerDao, CmOr
             //发送短信
             String mobile = cmOrganizeBuyer.getMobile();
             if (StringUtils.isNotEmpty(mobile)) {
-                SMSUtils.sendSms(mobile, "您的邀请码为：" + flag + "，在微信搜索“维沙采购商城”小程序，使用邀请码进行登录后，即可开始采购");
+                SMSUtils.sendSms(mobile, "您的邀请码为：" + flag + "，在微信搜索“维沙采购商城”小程序，使用邀请码进行登录后，即可开始采购。");
             }
             cmOrganizeBuyer.setUpdateTime(date);
             organizeBuyerDao.update(cmOrganizeBuyer);