简柏林 / thingskit · Commits

Commit 9dc88bcb094dafeb15654bae45a06cb8fe295a31

Authored by Igor Kulikov
1 parent 3f9c80f5

Fix transports configurations

Inline Side-by-side
Showing 2 changed files with 28 additions and 36 deletions
@@ -98,41 +98,18 @@ transport: @@ -98,41 +98,18 @@ transport:
98 # Enable/disable http/mqtt/coap transport protocols (has higher priority than certain protocol's 'enabled' property) 98 # Enable/disable http/mqtt/coap transport protocols (has higher priority than certain protocol's 'enabled' property)
99 api_enabled: "${TB_TRANSPORT_API_ENABLED:true}" 99 api_enabled: "${TB_TRANSPORT_API_ENABLED:true}"
100 # Local LwM2M transport parameters 100 # Local LwM2M transport parameters
  101 + # Local LwM2M transport parameters
101 lwm2m: 102 lwm2m:
102 # Enable/disable lvm2m transport protocol. 103 # Enable/disable lvm2m transport protocol.
103 enabled: "${LWM2M_ENABLED:true}" 104 enabled: "${LWM2M_ENABLED:true}"
104 - # We choose a default timeout a bit higher to the MAX_TRANSMIT_WAIT(62-93s) which is the time from starting to  
105 - # send a Confirmable message to the time when an acknowledgement is no longer expected.  
106 - # DEFAULT_TIMEOUT = 2 * 60 * 1000l; 2 min in ms  
107 - timeout: "${LWM2M_TIMEOUT:120000}"  
108 - recommended_ciphers: "${LWM2M_RECOMMENDED_CIPHERS:false}"  
109 - recommended_supported_groups: "${LWM2M_RECOMMENDED_SUPPORTED_GROUPS:true}"  
110 - response_pool_size: "${LWM2M_RESPONSE_POOL_SIZE:100}"  
111 - registered_pool_size: "${LWM2M_REGISTERED_POOL_SIZE:10}"  
112 - update_registered_pool_size: "${LWM2M_UPDATE_REGISTERED_POOL_SIZE:10}"  
113 - un_registered_pool_size: "${LWM2M_UN_REGISTERED_POOL_SIZE:10}"  
114 - secure:  
115 - # Certificate_x509:  
116 - # To get helps about files format and how to generate it, see: https://github.com/eclipse/leshan/wiki/Credential-files-format  
117 - # Create new X509 Certificates: common/transport/lwm2m/src/main/resources/credentials/shell/lwM2M_credentials.sh  
118 - key_store_type: "${LWM2M_KEYSTORE_TYPE:JKS}"  
119 - # key_store_path_file: "${KEY_STORE_PATH_FILE:/transport/lwm2m/src/main/data/credentials/serverKeyStore.jks}"  
120 - key_store_path_file: "${KEY_STORE_PATH_FILE:}"  
121 - key_store_password: "${LWM2M_KEYSTORE_PASSWORD_SERVER:server_ks_password}"  
122 - root_alias: "${LWM2M_SERVER_ROOT_CA:rootca}"  
123 - enable_gen_new_key_psk_rpk: "${ENABLE_GEN_NEW_KEY_PSK_RPK:false}"  
124 server: 105 server:
125 id: "${LWM2M_SERVER_ID:123}" 106 id: "${LWM2M_SERVER_ID:123}"
126 bind_address: "${LWM2M_BIND_ADDRESS:0.0.0.0}" 107 bind_address: "${LWM2M_BIND_ADDRESS:0.0.0.0}"
127 - bind_port_no_sec: "${LWM2M_BIND_PORT_NO_SEC:5685}"  
128 - secure:  
129 - bind_address_security: "${LWM2M_BIND_ADDRESS_SECURITY:0.0.0.0}"  
130 - bind_port_security: "${LWM2M_BIND_PORT_SECURITY:5686}"  
131 - # create_rpk: "${CREATE_RPK:}" 108 + bind_port: "${LWM2M_BIND_PORT:5685}"
  109 + security:
  110 + bind_address: "${LWM2M_BIND_ADDRESS_SECURITY:0.0.0.0}"
  111 + bind_port: "${LWM2M_BIND_PORT_SECURITY:5686}"
