From 6e4cf3d4909f8ba5c7e75d0d4e4ca2db06e6ff54 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Wed, 14 Jun 2023 14:02:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9F=A5=E8=AF=A2=E9=97=A8?=
 =?UTF-8?q?=E5=BA=97=E5=92=8C=E7=A7=AF=E5=88=86=E8=BF=94=E5=88=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cweb/controller/TestController.java   | 11 ++--
 service/pom.xml                               |  5 ++
 .../java/com/hfkj/tts/HWYunSisService.java    | 15 +++--
 .../java/com/hfkj/unipush/UniPushService.java | 65 +++----------------
 4 files changed, 29 insertions(+), 67 deletions(-)

diff --git a/cweb/src/main/java/com/cweb/controller/TestController.java b/cweb/src/main/java/com/cweb/controller/TestController.java
index cc769ab..ac5c6b3 100644
--- a/cweb/src/main/java/com/cweb/controller/TestController.java
+++ b/cweb/src/main/java/com/cweb/controller/TestController.java
@@ -639,7 +639,11 @@ public class TestController {
     public ResponseData ttsCustomDemo() {
         try {
 
-            return ResponseMsgUtil.success(HWYunSisService.ttsCustomDemo());
+            JSONObject object = new JSONObject();
+            object.put("storeName" , "YCY酒吧");
+            object.put("price" , "374.87");
+
+            return ResponseMsgUtil.success(HWYunSisService.ttsCustomDemo(object));
 
         } catch (Exception e) {
             log.error(e.getMessage(), e);
@@ -661,11 +665,8 @@ public class TestController {
             object.put("title" , "测试测试");
             object.put("body" , "惠支付收款88.8元");
 
-            UniPushService.androidTemplate(object);
-
-
 
-            return ResponseMsgUtil.success("audience");
+            return ResponseMsgUtil.success(UniPushService.pushToSingleByCid(object));
 
         } catch (Exception e) {
             log.error(e.getMessage(), e);
diff --git a/service/pom.xml b/service/pom.xml
index 395fc6e..da8a506 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -383,6 +383,11 @@
             <artifactId>restful-sdk</artifactId>
             <version>1.0.0.13</version>
         </dependency>
+        <dependency>
+            <groupId>cn.jpush.api</groupId>
+            <artifactId>jpush-client</artifactId>
+            <version>3.2.17</version>
+        </dependency>
         <!--<dependency>
         	<groupId>com.huaweicloud</groupId>
         	<artifactId>esdk-obs-java</artifactId>
diff --git a/service/src/main/java/com/hfkj/tts/HWYunSisService.java b/service/src/main/java/com/hfkj/tts/HWYunSisService.java
index 14dfbe3..2bb1cc1 100644
--- a/service/src/main/java/com/hfkj/tts/HWYunSisService.java
+++ b/service/src/main/java/com/hfkj/tts/HWYunSisService.java
@@ -1,7 +1,7 @@
 package com.hfkj.tts;
 
 
-import com.hfkj.config.CommonSysConst;
+import com.alibaba.fastjson.JSONObject;
 import com.huawei.sis.bean.AuthInfo;
 import com.huawei.sis.bean.SisConfig;
 import com.huawei.sis.bean.SisConstant;
@@ -25,10 +25,10 @@ public class HWYunSisService {
     // 项目id。登录管理控制台，鼠标移动到右上角的用户名上，在下拉列表中选择我的凭证，在项目列表中查看项目id。多项目时，展开“所属区域”，从“项目ID”列获取子项目ID。
     private static String projectId = "075456f65780107f2f4ec013ff43b487";
     // 待合成的文本
-    private static String text = "惠支付收款 98.6元";
+    private static String text = "";
     // 设置本地音频保存路径.可选择不保存到本地。需具体到文件，如D:/test.wav
-    private static String path = CommonSysConst.getSysConfig().getFile_url() +  "/tts/test.wav";
-//    private static String path = "/Volumes/work/开发/filesystem/test.mp3";
+//    private static String path = CommonSysConst.getSysConfig().getFile_url()";
+    private static String path = "/Volumes/work/开发/filesystem/";
 
 
     /**
@@ -76,7 +76,7 @@ public class HWYunSisService {
     /**
      * 根据文本和api，获取生成的音频数据
      */
-    public static Object ttsCustomDemo() {
+    public static Object ttsCustomDemo(JSONObject object) {
         try {
             // 1. 初始化TtsCustomizationClient
             // 定义authInfo，根据ak，sk，region, projectId.
@@ -86,6 +86,10 @@ public class HWYunSisService {
             // 根据authInfo和config，构造TtsCustomizationClient
             TtsCustomizationClient tts = new TtsCustomizationClient(authInfo, config);
 
+            text = object.getString("storeName") + "收款" + object.getString("price") + "元";
+
+            path = path + object.getString("storeName") + "/" + object.getString("price") + ".mp3";
+
             // 2. 配置请求
             TtsCustomRequest request = new TtsCustomRequest(text);
             // 设置参数，所有参数均可选，如果要保存合成音频文件，需要在request设置
@@ -94,7 +98,6 @@ public class HWYunSisService {
             // 3. 发送请求，获取响应。具体结果可通过response.getXX获取。
             TtsCustomResponse response = tts.getTtsResponse(request);
 
-
             return JsonUtils.obj2Str(response, true);
 
         } catch (SisException e) {
diff --git a/service/src/main/java/com/hfkj/unipush/UniPushService.java b/service/src/main/java/com/hfkj/unipush/UniPushService.java
index 2f2acc1..404da43 100644
--- a/service/src/main/java/com/hfkj/unipush/UniPushService.java
+++ b/service/src/main/java/com/hfkj/unipush/UniPushService.java
@@ -6,13 +6,8 @@ import com.getui.push.v2.sdk.GtApiConfiguration;
 import com.getui.push.v2.sdk.api.PushApi;
 import com.getui.push.v2.sdk.common.ApiResult;
 import com.getui.push.v2.sdk.dto.req.Audience;
-import com.getui.push.v2.sdk.dto.req.message.PushChannel;
 import com.getui.push.v2.sdk.dto.req.message.PushDTO;
 import com.getui.push.v2.sdk.dto.req.message.PushMessage;
-import com.getui.push.v2.sdk.dto.req.message.android.AndroidDTO;
-import com.getui.push.v2.sdk.dto.req.message.android.GTNotification;
-import com.getui.push.v2.sdk.dto.req.message.android.ThirdNotification;
-import com.getui.push.v2.sdk.dto.req.message.android.Ups;
 
 import java.util.Map;
 
@@ -31,9 +26,9 @@ public class UniPushService {
         System.setProperty("http.maxConnections", "200");
         GtApiConfiguration apiConfiguration = new GtApiConfiguration();
         //填写应用配置
-        apiConfiguration.setAppId("JwvQulOIsq8kcFGey8fxo4");
-        apiConfiguration.setAppKey("ERpW23I6gn8jo8NVcjP8H1");
-        apiConfiguration.setMasterSecret("t6HsZ4qwfK7YiBknIeaWy2");
+        apiConfiguration.setAppId("9LTgsDR5Y26MTWpN1uBhb1");
+        apiConfiguration.setAppKey("GV7qmZoFh1AaqD4uDfH857");
+        apiConfiguration.setMasterSecret("JX9m0F92tZ5ciBtrfiJu93");
         // 接口调用前缀，请查看文档: 接口调用规范 -> 接口前缀, 可不填写appId
         apiConfiguration.setDomain("https://restapi.getui.com/v2/");
         // 实例化ApiHelper对象，用于创建接口对象
@@ -51,73 +46,31 @@ public class UniPushService {
      * @Param [uniPushModel]
      * @Return void
      */
-    public static void androidTemplate(JSONObject object) {
+    public static String pushToSingleByCid(JSONObject object) {
 
         PushApi pushApi = createClient();
 
-        /*设置接收人信息*/
         //根据cid进行单推
-        PushDTO<Audience> pushDTO = new PushDTO<Audience>();
+        PushDTO<Audience> pushDTO = new PushDTO<>();
         // 设置推送参数
         pushDTO.setRequestId(System.currentTimeMillis() + "");
-        /**** 设置个推通道参数 *****/
+        // 设置个推通道参数
         PushMessage pushMessage = new PushMessage();
         pushDTO.setPushMessage(pushMessage);
-        GTNotification notification = new GTNotification();
-        pushMessage.setNotification(notification);
-        notification.setTitle(object.getString("title"));
-        notification.setBody(object.getString("body"));
-        notification.setClickType("url");
-        notification.setUrl("https://www.getui.com");
-        /**** 设置个推通道参数，更多参数请查看文档或对象源码 *****/
-
-        /**** 设置厂商相关参数 ****/
-        PushChannel pushChannel = new PushChannel();
-        pushDTO.setPushChannel(pushChannel);
-        /*配置安卓厂商参数*/
-        AndroidDTO androidDTO = new AndroidDTO();
-        pushChannel.setAndroid(androidDTO);
-        Ups ups = new Ups();
-        androidDTO.setUps(ups);
-        ThirdNotification thirdNotification = new ThirdNotification();
-        ups.setNotification(thirdNotification);
-        thirdNotification.setTitle(object.getString("title"));
-        thirdNotification.setBody(object.getString("body"));
-        thirdNotification.setClickType("url");
-        thirdNotification.setUrl("https://www.getui.com");
-        // 两条消息的notify_id相同，新的消息会覆盖老的消息，取值范围：0-2147483647
-        // thirdNotification.setNotifyId("11177");
-        /*配置安卓厂商参数结束，更多参数请查看文档或对象源码*/
-
-        /*设置ios厂商参数*/
-//        IosDTO iosDTO = new IosDTO();
-//        pushChannel.setIos(iosDTO);
-//        // 相同的collapseId会覆盖之前的消息
-//        iosDTO.setApnsCollapseId("xxx");
-//        Aps aps = new Aps();
-//        iosDTO.setAps(aps);
-//        Alert alert = new Alert();
-//        aps.setAlert(alert);
-//        alert.setTitle("ios title");
-//        alert.setBody("ios body");
-        /*设置ios厂商参数结束，更多参数请查看文档或对象源码*/
-
+        pushMessage.setTransmission(object.getString("body"));
         /*设置接收人信息*/
         Audience audience = new Audience();
         pushDTO.setAudience(audience);
         audience.addCid(object.getString("cid"));
-        /*设置接收人信息结束*/
-        /**** 设置厂商相关参数，更多参数请查看文档或对象源码 ****/
 
         // 进行cid单推
         ApiResult<Map<String, Map<String, String>>> apiResult = pushApi.pushToSingleByCid(pushDTO);
-        System.out.println("===========================================" + apiResult);
         if (apiResult.isSuccess()) {
+            return apiResult.getData().toString();
             // success
-            System.out.println(apiResult.getData());
         } else {
+            return "code:" + apiResult.getCode() + ", msg: " + apiResult.getMsg();
             // failed
-            System.out.println("code:" + apiResult.getCode() + ", msg: " + apiResult.getMsg());
         }
     }