1、代码整合；2、bug修复。

ttc-app/target/classes/META-INF/additional-spring-configuration-metadata.json

@@ -0,0 +1,8 @@
+{
+  "properties": [
+    {
+      "name": "spring.datasource.druid",
+      "type": "java.lang.String",
+      "description": "Description for spring.datasource.druid."
+  }
+] }

ttc-app/target/classes/META-INF/spring-configuration-metadata.json

@@ -0,0 +1,11 @@
+{
+  "hints": [],
+  "groups": [],
+  "properties": [
+    {
+      "name": "spring.datasource.druid",
+      "description": "Description for spring.datasource.druid.",
+      "type": "java.lang.String"
+    }
+  ]
+}

ttc-app/target/classes/application-dev.yml

@@ -0,0 +1,64 @@
+spring:
+  datasource:
+    druid:
+      #       url: jdbc:mysql://192.168.1.29:3306/std_ttc_dev?autoReconnect=true&useUnicode=TRUE&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
+      #       username: ttcDev
+      #       password: ttc123456
+#      url: jdbc:mysql://192.168.0.27:3306/std_ttc_dev?autoReconnect=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
+#      url: jdbc:mysql://192.168.1.127:3306/std_ttc_dev?autoReconnect=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
+      url: jdbc:mysql://192.168.1.127:3306/std_ttc_dev_1?autoReconnect=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
+      username: root
+      password: root
+
+  data:
+    elasticsearch:
+      cluster-name: ttc_test_es
+      #      cluster-nodes: 192.168.0.28:9300,192.168.0.29:9300,192.168.0.30:9300
+      cluster-nodes: 192.168.1.127:9300,192.168.1.127:9301,192.168.1.127:9302
+      #      typename: esttc
+      #      indexname: ttcdev
+      #      label_common_indexname: label_common_dev
+      #      label_custom_indexname: label_custom_dev
+      #      label_connection_indexname: label_connection_dev
+      typename: esttc
+      indexname: ttctest
+      label_common_indexname: labelcommon
+      label_custom_indexname: labelcustom
+      label_connection_indexname: labelconnection
+
+#redis:
+#  host: 192.168.0.29
+#  port: 6379
+#  password: 123
+redis:
+  port: 6379
+  host: localhost
+  lettuce:
+    pool:
+      max-active: 8 # 连接池最大连接数
+      max-idle: 8 # 连接池最大空闲连接数
+      min-idle: 0 # 连接池最小空闲连接数
+      max-wait: -1ms # 连接池最大阻塞等待时间,负值表示没有限制
+
+#fdfs:
+#  domain: http://192.168.0.28:12345
+#  trackerList: 192.168.0.28:22122
+
+fdfs:
+  domain: http://192.168.1.128:12345
+  trackerList: 192.168.1.128:22122
+push:
+  common:
+    dir:
+      base: F:\\ghj\\prooooject\\test\\push
+      # 上传文件存储文件夹
+      upload: ${push.common.dir.base}\\upload\\
+      imag: ${push.common.dir.base}\\upload\\img\\
+      excl: ${push.common.dir.base}\\upload\\excel\\
+      model: ${push.common.dir.base}\\model\\
+      export: ${push.common.dir.base}\\model\\export\\
+      research: ${push.common.dir.base}\\model\\research\\
+    url:
+      # ip
+      base: http://192.168.1.128:12345/
+      path: ${push.common.url.base}/upload/down/

ttc-app/target/classes/application-prod.yml

@@ -0,0 +1,40 @@
+spring:
+  datasource:
+    druid:
+       url: jdbc:mysql://192.168.1.119:3306/std_ttc?autoReconnect=true&useUnicode=TRUE&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
+       username: ttcRelease
+       password: ttc123456
+
+  data:
+    elasticsearch:
+      cluster-name: ttc_es
+      cluster-nodes: 192.168.1.59:9300,192.168.1.13:9300,192.168.1.119:9300
+      typename: esttc
+      indexname: ttcrelease
+      label_common_indexname: labelcommonprod
+      label_custom_indexname: labelcustomprod
+      label_connection_indexname: labelconnectionprod
+
+redis:
+  host: 192.168.1.13
+  port: 6379
+  password: 123
+
+fdfs:
+  domain: pic.ubittc.com
+  trackerList: 192.168.1.59:22122
+push:
+  common:
+    dir:
+      base: /usr/tomcat_pool/tomcat_ttc_release/executedir
+      # 上传文件存储文件夹
+      upload: ${push.common.dir.base}/upload/
+      imag: ${push.common.dir.base}/upload/img/
+      excl: ${push.common.dir.base}/upload/excel/
+      model: ${push.common.dir.base}/model/
+      export: ${push.common.dir.base}/model/export/
+      research: ${push.common.dir.base}/model/research/
+    url:
+      # ip
+      base: http://pic.ubittc.com/
+      path: ${push.common.url.base}/upload/down/

