Merge branch 'master' of http://192.168.0.115:3000/4dkankan-v4/4dkankan-parent

4dkankan-center-modeling/pom.xml

@@ -61,11 +61,6 @@
 			<version>1479188381469-20211020</version>
 		</dependency>
 		<dependency>
-			<groupId>com.google.firebase</groupId>
-			<artifactId>firebase-admin</artifactId>
-			<version>6.8.1</version>
-		</dependency>
-		<dependency>
 			<groupId>com.alibaba.cloud</groupId>
 			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
 		</dependency>

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/receiver/BuildSceneMQListener.java

@@ -12,10 +12,10 @@ import com.fdkankan.fyun.oss.UploadToOssUtil;
 import com.fdkankan.modeling.constants.SysConstants;
 import com.fdkankan.push.PushMessageConfig;
 import com.fdkankan.modeling.utils.DingDingUtils;
-import com.fdkankan.modeling.utils.PushMsgUtil;
 import com.fdkankan.mq.message.BuildSceneMqMessage;
 import com.fdkankan.mq.message.BuildSceneResultMqMessage;
 import com.fdkankan.mq.util.RocketMQProducer;
+import com.fdkankan.push.PushMsgUtil;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
 import com.taobao.api.ApiException;
@@ -523,7 +523,7 @@ public class BuildSceneMQListener implements RocketMQListener<String> {
                             }
 
                         }else {
-                            PushMsgUtil.googlePushMsg(dataJson.getString("pushToken"),
+                            PushMsgUtil.googlePushMsg(ConstantFilePath.BASE_PATH + "/refreshToken.json",dataJson.getString("pushToken"),
                                     sceneName + "计算完成", "您上传的" + sceneName + "计算完成，点击查看",
                                     webSite);
                         }

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/utils/PushMsgUtil.java

@@ -1,46 +0,0 @@
-package com.fdkankan.modeling.utils;
-
-import com.fdkankan.common.constant.ConstantFilePath;
-import com.google.auth.oauth2.GoogleCredentials;
-import com.google.firebase.FirebaseApp;
-import com.google.firebase.FirebaseOptions;
-import com.google.firebase.messaging.FirebaseMessaging;
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.FileInputStream;
-
-/**
- * Created by Hb_zzZ on 2020/7/27.
- */
-@Slf4j
-public class PushMsgUtil {
-
-    /**
-     * 海外谷歌推送
-     */
-    public static void googlePushMsg(String token, String title, String text, String url){
-        try{
-            FileInputStream refreshToken = new FileInputStream(ConstantFilePath.BASE_PATH + "/refreshToken.json");
-
-            FirebaseOptions options = new FirebaseOptions.Builder()
-                    .setCredentials(GoogleCredentials.fromStream(refreshToken))
-                    .setDatabaseUrl("https://dkankan-pro.firebaseio.com")
-                    .build();
-
-            FirebaseApp.initializeApp(options);
-
-            com.google.firebase.messaging.Message message = com.google.firebase.messaging.Message.builder()
-                    .putData("titile", title)
-                    .putData("text", text)
-                    .putData("url", url)
-                    .setNotification(new com.google.firebase.messaging.Notification(title, text))
-                    .setToken(token)
-                    .build();
-            String response = FirebaseMessaging.getInstance().send(message);
-            log.info("Successfully sent message: " + response);
-        }catch (Exception e ){
-            e.printStackTrace();
-        }
-
-    }
-}