Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/resources/application-druid.yml

@@ -112,9 +112,5 @@ spring:
 
 
 #极光推送
-jpush:
-    environment: false
-    masterSecret: vf8g4f84f74v8f4d78g4ff48
-push:
-    appKey: 54456f5d662dfdsg
+
 

ruoyi-admin/src/main/resources/application-prod.yml

@@ -112,8 +112,3 @@ spring:
 
 
 #极光推送
-jpush:
-    environment: false
-    masterSecret: vf8g4f84f74v8f4d78g4ff48
-push:
-    appKey: 54456f5d662dfdsg

ruoyi-common/src/main/java/com/ruoyi/common/utils/jPush/AbstractJPushToolUtil.java

@@ -25,8 +25,8 @@ public abstract class AbstractJPushToolUtil {
 
     private static final Logger log = LoggerFactory.getLogger(AbstractJPushToolUtil.class);
 
-    @Autowired
-    private JPushConfig jPush;
+    /*@Autowired
+    private JPushConfig jPush;*/
 
     protected static AbstractJPushToolUtil abstractJPushToolUtils;
 

ruoyi-common/src/main/java/com/ruoyi/common/utils/jPush/JPushConfig.java

@@ -1,3 +1,4 @@
+/*
 package com.ruoyi.common.utils.jPush;
 
 
@@ -7,22 +8,28 @@ import org.springframework.stereotype.Component;
 @Component
 public class JPushConfig {
 
-    /**
+    */
+/**
      * 极光官网-个人管理中心-点击查看-secret
-     */
+     *//*
+
     @Value("${jpush.masterSecret}")
     private String masterSecret;
 
-    /**
+    */
+/**
      * 指定本推送要推送的apns环境，true表示生产，false表示开发
-     */
+     *//*
+
     @Value("${jpush.environment}")
     private boolean environment;
 
-    /**
+    */
+/**
      * 极光官网-个人管理中心-appkey
-     */
-    @Value("${jpush.appKey}")
+     *//*
+
+    @Value("${push.appKey}")
     private String appKey;
 
     public String getMasterSecret() {
@@ -52,3 +59,4 @@ public class JPushConfig {
 
 
 }
+*/

ruoyi-common/src/main/java/com/ruoyi/common/utils/jPush/JPushToolUtil.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
 public class JPushToolUtil extends AbstractJPushToolUtil {
     /**
      * 发送给指定的极光ID
-     * @param notificationTitle  标题
+     * @param notificationTitle  通知标题
      * @param msgTitle 内容标题
      * @param msgContent 内容
      * @param jPushVO 扩展的json