ttc-app/target/classes/application-test.yml

@@ -0,0 +1,40 @@
+spring:
+  datasource:
+    druid:
+       url: jdbc:mysql://192.168.1.119:3306/std_ttc_test?autoReconnect=true&useUnicode=TRUE&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
+       username: ttcTest
+       password: ttc123456
+
+  data:
+    elasticsearch:
+      cluster-name: ttc_es
+      cluster-nodes: 192.168.1.59:9300,192.168.1.13:9300,192.168.1.119:9300
+      typename: esttc
+      indexname: ttctest
+      label_common_indexname: labelcommontest
+      label_custom_indexname: labelcustomtest
+      label_connection_indexname: labelconnectiontest
+
+redis:
+  host: 192.168.1.13
+  port: 6379
+  password: 123
+
+fdfs:
+  domain: pic.ubittc.com
+  trackerList: 192.168.1.59:22122
+push:
+  common:
+    dir:
+      base: /usr/tomcat_pool/tomcat_ttc_test/executedir
+      # 上传文件存储文件夹
+      upload: ${push.common.dir.base}/upload/
+      imag: ${push.common.dir.base}/upload/img/
+      excl: ${push.common.dir.base}/upload/excel/
+      model: ${push.common.dir.base}/model/
+      export: ${push.common.dir.base}/model/export/
+      research: ${push.common.dir.base}/model/research/
+    url:
+      # ip
+      base: http://pic.ubittc.com/
+      path: ${push.common.url.base}/upload/down/

ttc-app/target/classes/application.yml

