junekeunsong 4 éve
szülő
commit
b162978931

+ 5 - 5
pom.xml

@@ -95,11 +95,11 @@
             <version>7.0.1</version>
         </dependency>
         <!-- APNS -->
-        <dependency>
-            <groupId>com.notnoop.apns</groupId>
-            <artifactId>apns</artifactId>
-            <version>0.2.3</version>
-        </dependency>
+<!--         <dependency> -->
+<!--             <groupId>com.notnoop.apns</groupId> -->
+<!--             <artifactId>apns</artifactId> -->
+<!--             <version>0.2.3</version> -->
+<!--         </dependency> -->
     </dependencies>
 
     <build>

+ 34 - 37
src/main/java/com/lemon/lifecenter/scheduler/common/PushUtils.java

@@ -15,7 +15,6 @@ import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Component;
 
 import com.google.auth.oauth2.GoogleCredentials;
-import com.google.firebase.ErrorCode;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
 import com.google.firebase.messaging.AndroidConfig;
@@ -27,8 +26,6 @@ import com.google.firebase.messaging.AndroidNotification.Priority;
 import com.google.firebase.messaging.FirebaseMessaging;
 import com.google.firebase.messaging.FirebaseMessagingException;
 import com.google.firebase.messaging.Message;
-import com.notnoop.apns.APNS;
-import com.notnoop.apns.ApnsService;
 
 @Component
 public class PushUtils {
@@ -174,39 +171,39 @@ public class PushUtils {
         return result;
     }
     
-    public void apnsSend() {
-        ClassPathResource cpr = new ClassPathResource("apns/dev/certify.p12");
-        logger.error("name -- > " + cpr.getFilename());
-        logger.error("path -- > " + cpr.getPath());
-        try {
-            logger.error("file -- > " + cpr.getFile().getAbsolutePath());
-            
-            ApnsService service =
-                    APNS.newService()
-                            .withCert(cpr.getFile().getAbsolutePath(), "jksong092") // 指定p12文件及密钥
-                            .withSandboxDestination() // 使用苹果推送测试服务器
-                            //.withProductionDestination() // 使用苹果推送生产服务器
-                            .build();
-
-            String payload = APNS.newPayload()
-//                    .alertTitle("推送标题") // 标题
-                    .alertBody("푸시발송 테스트") // 内容
-                    .customField("sourceCode", "01") // 自定义字段 
-                    .customField("url", "https://www.qq.com") // 自定义字段
-                    .sound("default") // 提示声音
-                    //.sound("msgsound.caf") // 提示声音(自定义)
-                    .badge(1) // 应用角标
-                    .build();
-
-            String token = "1EDAE24F474C7CB5497AD92BB92C506033218BF37E7C808C8CD3B28154D41B07";
-            
-            service.push(token, payload);
-            
-        } catch (IOException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-
-    }
+//    public void apnsSend() {
+//        ClassPathResource cpr = new ClassPathResource("apns/dev/certify.p12");
+//        logger.error("name -- > " + cpr.getFilename());
+//        logger.error("path -- > " + cpr.getPath());
+//        try {
+//            logger.error("file -- > " + cpr.getFile().getAbsolutePath());
+//            
+//            ApnsService service =
+//                    APNS.newService()
+//                            .withCert(cpr.getFile().getAbsolutePath(), "jksong092") // 指定p12文件及密钥
+//                            .withSandboxDestination() // 使用苹果推送测试服务器
+//                            //.withProductionDestination() // 使用苹果推送生产服务器
+//                            .build();
+//
+//            String payload = APNS.newPayload()
+////                    .alertTitle("推送标题") // 标题
+//                    .alertBody("푸시발송 테스트") // 内容
+//                    .customField("sourceCode", "01") // 自定义字段 
+//                    .customField("url", "https://www.qq.com") // 自定义字段
+//                    .sound("default") // 提示声音
+//                    //.sound("msgsound.caf") // 提示声音(自定义)
+//                    .badge(1) // 应用角标
+//                    .build();
+//
+//            String token = "1EDAE24F474C7CB5497AD92BB92C506033218BF37E7C808C8CD3B28154D41B07";
+//            
+//            service.push(token, payload);
+//            
+//        } catch (IOException e) {
+//            // TODO Auto-generated catch block
+//            e.printStackTrace();
+//        }
+//
+//    }
 
 }

+ 1 - 0
src/main/java/com/lemon/lifecenter/scheduler/controller/PushController.java

@@ -57,6 +57,7 @@ public class PushController {
                 String pushContent = list.get(i).getPushContent();
                 String sendDate    = list.get(i).getSendDate();
                 String sendTime    = list.get(i).getSendTime();
+//                String createDate  = list.get(i).getCreateDate();
                 String startDate   = sendDate + " " + sendTime;
                 
                 if (sendType.equals("D")) {

+ 7 - 1
src/main/java/com/lemon/lifecenter/scheduler/dto/ScheduleDTO.java

@@ -14,8 +14,8 @@ public class ScheduleDTO {
     private String sendDate    = "";
     private String sendTime    = "";
     private String startDate   = "";
+    private String createDate  = "";
 
-    
     public int getIdx() {
         return idx;
     }
@@ -94,5 +94,11 @@ public class ScheduleDTO {
     public void setStartDate(String startDate) {
         this.startDate = startDate;
     }
+    public String getCreateDate() {
+        return createDate;
+    }
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
     
 }

+ 3 - 1
src/main/resources/application.properties

@@ -12,4 +12,6 @@ mybatis.mapper-locations=mybatis/mapper/**/*.xml
 #logging.level.com.lemon.lifecenter.mapper=DEBUG
 
 logging.level.root=info
-spring.profiles.active=local
+spring.profiles.active=local 
+
+server.tomcat.additional-tld-skip-patterns=*.jar

+ 3 - 2
src/main/resources/mybatis/mapper/push/push.xml

@@ -53,7 +53,8 @@
                    PUSH_TITLE   AS pushTitle,
                    PUSH_CONTENT AS pushContent,
                    SEND_DATE    AS sendDate,
-                   SEND_TIME    AS sendTime
+                   SEND_TIME    AS sendTime,
+                   CREATE_DATE  AS createDate
               FROM PUSH_SCHEDULE
              WHERE 1 = 1
                AND SEND_STATE = 'W'
@@ -123,7 +124,7 @@
                          sender_ip,   sender,      push_title,   push_content,  create_date,
                          start_date)
                  VALUES (#{pushIdx},  #{sendType}, #{sendState}, #{targetType}, #{centerCode},
-                         #{senderIp}, #{sender},   #{pushTitle}, #{pushContent}, NOW(),
+                         #{senderIp}, #{sender},   #{pushTitle}, #{pushContent}, #{createDate},
                          #{startDate})
         ]]>
     </insert>