132 # Only for RPK: Public & Private Key. If the keystore file is missing or not working 112 # Only for RPK: Public & Private Key. If the keystore file is missing or not working
133 - # - Public Key (Hex): [3059301306072a8648ce3d020106082a8648ce3d0301070342000405064b9e6762dd8d8b8a52355d7b4d8b9a3d64e6d2ee277d76c248861353f3585eeb1838e4f9e37b31fa347aef5ce3431eb54e0a2506910c5e0298817445721b]  
134 - # - Private Key (Hex): [308193020100301306072a8648ce3d020106082a8648ce3d030107047930770201010420dc774b309e547ceb48fee547e104ce201a9c48c449dc5414cd04e7f5cf05f67ba00a06082a8648ce3d030107a1440342000405064b9e6762dd8d8b8a52355d7b4d8b9a3d64e6d2ee277d76c248861353f3585eeb1838e4f9e37b31fa347aef5ce3431eb54e0a2506910c5e0298817445721b],  
135 - # - Elliptic Curve parameters : [secp256r1 [NIST P-256, X9.62 prime256v1] (1.2.840.10045.3.1.7)]  
136 public_x: "${LWM2M_SERVER_PUBLIC_X:05064b9e6762dd8d8b8a52355d7b4d8b9a3d64e6d2ee277d76c248861353f358}" 113 public_x: "${LWM2M_SERVER_PUBLIC_X:05064b9e6762dd8d8b8a52355d7b4d8b9a3d64e6d2ee277d76c248861353f358}"
137 public_y: "${LWM2M_SERVER_PUBLIC_Y:5eeb1838e4f9e37b31fa347aef5ce3431eb54e0a2506910c5e0298817445721b}" 114 public_y: "${LWM2M_SERVER_PUBLIC_Y:5eeb1838e4f9e37b31fa347aef5ce3431eb54e0a2506910c5e0298817445721b}"
138 private_encoded: "${LWM2M_SERVER_PRIVATE_ENCODED:308193020100301306072a8648ce3d020106082a8648ce3d030107047930770201010420dc774b309e547ceb48fee547e104ce201a9c48c449dc5414cd04e7f5cf05f67ba00a06082a8648ce3d030107a1440342000405064b9e6762dd8d8b8a52355d7b4d8b9a3d64e6d2ee277d76c248861353f3585eeb1838e4f9e37b31fa347aef5ce3431eb54e0a2506910c5e0298817445721b}" 115 private_encoded: "${LWM2M_SERVER_PRIVATE_ENCODED:308193020100301306072a8648ce3d020106082a8648ce3d030107047930770201010420dc774b309e547ceb48fee547e104ce201a9c48c449dc5414cd04e7f5cf05f67ba00a06082a8648ce3d030107a1440342000405064b9e6762dd8d8b8a52355d7b4d8b9a3d64e6d2ee277d76c248861353f3585eeb1838e4f9e37b31fa347aef5ce3431eb54e0a2506910c5e0298817445721b}"
@@ -142,19 +119,34 @@ transport: @@ -142,19 +119,34 @@ transport:
142 enable: "${LWM2M_ENABLED_BS:true}" 119 enable: "${LWM2M_ENABLED_BS:true}"
143 id: "${LWM2M_SERVER_ID_BS:111}" 120 id: "${LWM2M_SERVER_ID_BS:111}"
144 bind_address: "${LWM2M_BIND_ADDRESS_BS:0.0.0.0}" 121 bind_address: "${LWM2M_BIND_ADDRESS_BS:0.0.0.0}"
145 - bind_port_no_sec: "${LWM2M_BIND_PORT_NO_SEC_BS:5687}"  
146 - secure:  
147 - bind_address_security: "${LWM2M_BIND_ADDRESS_BS:0.0.0.0}"  
148 - bind_port_security: "${LWM2M_BIND_PORT_SECURITY_BS:5688}" 122 + bind_port: "${LWM2M_BIND_PORT_BS:5687}"
  123 + security:
  124 + bind_address: "${LWM2M_BIND_ADDRESS_BS:0.0.0.0}"
  125 + bind_port: "${LWM2M_BIND_PORT_SECURITY_BS:5688}"
