刘一凡 3 years ago
parent
commit
ba4b3a7bdb

+ 5 - 0
src/main/java/com/chuanghai/h3c_reporting/bo/DeleteReporting.java

@@ -14,6 +14,11 @@ import lombok.Data;
 public class DeleteReporting {
 public class DeleteReporting {
 
 
     /**
     /**
+     * 调用者id(管理员 上传信息的人)
+     */
+    private Long id;
+
+    /**
     * 调用者姓名(管理员 上传信息的人)
     * 调用者姓名(管理员 上传信息的人)
     */
     */
     private String name;
     private String name;

+ 2 - 2
src/main/java/com/chuanghai/h3c_reporting/controller/InformationReportingController.java

@@ -92,10 +92,10 @@ public class InformationReportingController {
         });
         });
         boolean flag = informationReportingService.updateBatchById(reportingList);
         boolean flag = informationReportingService.updateBatchById(reportingList);
         if (flag) {
         if (flag) {
-            log.info("删除信息=========>>> 管理员【{}】成功删除了编号为【{}】的项目信息", reporting.getName(), reporting.getIds());
+            log.info("删除信息=========>>> 管理员【{}】【id:{}】成功删除了编号为【{}】的项目信息", reporting.getName(), reporting.getId(), reporting.getIds());
             return CommonResult.ok();
             return CommonResult.ok();
         } else {
         } else {
-            log.info("删除信息失败=========>>> 管理员【{}】删除编号为【{}】的项目信息失败", reporting.getName(), reporting.getIds());
+            log.info("删除信息失败=========>>> 管理员【{}】【id:{}】删除编号为【{}】的项目信息失败", reporting.getName(), reporting.getId(), reporting.getIds());
             return CommonResult.fail();
             return CommonResult.fail();
         }
         }
     }
     }

+ 2 - 1
src/main/java/com/chuanghai/h3c_reporting/controller/WxController.java

@@ -67,7 +67,8 @@ public class WxController {
                 try {
                 try {
                     Map<String, Object> jsonMap = objectMapper.readValue(obj.toString(), new TypeReference<Map<String, Object>>() {
                     Map<String, Object> jsonMap = objectMapper.readValue(obj.toString(), new TypeReference<Map<String, Object>>() {
                     });
                     });
-                    phoneNumber = jsonMap.get("phoneNumber").toString();
+                    // 内一层(获取有问题)
+                    phoneNumber = jsonMap.get("phone_info").toString();
                 } catch (Exception e) {
                 } catch (Exception e) {
                     e.printStackTrace();
                     e.printStackTrace();
                 }
                 }

+ 7 - 3
src/main/resources/application.yml

@@ -11,8 +11,12 @@ spring:
   datasource:
   datasource:
     url: jdbc:mysql://localhost:3306/h3c_reporting?characterEncoding=utf-8&useSSL=FALSE&useAffectedRows=TRUE&allowMultiQueries=true&serverTimezone=GMT%2B8
     url: jdbc:mysql://localhost:3306/h3c_reporting?characterEncoding=utf-8&useSSL=FALSE&useAffectedRows=TRUE&allowMultiQueries=true&serverTimezone=GMT%2B8
     driver-class-name: com.mysql.cj.jdbc.Driver
     driver-class-name: com.mysql.cj.jdbc.Driver
+    # 本机
+#    username: root
+#    password: 20010420
+    # 测试服务器
     username: root
     username: root
-    password: root
+    password: CH_SC_SQL_49
 
 
 mybatis-plus:
 mybatis-plus:
   mapper-locations: classpath:/mapper/ihotel/*.xml
   mapper-locations: classpath:/mapper/ihotel/*.xml
@@ -33,5 +37,5 @@ my-security:
 
 
 #微信小程序相关配置
 #微信小程序相关配置
 wx:
 wx:
-  app_id:
-  secret:
+  app_id: wx0baa0e7e965c61e8
+  secret: 07b92846b1e716975cb5e2d4ec231060

File diff suppressed because it is too large
+ 68 - 67
src/main/resources/static/doc/index.html