skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/launch/LauncherServiceImpl.java
@@ -39,9 +39,9 @@ PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.server-addr", LauncherConstant.nacosAddr(profile)); PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile)); //自定义注册 PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", "zhongrijian"); PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", "zhongrijian"); // //自定义注册 // PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", "zhongrijian"); // PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", "zhongrijian"); PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile)); PropsUtil.setProperty(props, "spring.zipkin.base-url", LauncherConstant.zipkinAddr(profile)); skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/constant/CallConstant.java
@@ -25,11 +25,6 @@ /** * 创建会话url */ public static final String createTaskUrl = "/api/task/createTask"; /** * 创建会话url */ public static final String createTaskUrl1 = "/api/task/createTask.json"; /** skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/controller/CallController.java
@@ -32,20 +32,6 @@ * 创建任务 * @return */ @GetMapping("/createCall1") public R createCall1(){ String url1 = CallConstant.HOST + CallConstant.createTaskUrl; // 请求2 Map<String, Object> map = new HashMap<>(); map.put("p1",createCall(url1)); // 返回 return R.data(map); } /** * 创建任务 * @return */ @GetMapping("/createCall2") public R createCall2(){ String url2 = CallConstant.HOST + CallConstant.createTaskUrl1; skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/constant/SmsConstant.java
@@ -28,7 +28,12 @@ public static final String AppSecret = "ec4ad8f3a5627e93c49803c90a18eb53"; /** * 发送短信url * 发送固定短信url */ public static final String sendUrl = "/api/sms/send"; /** * 动态短信发送接口url */ public static final String sendVarUrl = "/api/sms-var/send"; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java
@@ -1,13 +1,12 @@ package cn.gistack.sm.sms.controller; import cn.com.flaginfo.sdk.cmc.api.sms.dynsend.DynSMSSendRequest; import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendRequest; import cn.gistack.sm.sms.util.SmsUtils; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*; /** * 短信发送控制层 @@ -24,4 +23,9 @@ public R test(SMSSendRequest request){ return R.data(SmsUtils.sendMsg(request)); } @PostMapping("/test1") public R test1(@RequestBody DynSMSSendRequest request){ return R.data(SmsUtils.dynSendMethod(request)); } } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/util/SmsUtils.java
@@ -59,29 +59,6 @@ // System.out.println("s = " + s); // } // /** // * 固定内容发送 // */ // public void testSendMethod() { // // x-sp-code // String xspcode = "214596"; // // x-app-key // String xappkey = "hbsl_zhsk"; // // 计算 x-request-id // String xrequestid = getRandNumber(); // // x-sign // String xsign = ""; // // // //请求参数 // SMSSendRequest sendRequest = new SMSSendRequest(); // sendRequest.setMessageContent("你有一项编号为12349的事务需要处理;"); // sendRequest.setTemplateId("2431012234034"); // sendRequest.setUserNumber("15170720695"); // sendRequest.setSerialNumber("20210801120000123456"); // // } /** * 获取随机字符串 * @return @@ -102,18 +79,18 @@ /** * 动态短信内容批量发送 */ // public static void testDynSendMethod() { // //请求接口 // DynSMSAPI api = (DynSMSAPI) provider.getApi(ApiEnum.SENDDYNSMS); // api.setRequestUrl(SmsConstant.HOST + "/api/sms-var/send"); // //请求参数 // DynSMSSendRequest sendRequest = new DynSMSSendRequest(); // sendRequest.setTemplateId("1011012028688"); public static String dynSendMethod(DynSMSSendRequest sendRequest) { ApiConfig apiConfig = new ApiConfig(SpCode, AppKey, AppSecret); ApiProvider provider = ApiProvider.getInstance(apiConfig); //请求接口 DynSMSAPI api = (DynSMSAPI) provider.getApi(ApiEnum.SENDDYNSMS); api.setRequestUrl(SmsConstant.HOST + SmsConstant.sendVarUrl); //请求参数 // sendRequest.setDynData(new String[][]{{"手机号码", "编号"}, {"13000000000", "456"}}); // sendRequest.setSerialNumber("20210804120000123457"); // ComResult<DynSMSSendDataResult> result = api.request(sendRequest); // System.out.println(JSON.toJSONString(result)); // } sendRequest.setSerialNumber(new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date())); ComResult<DynSMSSendDataResult> result = api.request(sendRequest); return JSON.toJSONString(result); } /** * 状态报告