@@ -0,0 +1,180 @@
+server:
+#  port: 8080
+  port: 8089
+  tomcat:
+    max-connections: 30000
+  connection-timeout: 3000000
+spring:
+  profiles:
+    active: dev
+#    active: test
+#    active: prodr
+  cache:
+    ehcache:
+      config: classpath:ehcache-config.xml
+  http:
+    multipart:
+      max-file-size: 20MB
+      max-request-size: 1000MB
+    encoding:
+      charset: utf-8
+      enabled: true
+      force: true
+  aop:
+    auto: true
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  datasource:
+    # 使用druid配置连接池
+    druid:
+      driver-class-name: com.mysql.jdbc.Driver
+      initial-size: 2
+      max-active: 30
+      min-idle: 2
+      max-wait: 60000
+      validation-query: select 'x'
+      validation-query-timeout: 1
+      test-on-borrow: true
+      test-on-return: true
+      test-while-idle: true
+      time-between-eviction-runs-millis: 10000
+      min-evictable-idle-time-millis: 30001
+      async-close-connection-enable: true
+      filters: stat,slf4j,wall
+      #监控配置
+      filter:
+        stat:
+          enabled: true
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        slf4j:
+          enabled: true
+          connection-log-enabled: true
+          connection-close-after-log-enabled: true
+          connection-commit-after-log-enabled: true
+          connection-connect-after-log-enabled: true
+          connection-connect-before-log-enabled: true
+          connection-log-error-enabled: true
+          data-source-log-enabled: true
+          result-set-log-enabled: true
+          statement-log-enabled: true
+        wall:
+          enabled: true
+          config:
+            alter-table-allow: false
+            truncate-allow: false
+            drop-table-allow: false
+            #是否允许非以上基本语句的其他语句，缺省关闭，通过这个选项就能够屏蔽DDL
+            none-base-statement-allow: false
+            #检查UPDATE语句是否无where条件，这是有风险的，但不是SQL注入类型的风险
+            update-where-none-check: true
+            #SELECT ... INTO OUTFILE 是否允许，这个是mysql注入攻击的常见手段，缺省是禁止的
+            select-into-outfile-allow: false
+            #是否允许调用Connection.getMetadata方法，这个方法调用会暴露数据库的表信息
+            metadata-allow: true
+            #允许多条sql一起执行
+            multi-statement-allow: false
+          #对被认为是攻击的SQL进行LOG.error输出
+          log-violation: true
+          #对被认为是攻击的SQL抛出SQLExcepton
+          throw-exception: true
+      web-stat-filter:
+        enabled: true
+        url-pattern: /*
+        exclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*'
+        #你可以配置principalSessionName，使得druid能够知道当前的cookie的用户是谁
+        #principal-cookie-name: admin
+        #你可以配置principalSessionName，使得druid能够知道当前的session的用户是谁
+        #principal-session-name: admin
+        #设置profileEnable能够监控单个url调用的sql列表。
+        profile-enable: true
+        #session统计功能
+        session-stat-enable: false
+        #最大session数
+        session-stat-max-count: 100000
+      stat-view-servlet:
+        enabled: true
+        login-username: admin
+        login-password: druid
+        url-pattern: /druid/*
+        #允许清除记录
+        reset-enable: false
+        #访问白名单
+        allow: 192.168.1.1/24,192.168.200.1/24
+#          aop-patterns: cn.ubitehc.ttc.controller.aop.*
+
+#    kafka:
+#      bootstrap-servers: 192.168.200.35:9092,192.168.200.36:9092
+#      producer:
+#        retries: 0
+#        batch-size: 16384
+#        buffer-memory: 33554432
+#        key-serializer: org.apache.kafka.common.serialization.StringSerializer
+#        value-serializer: org.apache.kafka.common.serialization.StringSerializer
+#      consumer:
+#        group-id: spider
+#        enable-auto-commit: true
+#        auto-offset-reset: latest
+#        auto-commit-interval: 10000
+#        key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
+#        value-deserializer: org.apache.kafka.common.serialization.StringDeserializer
+
+redis:
+  timeout: 3600
+  max-idle: 100
+  max-active: 1000
+  maxWaitMillis: 10000
+  max-wait: 10000
+  min-idle: 100
+#mybatis:
+mybatis-plus:
+  mapper-locations: classpath:mapper/*.xml
+  #实体扫描，多个package用逗号或者分号分隔
+  type-aliases-package: cn.czubitech.ttc.entity
+  global-config:
+    #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
+    id-type: 0
+    #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
+    field-strategy: 1
+    #驼峰下划线转换
+    db-column-underline: true
+    #刷新mapper 调试神器
+    refresh-mapper: true
+    #数据库大写下划线转换
+    #capital-mode: true
+    #序列接口实现类配置
+    #key-generator: com.baomidou.springboot.xxx
+    #逻辑删除配置（下面3个配置）
+    logic-delete-value: 0
+    logic-not-delete-value: 1
+    meta-object-handler: cn.ubitech.ttc.config.MyMetaObjectHandler
+  configuration:
+    map-underscore-to-camel-case: true
+    cache-enabled: true
+
+
+##pagehelper分页插件
+#pagehelper:
+#    helperDialect: mysql
+#    reasonable: true
+#    supportMethodsArguments: true
+#    params: count=countSql
+
+#logging
+logging:
+  level: debug
+
+#fastdfs相关内容
+fdfs:
+  connect-timeout: 2000
+  so-timeout: 1500
+  #  #缩略图生成参数
+  #  thumb-image:
+  #    width: 150
+  #    height: 150
+  pool:
+    max-total: 100
+    max-wait-millis: 60
+    lifo: true

ttc-backen/src/main/java/cn/ubitech/ttc/service/impl/resource/ResourceLibraryServiceImpl.java

@@ -20,6 +20,7 @@ import cn.ubitech.ttc.service.impl.label.LabelUtilService;
 import cn.ubitech.ttc.service.impl.resourceChoice.ResouceChoiceServiceImpl;
 import cn.ubitech.ttc.service.impl.search.SearchServiceImpl;
 import cn.ubitech.ttc.service.impl.user.UserServiceImpl;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.gson.*;
@@ -222,13 +223,17 @@ public class ResourceLibraryServiceImpl {
         resultModel.setPage(page);
         //资源库搜索功能
         List<ElasticSearchTTCModel> list = pagelist.getContent();
+        System.out.println("sel lists:" + JSON.toJSONString(list));
         list.forEach(l -> {
             UserModel userModel = userService.getUserBaseInfo(l.getClickthrough() != null ? l.getClickthrough() : 0);
             l.setUserModel(userModel);
+            System.out.println("getSource:" + l.getSource());
             if (StringUtils.isBlank(l.getSource())) {
+                System.out.println("if getUnique:" + l.getUnique());
                 l.setLabelObj(labelRecordService.taskInfoKeywordList
                         (Long.valueOf(StringUtils.isBlank(l.getUnique()) ? "0" : l.getUnique()), node));
             } else {
+                System.out.println("else getUnique:" + l.getUnique());
                 l.setLabelObj(labelRecordService.taskInfoKeywordList
                         (Long.valueOf(StringUtils.isBlank(l.getUnique()) ? "0" : l.getUnique()), l.getSource()));
             }

ttc-backen/target/classes/META-INF/spring-configuration-metadata.json

@@ -0,0 +1,93 @@
+{
+  "groups": [
+    {
+      "name": "push.common",
+      "sourceType": "cn.ubitech.ttc.config.properties.PushProperties",
+      "type": "cn.ubitech.ttc.config.properties.PushProperties"
+    },
+    {
+      "name": "redis",
+      "sourceType": "cn.ubitech.ttc.common.JedisConfig",
+      "type": "cn.ubitech.ttc.common.JedisConfig"
+    }
+  ],
+  "hints": [],
+  "properties": [
+    {
+      "name": "push.common.dir",
+      "sourceType": "cn.ubitech.ttc.config.properties.PushProperties",
+      "type": "cn.ubitech.ttc.config.properties.Dir"
+    },
+    {
+      "name": "push.common.url",
+      "sourceType": "cn.ubitech.ttc.config.properties.PushProperties",
+      "type": "cn.ubitech.ttc.config.properties.Url"
+    },
+    {
+      "name": "redis.host",
+      "sourceType": "cn.ubitech.ttc.common.JedisConfig",
+      "type": "java.lang.String"
+    },
+    {
+      "defaultValue": 0,
+      "name": "redis.max-active",
+      "sourceType": "cn.ubitech.ttc.common.JedisConfig",
+      "type": "java.lang.Integer"
+    },
+    {
+      "name": "redis.max-idle",
+      "sourceType": "cn.ubitech.ttc.common.JedisConfig",
+      "type": "java.lang.Integer"
+    },
+    {
+      "name": "redis.max-total",
+      "sourceType": "cn.ubitech.ttc.common.JedisConfig",
+      "type": "java.lang.Integer"
+    },
+    {
+      "name": "redis.max-wait-millis",
+      "sourceType": "cn.ubitech.ttc.common.JedisConfig",
+      "type": "java.lang.Long"
+    },
+    {
+      "name": "redis.min-idle",
+      "sourceType": "cn.ubitech.ttc.common.JedisConfig",
+      "type": "java.lang.Integer"
+    },
+    {
+      "name": "redis.password",
+      "sourceType": "cn.ubitech.ttc.common.JedisConfig",
+      "type": "java.lang.String"
+    },
+    {
+      "defaultValue": 0,
+      "name": "redis.port",
+      "sourceType": "cn.ubitech.ttc.common.JedisConfig",
+      "type": "java.lang.Integer"
+    },
+    {
+      "defaultValue": false,
+      "name": "redis.test-on-borrow",
+      "sourceType": "cn.ubitech.ttc.common.JedisConfig",
+      "type": "java.lang.Boolean"
+    },
+    {
+      "defaultValue": false,
+      "name": "redis.test-on-return",
+      "sourceType": "cn.ubitech.ttc.common.JedisConfig",
+      "type": "java.lang.Boolean"
+    },
+    {
+      "defaultValue": false,
+      "name": "redis.test-while-idle",
+      "sourceType": "cn.ubitech.ttc.common.JedisConfig",
+      "type": "java.lang.Boolean"
+    },
+    {
+      "defaultValue": 0,
+      "name": "redis.timeout",
+      "sourceType": "cn.ubitech.ttc.common.JedisConfig",
+      "type": "java.lang.Integer"
+    }
+  ]
+}