README.md

@@ -1,5 +1,4 @@
 /*
-数据库相关信息
 Navicat MySQL Data Transfer
 
 Source Server         : 192.168.2.64
@@ -12,7 +11,7 @@ Target Server Type    : MySQL
 Target Server Version : 50727
 File Encoding         : 65001
 
-Date: 23/03/2023 17:06:26
+Date: 27/03/2023 17:09:22
 */
 
 SET NAMES utf8mb4;
@@ -31,6 +30,16 @@ PRIMARY KEY (`uuid`) USING BTREE,
 INDEX `apply_name`(`apply_name`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '应用表' ROW_FORMAT = Dynamic;
 
+-- ----------------------------
+-- Table structure for apply_token
+-- ----------------------------
+DROP TABLE IF EXISTS `apply_token`;
+CREATE TABLE `apply_token`  (
+`id` int(11) NOT NULL,
+`token` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '应用令牌',
+PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '应用token' ROW_FORMAT = Dynamic;
+
 -- ----------------------------
 -- Table structure for event
 -- ----------------------------
@@ -45,9 +54,23 @@ CREATE TABLE `event`  (
 `created_time` datetime NOT NULL COMMENT '创建时间',
 PRIMARY KEY (`id`, `apply_id`) USING BTREE,
 INDEX `apply_id`(`apply_id`) USING BTREE,
-INDEX `id`(`id`) USING BTREE
+INDEX `id`(`id`) USING BTREE,
+CONSTRAINT `event_ibfk_1` FOREIGN KEY (`apply_id`) REFERENCES `apply` (`uuid`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '事件信息表' ROW_FORMAT = Dynamic;
 
+-- ----------------------------
+-- Table structure for event_appendix
+-- ----------------------------
+DROP TABLE IF EXISTS `event_appendix`;
+CREATE TABLE `event_appendix`  (
+`id` int(11) NOT NULL AUTO_INCREMENT COMMENT '表ID',
+`event_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '事件ID',
+`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件名称',
+PRIMARY KEY (`id`) USING BTREE,
+INDEX `event_id`(`event_id`) USING BTREE,
+CONSTRAINT `event_appendix_ibfk_1` FOREIGN KEY (`event_id`) REFERENCES `event` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE = InnoDB AUTO_INCREMENT = 26 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '事件附件表' ROW_FORMAT = Dynamic;
+
 -- ----------------------------
 -- Table structure for event_log
 -- ----------------------------
@@ -78,18 +101,10 @@ INDEX `event_time`(`event_time`) USING BTREE,
 INDEX `device_id`(`device_id`) USING BTREE,
 INDEX `ip_address`(`ip_address`) USING BTREE,
 INDEX `event_log_ibfk_1`(`event_id`) USING BTREE,
-CONSTRAINT `event_log_ibfk_1` FOREIGN KEY (`event_id`) REFERENCES `event` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE = InnoDB AUTO_INCREMENT = 1254 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '日志信息表' ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for token
--- ----------------------------
-DROP TABLE IF EXISTS `token`;
-CREATE TABLE `token`  (
-`id` int(11) NOT NULL,
-`token` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '应用令牌',
-PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '应用token' ROW_FORMAT = Dynamic;
+INDEX `apply_id`(`apply_id`) USING BTREE,
+CONSTRAINT `event_log_ibfk_1` FOREIGN KEY (`event_id`) REFERENCES `event` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+CONSTRAINT `event_log_ibfk_2` FOREIGN KEY (`apply_id`) REFERENCES `apply` (`uuid`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE = InnoDB AUTO_INCREMENT = 1381 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '日志信息表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for user

src/main/java/com/benyun/controller/ApplyController.java

@@ -2,16 +2,13 @@ package com.benyun.controller;
 
 
 import com.benyun.boot.core.vo.Result;
-import com.benyun.vo.ApplyEventVo;
+import com.benyun.vo.ApplyVo;
 import lombok.RequiredArgsConstructor;
 import com.benyun.entity.Apply;
 import com.benyun.service.ApplyService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -21,6 +18,8 @@ import org.beetl.sql.core.engine.PageQuery;
 import java.util.List;
 
 /**
+ * 应用信息表
+ *
  * @author makejava
  * create on 2023-03-17 10:03:25
  */
@@ -49,7 +48,7 @@ public class ApplyController {
      * @return 所有数据
      */
     @GetMapping("/queryList")
-    public Result<List<Apply>> queryList(@RequestParam(required = false) String applyName) {
+    public Result<List<ApplyVo>> queryList(@RequestParam(required = false) String applyName) {
         return Result.success(applyService.queryList(applyName));
     }
     
@@ -111,14 +110,4 @@ public class ApplyController {
     public Result<Boolean> delete(@RequestParam("id") String id) {
       return Result.success(this.applyService.deleteById(id));
     }
-
-    /**
-     * 通过应用id查询应用的事件数据
-     *
-     * @return 所有数据
-     */
-    @GetMapping("/queryApplyEventByUUId")
-    public Result<ApplyEventVo> queryApplyEventByUUId(@RequestParam("uuid") String uuid) {
-        return Result.success(applyService.queryApplyEventByUUId(uuid));
-    }
 }

src/main/java/com/benyun/controller/EventAppendixController.java

@@ -16,6 +16,8 @@ import java.net.URLEncoder;
 import java.util.List;
 
 /**
+ * 事件附件表
+ *
  * @author makejava
  * create on 2023-03-27 08:55:05
  */

src/main/java/com/benyun/controller/EventController.java

@@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 /**
+ * 事件信息表
+ *
  * @author makejava
  * create on 2023-03-17 09:06:58
  */

src/main/java/com/benyun/controller/EventLogController.java

@@ -26,6 +26,8 @@ import java.util.List;
 import java.util.Map;
 
 /**
+ * 事件日志信息表（埋点操作）
+ *
  * @author makejava
  * create on 2023-03-22 09:25:07
  */

src/main/java/com/benyun/controller/UserController.java

@@ -20,6 +20,8 @@ import org.beetl.sql.core.engine.PageQuery;
 import java.util.List;
 
 /**
+ * 用户管理
+ *
  * @author makejava
  * create on 2023-03-17 09:06:58
  */

src/main/java/com/benyun/dao/ApplyDao.java

@@ -1,12 +1,14 @@
 package com.benyun.dao;
 
 import com.benyun.entity.Apply;
-import com.benyun.vo.ApplyEventVo;
+import com.benyun.vo.ApplyVo;
 import org.beetl.sql.core.mapper.BaseMapper;
 import org.beetl.sql.core.engine.PageQuery;
 import org.beetl.sql.core.annotatoin.SqlResource;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * 应用表(Apply)表数据库访问层
  *
@@ -21,5 +23,7 @@ public interface ApplyDao extends BaseMapper<Apply> {
      */
     void queryByPage(PageQuery<Apply> pageQuery);
 
-    ApplyEventVo queryApplyEventByUUId(String uuid);
+    ApplyVo queryApplyEventByUUId(String uuid);
+
+    List<ApplyVo> queryList(String applyName);
 }

src/main/java/com/benyun/entity/Apply.java

@@ -36,5 +36,9 @@ public class Apply extends TailBean {
      * 应用类型 如web、Android、小程序
      */
     private String applyType;
+    /**
+     * 应用令牌ID
+     */
+    private String tokenId;
 
 }

src/main/java/com/benyun/service/ApplyService.java

@@ -5,7 +5,7 @@ import java.util.List;
 
 import com.benyun.entity.Apply;
 import com.benyun.boot.core.vo.Result;
-import com.benyun.vo.ApplyEventVo;
+import com.benyun.vo.ApplyVo;
 import org.beetl.sql.core.engine.PageQuery;
 
 /**
@@ -45,8 +45,5 @@ public interface ApplyService {
      */
     Result<List<Apply>> queryByPage(PageQuery<Apply> pageQuery);
 
-
-    ApplyEventVo queryApplyEventByUUId(String uuid);
-
-    List<Apply> queryList(String applyName);
+    List<ApplyVo> queryList(String applyName);
 }

src/main/java/com/benyun/service/impl/ApplyServiceImpl.java

@@ -1,12 +1,11 @@
 package com.benyun.service.impl;
 
 
-import cn.hutool.core.util.StrUtil;
 import com.benyun.boot.core.vo.Result;
 import com.benyun.dao.ApplyDao;
 import com.benyun.entity.Apply;
 import com.benyun.service.ApplyService;
-import com.benyun.vo.ApplyEventVo;
+import com.benyun.vo.ApplyVo;
 import lombok.RequiredArgsConstructor;
 import org.beetl.sql.core.engine.PageQuery;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +13,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.UUID;
 
 /**
  * 应用表(Apply)表服务实现
@@ -39,8 +37,8 @@ public class ApplyServiceImpl implements ApplyService {
     }
 
     @Override
-    public List<Apply> queryList(String applyName) {
-        return applyDao.createLambdaQuery().andLike(Apply::getApplyName, "%" + (StrUtil.isNotBlank(applyName)? applyName: "") + "%").select();
+    public List<ApplyVo> queryList(String applyName) {
+        return applyDao.queryList(applyName);
     }
 
     @Override
@@ -85,10 +83,4 @@ public class ApplyServiceImpl implements ApplyService {
         result.setCount((int) pageQuery.getTotalRow());
         return result;
     }
-
-    @Override
-    public ApplyEventVo queryApplyEventByUUId(String uuid) {
-        ApplyEventVo applyEventVo = applyDao.queryApplyEventByUUId(uuid);
-        return applyEventVo;
-    }
 }

src/main/java/com/benyun/vo/ApplyEventVo.java → src/main/java/com/benyun/vo/ApplyVo.java

@@ -1,15 +1,8 @@
 package com.benyun.vo;
 
 
-import com.benyun.entity.Event;
 import lombok.*;
 import org.beetl.sql.core.TailBean;
-import org.beetl.sql.core.annotatoin.Table;
-import org.beetl.sql.core.annotatoin.AutoID;
-import org.beetl.sql.core.orm.OrmCondition;
-import org.beetl.sql.core.orm.OrmQuery;
-
-import java.util.List;
 
 /**
  * 应用表(Apply)实体类
@@ -22,10 +15,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
-@OrmQuery({
-        @OrmCondition(target = Event.class, attr = "uuid", targetAttr = "applyId", alias ="eventList", type = OrmQuery.Type.MANY),
-})
-public class ApplyEventVo extends TailBean {
+public class ApplyVo extends TailBean {
     private static final long serialVersionUID = 313104691699963778L;
     /**
      * 应用id
@@ -39,10 +29,4 @@ public class ApplyEventVo extends TailBean {
      * 应用类型 如web、Android、小程序
      */
     private String applyType;
-
-    /**
-     * 应用-事件列表
-     */
-    private List<Event> eventList;
-
 }

src/main/resources/application-dev.yml

@@ -68,6 +68,7 @@ knife4j:
     username: admin
     password: benyun
 
+# 附件前缀目录
 event:
   appendix:
     # prefixPath: ../appendix/

src/main/resources/application-prod.yml

@@ -1,86 +0,0 @@
-server:
-  port: 8081
-  tomcat:
-    max-swallow-size: -1
-  undertow:
-    # 以下的配置会影响buffer,这些buffer会用于服务器连接的IO操作
-    # 对于 bufferSize，最好和你系统的 TCP Socket Buffer 配置一样
-    # `/proc/sys/net/ipv4/tcp_rmem` (对于读取)
-    # `/proc/sys/net/ipv4/tcp_wmem` (对于写入)
-    # 在内存大于 128 MB 时，bufferSize 默认为 16 KB 减去 20 字节，这 20 字节用于协议头
-    buffer-size: 16364
-    # 是否分配的直接内存(NIO直接分配的堆外内存)，这里开启，所以java启动参数需要配置下直接内存大小，减少不必要的GC
-    # 在内存大于 128 MB 时，默认就是使用直接内存的
-    direct-buffers: true
-    threads:
-      # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个读线程和一个写线程
-      # 不要设置过大，如果过大，启动项目会报错：打开文件数过多
-      io: 16
-      # 阻塞任务线程池, 当执行类似servlet请求阻塞IO操作, undertow会从这个线程池中取得线程
-      # 它的值设置取决于系统线程执行任务的阻塞系数，默认值是IO线程数*8
-      worker: 256
-  error:
-    include-exception: true
-    include-stacktrace: ALWAYS
-    include-message: ALWAYS
-  servlet:
-    context-path: /
-  compression:
-    enabled: true
-    min-response-size: 1024
-    mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
-
-spring:
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 10MB
-  datasource:
-    dynamic:
-      primary: master   #设置默认的数据源或者数据源组,默认值即为master
-      strict: false     #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
-      datasource:
-        master:
-          url: jdbc:mysql://localhost:3306/master?characterEncoding=UTF-8&autoReconnect=true&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          username: root
-          password: 123456
-          driver-class-name: com.mysql.cj.jdbc.Driver
-  # redis 配置
-  redis:
-    database: 0
-    host: 127.0.0.1
-    lettuce:
-      pool:
-        max-active: 8   # 最大连接数据库连接数,设 0 为没有限制
-        max-idle: 8     # 最大等待连接中的数量,设 0 为没有限制
-        max-wait: -1ms  # 最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
-        min-idle: 0     # 最小等待连接中的数量,设 0 为没有限制
-      shutdown-timeout: 100ms
-    password: ''
-    port: 6379
-
-# mybatis plus 设置
-mybatis-plus:
-  type-aliases-package: com.benyun.**.entity
-  mapper-locations: classpath*:/mapper/**/*.xml
-  global-config:
-    # 关闭MP3.0自带的banner
-    banner: false
-    db-config:
-      # 主键类型
-      id-type: AUTO
-      # 默认数据库表下划线命名
-      table-underline: true
-  configuration:
-    # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    # 返回类型为Map,显示null对应的字段
-    call-setters-on-nulls: true
-
-# swagger
-knife4j:
-  production: true
-  basic:
-    enable: true
-    username: admin
-    password: benyun

src/main/resources/sql/Apply.md

@@ -2,11 +2,25 @@ queryByPage
 ===
 SELECT 
 @pageTag(){
- * 
+ a.*,
+ at.token token
 @}
-FROM apply 
+FROM apply a
+LEFT JOIN `apply_token` at on at.id = a.token_id
 WHERE 1=1
 
+queryList
+===
+SELECT 
+    a.*,
+    at.token token
+FROM apply a
+LEFT JOIN `apply_token` at on at.id = a.token_id
+WHERE 1=1
+@if(!isEmpty(applyName)){
+and a.apply_name = #applyName#
+@}
+
 queryApplyEventByUUId
 ===
 SELECT a.*

src/main/resources/sql/ApplyToken.md

@@ -0,0 +1,8 @@
+queryByPage
+===
+SELECT 
+@pageTag(){
+ * 
+@}
+FROM apply_token 
+WHERE 1=1