Browse Source

增加clickId字符串字段

xuzuoyun 4 years ago
parent
commit
38b4721e7d
26 changed files with 3 additions and 173 deletions
  1. 2 0
      src/main/java/cn/com/ctop/track/controller/TrackController.java
  2. 1 0
      src/main/java/cn/com/ctop/track/entity/ConvertInfo.java
  3. 0 112
      target/classes/application.yml
  4. BIN
      target/classes/cn/com/ctop/track/Application.class
  5. BIN
      target/classes/cn/com/ctop/track/config/MybatisPlusConfig.class
  6. BIN
      target/classes/cn/com/ctop/track/controller/TrackController.class
  7. BIN
      target/classes/cn/com/ctop/track/entity/ClickInfo.class
  8. BIN
      target/classes/cn/com/ctop/track/entity/ConvertInfo.class
  9. BIN
      target/classes/cn/com/ctop/track/entity/TaobaoNotice.class
  10. BIN
      target/classes/cn/com/ctop/track/mapper/ClickInfoMapper.class
  11. BIN
      target/classes/cn/com/ctop/track/mapper/ConvertInfoMapper.class
  12. BIN
      target/classes/cn/com/ctop/track/mapper/TaobaoNoticeMapper.class
  13. BIN
      target/classes/cn/com/ctop/track/service/ClickInfoService.class
  14. BIN
      target/classes/cn/com/ctop/track/service/ConvertInfoService.class
  15. BIN
      target/classes/cn/com/ctop/track/service/TaobaoNoticeService.class
  16. BIN
      target/classes/cn/com/ctop/track/service/impl/ClickInfoServiceImpl.class
  17. BIN
      target/classes/cn/com/ctop/track/service/impl/ConvertInfoServiceImpl.class
  18. BIN
      target/classes/cn/com/ctop/track/service/impl/TaobaoNoticeServiceImpl.class
  19. BIN
      target/classes/cn/com/ctop/track/utils/HttpUtils$1.class
  20. BIN
      target/classes/cn/com/ctop/track/utils/HttpUtils$2.class
  21. BIN
      target/classes/cn/com/ctop/track/utils/HttpUtils$3.class
  22. BIN
      target/classes/cn/com/ctop/track/utils/HttpUtils.class
  23. 0 4
      target/classes/log4j.properties
  24. 0 57
      target/classes/logback-dev.xml
  25. BIN
      target/track-1.0-SNAPSHOT.jar
  26. BIN
      target/track-1.0-SNAPSHOT.jar.original

+ 2 - 0
src/main/java/cn/com/ctop/track/controller/TrackController.java