149 # Only for RPK: Public & Private Key. If the keystore file is missing or not working 126 # Only for RPK: Public & Private Key. If the keystore file is missing or not working
150 - # - Elliptic Curve parameters : [secp256r1 [NIST P-256, X9.62 prime256v1] (1.2.840.10045.3.1.7)]  
151 - # - Public Key (Hex): [3059301306072a8648ce3d020106082a8648ce3d030107034200045017c87a1c1768264656b3b355434b0def6edb8b9bf166a4762d9930cd730f913fc4e61bcd8901ec27c424114c3e887ed372497f0c2cf85839b8443e76988b34]  
152 - # - Private Key (Hex): [308193020100301306072a8648ce3d020106082a8648ce3d0301070479307702010104205ecafd90caa7be45c42e1f3f32571632b8409e6e6249d7124f4ba56fab3c8083a00a06082a8648ce3d030107a144034200045017c87a1c1768264656b3b355434b0def6edb8b9bf166a4762d9930cd730f913fc4e61bcd8901ec27c424114c3e887ed372497f0c2cf85839b8443e76988b34],  
153 public_x: "${LWM2M_SERVER_PUBLIC_X_BS:5017c87a1c1768264656b3b355434b0def6edb8b9bf166a4762d9930cd730f91}" 127 public_x: "${LWM2M_SERVER_PUBLIC_X_BS:5017c87a1c1768264656b3b355434b0def6edb8b9bf166a4762d9930cd730f91}"
154 public_y: "${LWM2M_SERVER_PUBLIC_Y_BS:3fc4e61bcd8901ec27c424114c3e887ed372497f0c2cf85839b8443e76988b34}" 128 public_y: "${LWM2M_SERVER_PUBLIC_Y_BS:3fc4e61bcd8901ec27c424114c3e887ed372497f0c2cf85839b8443e76988b34}"
155 private_encoded: "${LWM2M_SERVER_PRIVATE_ENCODED_BS:308193020100301306072a8648ce3d020106082a8648ce3d0301070479307702010104205ecafd90caa7be45c42e1f3f32571632b8409e6e6249d7124f4ba56fab3c8083a00a06082a8648ce3d030107a144034200045017c87a1c1768264656b3b355434b0def6edb8b9bf166a4762d9930cd730f913fc4e61bcd8901ec27c424114c3e887ed372497f0c2cf85839b8443e76988b34}" 129 private_encoded: "${LWM2M_SERVER_PRIVATE_ENCODED_BS:308193020100301306072a8648ce3d020106082a8648ce3d0301070479307702010104205ecafd90caa7be45c42e1f3f32571632b8409e6e6249d7124f4ba56fab3c8083a00a06082a8648ce3d030107a144034200045017c87a1c1768264656b3b355434b0def6edb8b9bf166a4762d9930cd730f913fc4e61bcd8901ec27c424114c3e887ed372497f0c2cf85839b8443e76988b34}"
156 # Only Certificate_x509: 130 # Only Certificate_x509:
157 alias: "${LWM2M_KEYSTORE_ALIAS_BS:bootstrap}" 131 alias: "${LWM2M_KEYSTORE_ALIAS_BS:bootstrap}"
  132 + security:
  133 + # Certificate_x509:
  134 + # To get helps about files format and how to generate it, see: https://github.com/eclipse/leshan/wiki/Credential-files-format
  135 + # Create new X509 Certificates: common/transport/lwm2m/src/main/resources/credentials/shell/lwM2M_credentials.sh
  136 + key_store_type: "${LWM2M_KEYSTORE_TYPE:JKS}"
  137 + # key_store_path_file: "${KEY_STORE_PATH_FILE:/common/transport/lwm2m/src/main/resources/credentials/serverKeyStore.jks"
  138 + key_store: "${LWM2M_KEY_STORE:lwm2mserver.jks}"
  139 + key_store_password: "${LWM2M_KEY_STORE_PASSWORD:server_ks_password}"
  140 + root_alias: "${LWM2M_SERVER_ROOT_CA:rootca}"
  141 + enable_gen_new_key_psk_rpk: "${ENABLE_GEN_NEW_KEY_PSK_RPK:false}"
  142 + timeout: "${LWM2M_TIMEOUT:120000}"
  143 + recommended_ciphers: "${LWM2M_RECOMMENDED_CIPHERS:false}"
  144 + recommended_supported_groups: "${LWM2M_RECOMMENDED_SUPPORTED_GROUPS:true}"
  145 + response_pool_size: "${LWM2M_RESPONSE_POOL_SIZE:100}"
  146 + registered_pool_size: "${LWM2M_REGISTERED_POOL_SIZE:10}"
  147 + update_registered_pool_size: "${LWM2M_UPDATE_REGISTERED_POOL_SIZE:10}"
  148 + un_registered_pool_size: "${LWM2M_UN_REGISTERED_POOL_SIZE:10}"
  149 + log_max_length: "${LWM2M_LOG_MAX_LENGTH:100}"
158 # Use redis for Security and Registration stores 150 # Use redis for Security and Registration stores
159 redis.enabled: "${LWM2M_REDIS_ENABLED:false}" 151 redis.enabled: "${LWM2M_REDIS_ENABLED:false}"
160 152
@@ -26,7 +26,7 @@ import java.util.Arrays; @@ -26,7 +26,7 @@ import java.util.Arrays;
26 @SpringBootConfiguration 26 @SpringBootConfiguration
27 @EnableAsync 27 @EnableAsync
28 @EnableScheduling 28 @EnableScheduling
29 -@ComponentScan({"org.thingsboard.server.snmp", "org.thingsboard.server.common", "org.thingsboard.server.transport.snmp", "org.thingsboard.server.queue"}) 29 +@ComponentScan({"org.thingsboard.server.snmp", "org.thingsboard.server.common", "org.thingsboard.server.transport.snmp", "org.thingsboard.server.queue", "org.thingsboard.server.cache"})
30 public class ThingsboardSnmpTransportApplication { 30 public class ThingsboardSnmpTransportApplication {
31 31
32 private static final String SPRING_CONFIG_NAME_KEY = "--spring.config.name"; 32 private static final String SPRING_CONFIG_NAME_KEY = "--spring.config.name";