qingqing模块开发以及通配掌门代码

db/db.sql

@@ -28,4 +28,23 @@ CREATE TABLE zhangmen_message (
   push_time       datetime      DEFAULT NULL COMMENT '上游推送时间',
   submit_status   tinyint(1)    DEFAULT 0    COMMENT '提交表单状态',
   PRIMARY KEY (id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+USE push;
+CREATE TABLE qingqing_message (
+  id              bigint(20)    NOT NULL AUTO_INCREMENT,
+  gmt_create      datetime      DEFAULT NULL,
+  gmt_modified    datetime      DEFAULT NULL,
+  rec_id          bigint(20)    DEFAULT NULL COMMENT '记录id',
+  stu_name        varchar(255)  DEFAULT NULL COMMENT '报课学生名',
+  pnum            varchar(255)  DEFAULT NULL COMMENT 'pnum',
+  stu_grade       tinyint(1)    DEFAULT NULL COMMENT '报课年级',
+  stu_sub         tinyint(1)    DEFAULT NULL COMMENT '报课学科',
+  device          tinyint(1)    DEFAULT NULL COMMENT '听课设备(0.没有以上设备 1.平板电脑 2.笔记本电脑 3.台式设备+耳麦)',
+  appointment     tinyint(1)    DEFAULT NULL COMMENT '预约听课(0.近期没有学习安排 1.三天内 2.一周内 3.一周以后)',
+  app_id          varchar(255)  DEFAULT NULL COMMENT '上游推送用户id',
+  push_time       datetime      DEFAULT NULL COMMENT '上游推送时间',
+  submit_status   tinyint(1)    DEFAULT 0    COMMENT '提交表单状态',
+  response_status tinyint(1)    DEFAULT 0    COMMENT '响应状态',
+  PRIMARY KEY (id)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

src/main/java/com/yuyou/openapi/openapi/api/ABClient.java

@@ -78,7 +78,8 @@ public class ABClient {
             return CommonResponse.createByErrorMessage(ResponseCode.EMPTY_ARGUMENT.getDesc());
         }
         // 获取的是解密且解码后的Json字符串
-        String jsonResult = SecurityOperationUtil.decZMSecurityInfo(callLog);
+        String jsonResult = SecurityOperationUtil.decCallLogSecurityInfo(callLog);
+        System.out.println("Json :  "  + jsonResult);
         // Json转成对应的实体类
         if (StringUtils.isEmpty(jsonResult)){
             return CommonResponse.createByErrorMessage(ResponseCode.DECRYPT_ERROR.getDesc());
@@ -107,7 +108,7 @@ public class ABClient {
             return CommonResponse.createByErrorMessage(ResponseCode.EMPTY_ARGUMENT.getDesc());
         }
         // 获取的是解密且解码后的Json字符串
-        String jsonResult = SecurityOperationUtil.decZMSecurityInfo(callLog);
+        String jsonResult = SecurityOperationUtil.decCallLogSecurityInfo(callLog);
         // Json转成对应的实体类
         if (StringUtils.isEmpty(jsonResult)){
             return CommonResponse.createByErrorMessage(ResponseCode.DECRYPT_ERROR.getDesc());

src/main/java/com/yuyou/openapi/openapi/model/dto/ABZMMessageDTO.java

@@ -59,6 +59,16 @@ public class  ABZMMessageDTO {
          * 课程科目
          */
         private String tag_key_course;
+
+        /**
+         * 试听设备
+         */
+        private String tag_key_device;
+
+        /**
+         * 预约时间段
+         */
+        private String tag_key_appointment;
     }
 
     @Data
@@ -85,6 +95,16 @@ public class  ABZMMessageDTO {
          * 学生报课科目
          */
         private String course;
+
+        /**
+         * 试听设备
+         */
+        private Integer device;
+
+        /**
+         * 预约时间段
+         */
+        private Integer appointment;
     }
 
 }

src/main/java/com/yuyou/openapi/openapi/utils/SecurityOperationUtil.java

@@ -27,7 +27,7 @@ public class SecurityOperationUtil {
      * @param base64Str 加密串
      * @return 解密且解码后的json格式的字符串
      */
-    public static String decZMSecurityInfo(String base64Str){
+    public static String decCallLogSecurityInfo(String base64Str){
         // Base64解密
         byte[] decode = Base64.decode(base64Str);
         // 私钥

src/main/resources/logback.xml

@@ -37,7 +37,7 @@
 
     <root level="INFO">
         <!-- TODO prod 环境去掉std -->
-        <!--<appender-ref ref="stdAppender"/>-->
+        <appender-ref ref="stdAppender"/>
-        <appender-ref ref="fileAppender"/>
+        <!--<appender-ref ref="fileAppender"/>-->
     </root>
 </configuration>

src/test/java/com/yuyou/openapi/openapi/RSATest.java

@@ -15,13 +15,14 @@ public class RSATest {
     @Test
     public void testRSA(){
         // 待加密字符串
+        // 掌门
         String str = "{\"tag\":{\"tag_key_id\":111111,\"tag_key_name\":\"学生姓名\",\"tag_key_ mobile\":\"联系方式\",\"tag_key_ grade\":\"课程年级\",\"tag_key_ course\":\"课程科目\"},\"data\":{\"name\":\"张小兵\",\"mobile\":\"13011112222\",\"grade\":\"三年级\",\"course\":\"数学\"}}";
+        // 轻轻
+        str = "{\"tag\":{\"tag_key_id\":111111,\"tag_key_name\":\"学生姓名\",\"tag_key_ mobile\":\"联系方式\",\"tag_key_ grade\":\"课程年级\",\"tag_key_ course\":\"课程科目\",\"tag_key_device\":\"试听设备\",\"tag_key_appointment\":\"预约时间段\"},\"data\":{\"name\":\"张小兵\",\"mobile\":\"13011112222\",\"grade\":\"三年级\",\"course\":\"数学\",\"device\":1,\"appointment\":2}}";
 
-        //先用Base64编码
+        // 为null 的ZM通配加密串
-//        String encode = Base64.encode(str);
+        // sgZmAQHqXdOi4W+PBGktK7dc9qTxOq21xNdrYDrFwdXaJ2aRbgCf7/8ug+x+hr+3nkerYoHReCErN9XrWk2QxymzZmOwskHWUcK9nll5CJr/k4VX3LLyAD5wd/HmivBg/pffoqYpa3PvrymNK3WZIrTDhq3H9hCKsS230PpCjNGxt6EZplN/niH0JTE2H9u3vUs+d7jlxy+zZxgmb8G/Eokkl7Tj9BOBZTu6jcThZmBb1ZhzygSkr++SKTVh7zoN/Ef2OOhJ5sCh+nzCHCXN7DnRPj0ClZY/ld0o9BaMYU8xFLxWIM4g+4za6dK2U2oWvyAqDJRnDVlbRcYMKvj0la9KBrrMUNAOAeS9GhsLycLqKMdnalQIJvBo0cwjtpRbS5qk3K88zxJxIjj5lKXbQXA1SuKZBRQ83LCBe+4h2rWlZs7GG03UvPFuQ8dD7CT3+rHk2lPKnJsT4xePSl+FoqaFGHBgUENa6Y7eF79086+Y9mh+Z12i6gR+YAXK9MrhCZn23+MEsE+4N/U68W79juurfZWF57g660Qr+iJJv944RZY/KG7E7AXn5GCAx18mNbFX0at9oNgPYsfcTzHmsYn5tZEWp8nSwvXJCCnCfQ+SmNgA7lh9/RK+Pv720DhN1Z7dBMoOzzeMnQGOA3K0q8RjQFGea0vUOE5UZgIS8Zs=
-//        System.out.println("Base64加密后的内容为:" + encode);
+        // avzdUAeK1YKyagTpt+pXjgFV5NPeC14k/0Uql4Z3zLwNBBHSumYWwc0V2AYIjaMft5q+wEEOtKJXPbwyeQNpRDWB2NHKiR1pothiJ16ixfIrAtZkxvNsfw5osfri6SZ0GHcDWIlWDtypyoYEIT5AkKWcjqkApuTC7zSgO1rPAvZj1Syvd7Wc43AnZIb0InGLWBu3ZBEdLSAdowdrhDGs+Hk/QPoVcHRCzOXnrHDkpgfxo813FfK53+SjuoVNRai/H6Gjs5xZ0XBr4nvSOqOj1frAO7ctj8fNjTaSF0ECiaWq3/93J1ew69bWroc02EQc3Luial5vj2dmzmiq8qR5FJAK4yx7519lNyj83In2XKpMPit/C5JKWogarbpUNu8Vt0oDCDqH2aV8uGblyQzj7GNa8D7gGa7/8G4o7i8Nf10rHvSuloxv+oQ+WAIxr4MKlhk6thjlPk/NwPNFfZ5YDd9o7OMai7HYUx/Jb+YEPjykS7l9YKFRP6vpr25hMsI8pav3dFR+AkEo6n+mtdw/M6xlmpB9o3/WYMs8N/XE9e+uOpcCRPspSpVhjT1KAHJlCfJ7ST2aivTc6lMERB+62xbMkDgljOvrgQ2zL2RaiuCpVkhd1ukEyGgRnbTU8zarSxsu1sAk7MD0NnoEAP35Cfl0vC5M519mytj3kkIe4DI=
-
-
         // 公钥
         String PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3tTd2ZJj/ivCF7HdfwPc" +
                 "n9tvo0MH3mFzX54ZmQytdTWUnZlna2v2g7fvY/9ZcKrezijZp7AQTrSA8qHNw2CV" +