@@ -40,6 +40,7 @@ public class TrackController {
         try {
             //test
             String clickId = request.getParameter("click_id");
+            String clickIdStr = request.getParameter("click_id_str");
             String spaceId = request.getParameter("space_id");
             String accountId = request.getParameter("account_id");
             String os = request.getParameter("os_type");
@@ -95,6 +96,7 @@ public class TrackController {
             }catch (Exception e){
 
             }
+            convertInfo.setClickIdStr(clickIdStr);
             convertInfo.setTransformType(transformType);
             convertInfo.setResponse(result);
             convertInfo.setAdvertisor(advertisor);

+ 1 - 0
src/main/java/cn/com/ctop/track/entity/ConvertInfo.java

@@ -13,6 +13,7 @@ public class ConvertInfo {
     @TableId(type = IdType.INPUT)
     private Long id;
     private Long clickId;
+    private String clickIdStr;
     private String accountId;
     private String spaceId;
     private String platform;

+ 0 - 112
target/classes/application.yml

@@ -1,112 +0,0 @@
-server:
-  port: 8081
-  ip: 127.0.0.1
-  servlet:
-    context-path: /
-    compression:
-      enabled: true
-      mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: metrics,httptrace
-
-spring:
-  servlet:
-    multipart:
-      max-file-size: -1
-      max-request-size: -1
-  #json 时间戳统一转换
-  jackson:
-    date-format:   yyyy-MM-dd HH:mm:ss
-    time-zone:   GMT+8
-  aop:
-    proxy-target-class: true
-  #配置freemarker
-  freemarker:
-    # 设置模板后缀名
-    suffix: .ftl
-    # 设置文档类型
-    content-type: text/html
-    # 设置页面编码格式
-    charset: UTF-8
-    # 设置页面缓存
-    cache: false
-    prefer-file-system-access: false
-    # 设置ftl文件路径
-    template-loader-path:
-      - classpath:/templates
-  # 设置静态文件路径,js,css等
-  mvc:
-    static-path-pattern: /**
-  resource:
-    static-locations: classpath:/static/,classpath:/public/
-  autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-  datasource:
-#    name: fendo
-#    url: jdbc:mysql://39.97.120.42:3306/track?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-#    username: hcst
-#    password: test@20190531
-    type: com.alibaba.druid.pool.DruidDataSource
-    driver-class-name: com.mysql.jdbc.Driver
-    dynamic:
-      druid: # 全局druid参数,绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
-        # 连接池的配置信息
-        # 初始化大小,最小,最大
-        connection-init-sql: set names utf8mb4
-
-        initial-size: 5
-        min-idle: 5
-        maxActive: 20
-        # 配置获取连接等待超时的时间
-        maxWait: 60000
-        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-        timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间,单位是毫秒
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 打开PSCache,并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
-        filters: stat,slf4j
-        # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
-        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
-      datasource:
-        master:
-          url: jdbc:mysql://39.97.120.42:3306/track?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-          username: hcst
-          password: test@20190531
-          driver-class-name: com.mysql.jdbc.Driver
-          # 多数据源配置
-          #multi-datasource1:
-#          url: jdbc:mysql://39.106.184.70:3306/track?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
-#          username: hcst
-#          password: test@20190531
-#          driver-class-name: com.mysql.jdbc.Driver
-#mybatis plus 设置
-mybatis-plus:
-  mapper-locations: classpath*:classpath*:cn/com/ctop/**/xml/*Mapper.xml
-  global-config:
-    # 关闭MP3.0自带的banner
-    banner: false
-    db-config:
-      #主键类型  0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
-      id-type: 4
-      # 默认数据库表下划线命名
-      table-underline: true
-    configuration:
-      # 这个配置会将执行的sql打印出来,在开发或测试的时候可以用
-      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
-logging:
-  level:
-    root: info
-  config: classpath:logback-dev.xml
-

BIN
target/classes/cn/com/ctop/track/Application.class


BIN
target/classes/cn/com/ctop/track/config/MybatisPlusConfig.class


BIN
target/classes/cn/com/ctop/track/controller/TrackController.class


BIN
target/classes/cn/com/ctop/track/entity/ClickInfo.class


BIN
target/classes/cn/com/ctop/track/entity/ConvertInfo.class


BIN
target/classes/cn/com/ctop/track/entity/TaobaoNotice.class


BIN
target/classes/cn/com/ctop/track/mapper/ClickInfoMapper.class


BIN
target/classes/cn/com/ctop/track/mapper/ConvertInfoMapper.class


BIN
target/classes/cn/com/ctop/track/mapper/TaobaoNoticeMapper.class


BIN
target/classes/cn/com/ctop/track/service/ClickInfoService.class


BIN
target/classes/cn/com/ctop/track/service/ConvertInfoService.class


BIN
target/classes/cn/com/ctop/track/service/TaobaoNoticeService.class


BIN
target/classes/cn/com/ctop/track/service/impl/ClickInfoServiceImpl.class


BIN
target/classes/cn/com/ctop/track/service/impl/ConvertInfoServiceImpl.class


BIN
target/classes/cn/com/ctop/track/service/impl/TaobaoNoticeServiceImpl.class


BIN
target/classes/cn/com/ctop/track/utils/HttpUtils$1.class


BIN
target/classes/cn/com/ctop/track/utils/HttpUtils$2.class


BIN
target/classes/cn/com/ctop/track/utils/HttpUtils$3.class


BIN
target/classes/cn/com/ctop/track/utils/HttpUtils.class


+ 0 - 4
target/classes/log4j.properties

@@ -1,4 +0,0 @@
-log4j.rootLogger=INFO,stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS}-[%p] [%t] %-5l - %m%n

+ 0 - 57
target/classes/logback-dev.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="10 seconds">
-
-    <contextName>logback</contextName>
-
-
-    <!-- 格式化输出:%date表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度 %msg:日志消息,%n是换行符-->
-    <property name="LOG_PATTERN" value="%date{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n"/>
-
-    <!-- 定义日志存储的路径,不要配置相对路径 -->
-    <property name="FILE_PATH" value="D:/Desktop/log/spring-log.%d{yyyy-MM-dd}.%i.log"/>
-
-    <!-- 控制台输出日志 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <!-- 日志级别过滤INFO以下 -->
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>INFO</level>
-        </filter>
-        <encoder>
-            <!-- 按照上面配置的LOG_PATTERN来打印日志 -->
-            <pattern>${LOG_PATTERN}</pattern>
-        </encoder>
-    </appender>
-
-    <!--每天生成一个日志文件,保存30天的日志文件。rollingFile用来切分文件的 -->
-    <appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-
-            <fileNamePattern>${FILE_PATH}</fileNamePattern>
-
-            <!-- keep 15 days' worth of history -->
-            <maxHistory>30</maxHistory>
-
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <!-- 日志文件的最大大小 -->
-                <maxFileSize>2MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-
-            <!-- 超出删除老文件 -->
-            <totalSizeCap>1GB</totalSizeCap>
-        </rollingPolicy>
-
-        <encoder>
-            <pattern>${LOG_PATTERN}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- project default level -->
-    <logger name="net.sh.rgface.serive" level="ERROR"/>
-
-    <!-- 日志输出级别 -->
-    <root level="INFO">
-        <appender-ref ref="console"/>
-        <appender-ref ref="rollingFile"/>
-    </root>
-</configuration>

BIN
target/track-1.0-SNAPSHOT.jar


BIN
target/track-1.0-SNAPSHOT.jar.original