fixbugs

smart-city-job/src/main/resources/application-dev.properties

@@ -0,0 +1,73 @@
+# web port
+server.port=8086
+# no web
+#spring.main.web-environment=false
+
+# log config
+#logging.config=classpath:logback.xml
+
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+#spring.datasource.url=jdbc:mysql://10.0.0.161:3306/smart_city_sit_6_10?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://114.135.61.188:33306/smart_city_sit_6_10?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+#spring.datasource.url=jdbc:mysql://47.112.217.10:3306/smart_city?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+spring.datasource.username=root
+spring.datasource.password=100Zone@123
+spring.datasource.druid.initial-size=5
+spring.datasource.druid.min-idle=5
+spring.datasource.druid.max-active=20
+spring.datasource.druid.max-wait=60000
+spring.datasource.druid.time-between-eviction-runs-millis=60000
+spring.datasource.druid.min-evictable-idle-time-millis=300000
+spring.datasource.druid.validation-query=SELECT 1
+spring.datasource.druid.test-while-idle=true
+spring.datasource.druid.test-on-borrow=true
+spring.datasource.druid.test-on-return=false
+spring.datasource.druid.pool-prepared-statements=true
+spring.datasource.druid.max-pool-prepared-statement-per-connection-size=20
+spring.datasource.druid.filters=stat,wall
+spring.datasource.druid.connection-properties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+
+# mybatis_config
+mybatis.mapper-locations=classpath*:mapper/*.xml
+mybatis.type-aliases-package=com.bz.smart_city.entity
+mybatis.configuration.map-underscore-to-camel-case=true
+mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+mybatis.configuration.use-column-label=true
+
+
+### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
+xxl.job.admin.addresses=http://127.0.0.1:8080/xxl-job-admin
+
+### xxl-job, access token
+xxl.job.accessToken=
+
+### xxl-job executor appname
+xxl.job.executor.appname=smart-city-job
+### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
+xxl.job.executor.address=
+### xxl-job executor server-info
+xxl.job.executor.ip=127.0.0.1
+xxl.job.executor.port=9996
+### xxl-job executor log-path
+xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler
+### xxl-job executor log-retention-days
+xxl.job.executor.logretentiondays=30
+
+#mongodb
+#spring.data.mongodb.uri=mongodb://127.0.0.1:27017/test
+spring.data.mongodb.uri=mongodb://114.135.61.188:17017/water-iot-database
+logging.level.org.springframework.data.mongodb.core=DEBUG
+
+
+# redis
+spring.redis.host=10.0.0.161
+spring.redis.port=6379
+spring.redis.password=zoniot
+spring.redis.database=1
+spring.redis.timeout=10000ms
+spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.max-wait=-1ms
+spring.redis.jedis.pool.min-idle=2
+

smart-city-job/src/main/resources/application-sit.properties

@@ -0,0 +1,77 @@
+# web port
+server.port=8050
+# no web
+#spring.main.web-environment=false
+
+# log config
+#logging.config=classpath:logback.xml
+
+#日志配置
+logging.level.root=info
+logging.file.path=/opt/sit/smart-city-job/logs
+
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+#spring.datasource.url=jdbc:mysql://10.0.0.161:3306/smart_city_sit_6_10?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://114.135.61.188:33306/smart_city_sit_6_10?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+#spring.datasource.url=jdbc:mysql://47.112.217.10:3306/smart_city?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+spring.datasource.username=root
+spring.datasource.password=100Zone@123
+spring.datasource.druid.initial-size=5
+spring.datasource.druid.min-idle=5
+spring.datasource.druid.max-active=20
+spring.datasource.druid.max-wait=60000
+spring.datasource.druid.time-between-eviction-runs-millis=60000
+spring.datasource.druid.min-evictable-idle-time-millis=300000
+spring.datasource.druid.validation-query=SELECT 1
+spring.datasource.druid.test-while-idle=true
+spring.datasource.druid.test-on-borrow=true
+spring.datasource.druid.test-on-return=false
+spring.datasource.druid.pool-prepared-statements=true
+spring.datasource.druid.max-pool-prepared-statement-per-connection-size=20
+spring.datasource.druid.filters=stat,wall
+spring.datasource.druid.connection-properties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+
+# mybatis_config
+mybatis.mapper-locations=classpath*:mapper/*.xml
+mybatis.type-aliases-package=com.bz.smart_city.entity
+mybatis.configuration.map-underscore-to-camel-case=true
+mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+mybatis.configuration.use-column-label=true
+
+
+### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
+xxl.job.admin.addresses=http://127.0.0.1:8081/xxl-job-admin
+
+### xxl-job, access token
+xxl.job.accessToken=
+
+### xxl-job executor appname
+xxl.job.executor.appname=smart-city-job
+### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
+xxl.job.executor.address=
+### xxl-job executor server-info
+xxl.job.executor.ip=127.0.0.1
+xxl.job.executor.port=9990
+### xxl-job executor log-path
+xxl.job.executor.logpath=/opt/sit/smart-city-job/jobhandler
+### xxl-job executor log-retention-days
+xxl.job.executor.logretentiondays=30
+
+#mongodb
+#spring.data.mongodb.uri=mongodb://127.0.0.1:27017/test
+spring.data.mongodb.uri=mongodb://114.135.61.188:17017/water-iot-database
+logging.level.org.springframework.data.mongodb.core=DEBUG
+
+
+# redis
+spring.redis.host=10.0.0.161
+spring.redis.port=6379
+spring.redis.password=zoniot
+spring.redis.database=1
+spring.redis.timeout=10000ms
+spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.max-wait=-1ms
+spring.redis.jedis.pool.min-idle=2
+

smart-city-job/src/main/resources/application.properties

@@ -1,73 +1,2 @@
-# web port
-server.port=8086
-# no web
-#spring.main.web-environment=false
-
-# log config
-#logging.config=classpath:logback.xml
-
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-#spring.datasource.url=jdbc:mysql://10.0.0.161:3306/smart_city_sit_6_10?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
-spring.datasource.url=jdbc:mysql://114.135.61.188:33306/smart_city_sit_6_10?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
-#spring.datasource.url=jdbc:mysql://47.112.217.10:3306/smart_city?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
-spring.datasource.username=root
-spring.datasource.password=100Zone@123
-spring.datasource.druid.initial-size=5
-spring.datasource.druid.min-idle=5
-spring.datasource.druid.max-active=20
-spring.datasource.druid.max-wait=60000
-spring.datasource.druid.time-between-eviction-runs-millis=60000
-spring.datasource.druid.min-evictable-idle-time-millis=300000
-spring.datasource.druid.validation-query=SELECT 1
-spring.datasource.druid.test-while-idle=true
-spring.datasource.druid.test-on-borrow=true
-spring.datasource.druid.test-on-return=false
-spring.datasource.druid.pool-prepared-statements=true
-spring.datasource.druid.max-pool-prepared-statement-per-connection-size=20
-spring.datasource.druid.filters=stat,wall
-spring.datasource.druid.connection-properties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-
-# mybatis_config
-mybatis.mapper-locations=classpath*:mapper/*.xml
-mybatis.type-aliases-package=com.bz.smart_city.entity
-mybatis.configuration.map-underscore-to-camel-case=true
-mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
-mybatis.configuration.use-column-label=true
-
-
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://127.0.0.1:8080/xxl-job-admin
-
-### xxl-job, access token
-xxl.job.accessToken=
-
-### xxl-job executor appname
-xxl.job.executor.appname=smart-city-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=127.0.0.1
-xxl.job.executor.port=9996
-### xxl-job executor log-path
-xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-
-#mongodb
-#spring.data.mongodb.uri=mongodb://127.0.0.1:27017/test
-spring.data.mongodb.uri=mongodb://114.135.61.188:17017/water-iot-database
-logging.level.org.springframework.data.mongodb.core=DEBUG
-
-
-# redis
-spring.redis.host=10.0.0.161
-spring.redis.port=6379
-spring.redis.password=zoniot
-spring.redis.database=1
-spring.redis.timeout=10000ms
-spring.redis.jedis.pool.max-active=8
-spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.max-wait=-1ms
-spring.redis.jedis.pool.min-idle=2
-
+#开发环境：dev  测试环境：sit  线上环境：prd  演示环境：uat
+spring.profiles.active=sit

smart-city-job/src/main/resources/logback-spring.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <springProperty scope="context" name="LOG_PATH" source="logging.file.path" defaultValue="/tmp" />
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+    <appender name="TIME_FILE"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <encoder>
+            <pattern>${FILE_LOG_PATTERN}</pattern>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_PATH}/smart_city.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <maxHistory>365</maxHistory>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="TIME_FILE" />
+    </root>
+</configuration>

smart-city-platform/src/main/resources/application-sit.properties

@@ -165,6 +165,6 @@ spring.rabbitmq.zy.topic=hello
 udip.unit.url=http://114.135.61.188:48322
 
 #mongodb
-#spring.data.mongodb.uri=mongodb://114.135.61.188:17017/smartcity
-spring.data.mongodb.uri=mongodb://127.0.0.1:27017/test
+spring.data.mongodb.uri=mongodb://114.135.61.188:17017/smartcity
+#spring.data.mongodb.uri=mongodb://127.0.0.1:27017/test
 logging.level.org.springframework.data.mongodb.core=DEBUG

smart-city-platform/src/test/java/com/bz/smart_city/ScTest.java

@@ -1,6 +1,7 @@
 package com.bz.smart_city;
 
 import com.alibaba.fastjson.JSON;
+import com.bz.smart_city.commom.util.HttpRequest;
 import com.bz.smart_city.commom.util.Jdk8DateUtils;
 import com.bz.smart_city.commom.util.Util;
 import com.bz.smart_city.dto.DeviceTypeDto;
@@ -13,9 +14,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.message.BasicNameValuePair;
 import org.junit.Test;
 
 import javax.validation.constraints.Null;
+import java.io.IOException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -310,6 +313,33 @@ public class ScTest {
         log.info("udipUnit json:"+ json);
     }
 
+    @Test
+    public void downlink(){
+        String url = "http://api.easylinkin.com/api/v1/application/downlink?";
+        Map<String,Object> map = new HashMap<>();
+        map.put("mac","004a77012403b014");
+        map.put("token","huaxu180820");
+        map.put("appeui","2C26C501241E0000");
+        map.put("payload","FEFEFEFE6810359143900100000404A01700552616");
+        map.put("ttl","2h");
+        map.put("payloadType","1");
+        map.put("confirmed",true);
+        String temp = "";
+        for (String key : map.keySet()) {
+            temp += "&" + key + "=" +map.get(key);
+        }
+        url += temp.substring(1);
+        System.out.println(url);
+        try {
+            String result = HttpRequest.doGet(url);
+            System.out.println(result);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+
 
 
 }