Merge remote-tracking branch 'origin/master'

signal-feign-service/src/main/resources/application-police.properties

+utc.service.url=http://localhost:32000/utc
+utc.dt.service.url=http://localhost:39002/utc-dt
+utc.hisense.service.url=http://localhost:39003/utc-hisense
\ No newline at end of file

signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/handler/NettyServerHandler.java

@@ -57,6 +57,7 @@ public class NettyServerHandler extends SimpleChannelInboundHandler<DatagramPack
             String crossId = pojo.getCID();
             Map<String, RunningLightsStatusPojo> cache = SignalDataCache.runningStateInfoCache;
             cache.put(crossId, pojo);
+            return;
         }
 
         Object bean = ServiceBeanContext.getBean(className);

signal-utc-hisense-service/src/main/resources/application-police.yaml

+spring:
+  datasource:
+    dynamic:
+      primary: master
+      datasource:
+        master:
+          type: com.alibaba.druid.pool.DruidDataSource
+          url: jdbc:mysql://106.120.201.126:14726/t_signal_utc_changsha?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&sessionVariables=sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'&useSSL=false&useCursorFetch=true
+          username: root
+          password: Wanji300552
+          driverClassName: com.mysql.cj.jdbc.Driver
+        slave:
+          type: com.alibaba.druid.pool.DruidDataSource
+          url: jdbc:mysql://106.120.201.126:14726/t_signal_utc_changsha?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&sessionVariables=sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'&useSSL=false&useCursorFetch=true
+          username: root
+          password: Wanji300552
+          driverClassName: com.mysql.cj.jdbc.Driver
+        webService:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://106.120.201.126:14726/t_signal?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&sessionVariables=sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'&useSSL=false&useCursorFetch=true
+          username: root
+          password: Wanji300552
+          type: com.alibaba.druid.pool.DruidDataSource
+  redis:
+    host: localhost
+    port: 6379
+    jedis:
+      pool:
+        max-active: 200
+        max-wait: 5000
+        max-idle: 20
+        min-idle: 10
+    timeout: 5000
+    database: 3
+  jackson:
+    mapper:
+      accept_case_insensitive_properties: true
+  main:
+    allow-circular-references: true
+  #    allow-bean-definition-overriding: true
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
+  application:
+    name: utc-hisense
+service:
+  name: signal-utc-dt-service
+
+mybatis:
+  type-aliases-package: net.wanji.*.model
+  mapper-locations: classpath*:mapper/*.xml,classpath:mapper/*/*.xml
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+mapper:
+  mappers:
+    - net.wanji.web.mapper.MyBaseMapper
+  not-empty: false
+  identity: MYSQL
+
+pagehelper:
+  helper-dialect: mysql
+  reasonable: false
+  # pagehelper分页 配置参数 supportMethodsArguments 建议不要全局设置
+  # https://www.cnblogs.com/liran123/p/12889093.html
+  support-methods-arguments: false
+  params: count=countSql
+
+jasypt:
+  encryptor:
+    algorithm: PBEWithMD5AndDES
+    password: 7F84150B6A114C48F0EA1158484BF63C
+    iv-generator-classname: org.jasypt.iv.NoIvGenerator
+
+mybatis-plus:
+  mapper-locations: classpath*:mapper/*.xml,classpath:mapper/*/*.xml
+  typeAliasesPackage: net.wanji.web.entity
+  check-config-location: true
+  configuration:
+    #是否开启自动驼峰命名规则（camel case）映射
+    map-underscore-to-camel-case: true
+    #全局地开启或关闭配置文件中的所有映射器已经配置的任何缓存
+    cache-enabled: false
+    call-setters-on-nulls: true
+    #配置JdbcTypeForNull, oracle数据库必须配置
+    jdbc-type-for-null: 'null'
+    #MyBatis 自动映射时未知列或未知属性处理策略 NONE：不做任何处理 (默认值), WARNING：以日志的形式打印相关警告信息, FAILING：当作映射失败处理，并抛出异常和详细信息
+    auto-mapping-unknown-column-behavior: warning
+    #开启SQL打印
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+#线程池配置
+threadPoolConfig:
+  threadPoolName: ${spring.application.name}-threadPool-thread-%d
+  coreSize: 8
+  maxSize: 16
+  queueCapacity: 200
+  keepAliveTime: 6000
+  allowCoreTimeOut: false
+#东土通讯端口配置
+portParam:
+  localPort: 55051
+  remotePort: 55050
+server:
+  port: 39003
+  servlet:
+    display-name: Wanji
+    context-path: /utc-hisense
+    multipart:
+      max-file-size: 50MB
+      max-request-size: 50MB
+  tomcat:
+    threads:
+      max: 10000
+
+# 信号平台
+signal: