Skip to content

Commit 427e61b

Browse files
savonarolasavonarola
committed
feat: fix minor schema issues
1 parent 3f12556 commit 427e61b

File tree

3 files changed

+94
-36
lines changed

3 files changed

+94
-36
lines changed

‎priv/config.hocon‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,36 @@ mysql {
22
enable = false
33
ssl {
44
enable = false
5+
server_name_indication = "mysql-server"
6+
verify = "verify_peer"
7+
cacertfile = "/certs/ca.crt"
8+
certfile = "/certs/mysql-client.crt"
9+
keyfile = "/certs/mysql-client.key"
510
}
611
server = "mysql:3306"
712
pool_size = 8
813
username = "emqx"
914
password = "public"
1015
database = "emqx"
11-
insert_message_sql = "insert into mqtt_msg(msgid, sender, topic, qos, retain, payload, arrived) values(${id}, ${clientid}, ${topic}, ${qos}, ${retain}, ${payload}, FROM_UNIXTIME(${timestamp}/1000))"
16+
insert_message_sql = "insert into mqtt_msg(msgid, sender, topic, qos, retain, payload, arrived) values(${id}, ${from}, ${topic}, ${qos}, ${flags.retain}, ${payload}, FROM_UNIXTIME(${timestamp}/1000))"
1217
delete_message_sql = "delete from mqtt_msg where msgid = ${id}"
13-
select_message_sql = "select * from mqtt_msg where msgid = ${id}"
18+
select_message_sql = "select * from mqtt_msg where topic = ${topic}"
1419
insert_subscription_sql = "insert into mqtt_sub(clientid, topic, qos) values(${clientid}, ${topic}, ${qos}) on duplicate key update qos = ${qos}"
1520
select_subscriptions_sql = "select topic, qos from mqtt_sub where clientid = ${clientid}"
1621
batch_size = 1
1722
batch_time = 100
23+
query_mode = "sync"
1824
}
1925

2026
redis {
2127
enable = false
2228
ssl {
2329
enable = false
30+
server_name_indication = "redis-server"
31+
verify = "verify_peer"
32+
cacertfile = "/certs/ca.crt"
33+
certfile = "/certs/redis-client.crt"
34+
keyfile = "/certs/redis-client.key"
2435
}
2536
servers = "redis:6379"
2637
redis_type = "single"
@@ -33,6 +44,7 @@ redis {
3344
database = 0
3445
batch_size = 1
3546
batch_time = 100
47+
query_mode = "sync"
3648
}
3749

3850

‎priv/config_i18n.json‎

Lines changed: 48 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,40 +8,40 @@
88
"zh": "启用 MySQL 集成"
99
},
1010
"$mysql_insert_message_sql_label": {
11-
"en": "Insert Message SQL",
12-
"zh": "插入消息 SQL"
11+
"en": "MySQL Insert Message SQL",
12+
"zh": "MySQL 插入消息 SQL"
1313
},
1414
"$mysql_insert_message_sql_desc": {
1515
"en": "SQL statement for inserting messages",
1616
"zh": "用于插入消息的 SQL 语句"
1717
},
1818
"$mysql_delete_message_sql_label": {
19-
"en": "Delete Message SQL",
20-
"zh": "删除消息 SQL"
19+
"en": "MySQL Delete Message SQL",
20+
"zh": "MySQL 删除消息 SQL"
2121
},
2222
"$mysql_delete_message_sql_desc": {
2323
"en": "SQL statement for deleting messages",
2424
"zh": "用于删除消息的 SQL 语句"
2525
},
2626
"$mysql_select_message_sql_label": {
27-
"en": "Select Message SQL",
28-
"zh": "查询消息 SQL"
27+
"en": "MySQL Select Message SQL",
28+
"zh": "MySQL 查询消息 SQL"
2929
},
3030
"$mysql_select_message_sql_desc": {
3131
"en": "SQL statement for retrieving messages",
3232
"zh": "用于检索消息的 SQL 语句"
3333
},
3434
"$mysql_insert_subscription_sql_label": {
35-
"en": "Insert Subscription SQL",
36-
"zh": "插入订阅 SQL"
35+
"en": "MySQL Insert Subscription SQL",
36+
"zh": "MySQL 插入订阅 SQL"
3737
},
3838
"$mysql_insert_subscription_sql_desc": {
3939
"en": "SQL statement for inserting subscriptions",
4040
"zh": "用于插入订阅的 SQL 语句"
4141
},
4242
"$mysql_select_subscriptions_sql_label": {
43-
"en": "Select Subscriptions SQL",
44-
"zh": "查询订阅 SQL"
43+
"en": "MySQL Select Subscriptions SQL",
44+
"zh": "MySQL 查询订阅 SQL"
4545
},
4646
"$mysql_select_subscriptions_sql_desc": {
4747
"en": "SQL statement for retrieving subscriptions",
@@ -103,6 +103,14 @@
103103
"en": "Maximum time in milliseconds to wait before writing a batch",
104104
"zh": "写入批量数据前等待的最大时间（毫秒）"
105105
},
106+
"$mysql_query_mode_label": {
107+
"en": "MySQL Query Mode",
108+
"zh": "MySQL 查询模式"
109+
},
110+
"$mysql_query_mode_desc": {
111+
"en": "Query mode (Sync/Async)",
112+
"zh": "查询模式 (同步/异步)"
113+
},
106114
"$mysql_ssl_enable_label": {
107115
"en": "MySQL SSL Enable",
108116
"zh": "MySQL SSL 启用"
@@ -210,88 +218,96 @@
210218
"zh": "Redis 连接池大小"
211219
},
212220
"$redis_message_key_prefix_label": {
213-
"en": "Message Key Prefix",
214-
"zh": "消息键前缀"
221+
"en": "Redis Message Key Prefix",
222+
"zh": "Redis 消息键前缀"
215223
},
216224
"$redis_message_key_prefix_desc": {
217225
"en": "Prefix for message keys in Redis",
218226
"zh": "Redis 中消息键的前缀"
219227
},
220228
"$redis_subscription_key_prefix_label": {
221-
"en": "Subscription Key Prefix",
222-
"zh": "订阅键前缀"
229+
"en": "Redis Subscription Key Prefix",
230+
"zh": "Redis 订阅键前缀"
223231
},
224232
"$redis_subscription_key_prefix_desc": {
225233
"en": "Prefix for subscription keys in Redis",
226234
"zh": "Redis 中订阅键的前缀"
227235
},
228236
"$redis_message_ttl_label": {
229-
"en": "Message TTL",
230-
"zh": "消息存活时间"
237+
"en": "Redis Message TTL",
238+
"zh": "Redis 消息存活时间"
231239
},
232240
"$redis_message_ttl_desc": {
233241
"en": "Time to live for messages in seconds",
234242
"zh": "消息的存活时间（秒）"
235243
},
236244
"$redis_batch_size_label": {
237-
"en": "Batch Size",
238-
"zh": "批量大小"
245+
"en": "Redis Batch Size",
246+
"zh": "Redis 批量大小"
239247
},
240248
"$redis_batch_size_desc": {
241249
"en": "Number of messages to batch before writing",
242250
"zh": "写入前批量处理的消息数量"
243251
},
244252
"$redis_batch_time_label": {
245-
"en": "Batch Time",
246-
"zh": "批量时间"
253+
"en": "Redis Batch Time",
254+
"zh": "Redis 批量时间"
247255
},
248256
"$redis_batch_time_desc": {
249257
"en": "Maximum time in milliseconds to wait before writing a batch",
250258
"zh": "写入批量数据前等待的最大时间（毫秒）"
251259
},
260+
"$redis_query_mode_label": {
261+
"en": "Redis Query Mode",
262+
"zh": "Redis 查询模式"
263+
},
264+
"$redis_query_mode_desc": {
265+
"en": "Query mode (Sync/Async)",
266+
"zh": "查询模式 (同步/异步)"
267+
},
252268
"$redis_ssl_enable_label": {
253-
"en": "Enable SSL",
254-
"zh": "启用 SSL"
269+
"en": "Redis SSL Enable",
270+
"zh": "Redis SSL 启用"
255271
},
256272
"$redis_ssl_enable_desc": {
257273
"en": "Enable SSL/TLS connection",
258274
"zh": "启用 SSL/TLS 连接"
259275
},
260276
"$redis_ssl_server_name_indication_label": {
261-
"en": "SSL Server Name Indication",
262-
"zh": "SSL 服务器名称指示"
277+
"en": "Redis SSL Server Name Indication",
278+
"zh": "Redis SSL 服务器名称指示"
263279
},
264280
"$redis_ssl_server_name_indication_desc": {
265281
"en": "SSL Server Name Indication (SNI)",
266282
"zh": "SSL 服务器名称指示 (SNI)"
267283
},
268284
"$redis_ssl_verify_label": {
269-
"en": "SSL Verify",
270-
"zh": "SSL 验证"
285+
"en": "Redis SSL Verify",
286+
"zh": "Redis SSL 验证"
271287
},
272288
"$redis_ssl_verify_desc": {
273289
"en": "SSL verification level",
274290
"zh": "SSL 验证级别"
275291
},
276292
"$redis_ssl_cacertfile_label": {
277-
"en": "SSL CA Certificate",
278-
"zh": "SSL CA 证书"
293+
"en": "Redis SSL CA Certificate",
294+
"zh": "Redis SSL CA 证书"
279295
},
280296
"$redis_ssl_cacertfile_desc": {
281297
"en": "Path to SSL CA certificate file",
282298
"zh": "SSL CA 证书文件路径"
283299
},
284300
"$redis_ssl_certfile_label": {
285-
"en": "SSL Certificate",
286-
"zh": "SSL 证书"
301+
"en": "Redis SSL Certificate",
302+
"zh": "Redis SSL 证书"
287303
},
288304
"$redis_ssl_certfile_desc": {
289305
"en": "Path to SSL certificate file",
290306
"zh": "SSL 证书文件路径"
291307
},
292308
"$redis_ssl_keyfile_label": {
293-
"en": "SSL Key File",
294-
"zh": "SSL 密钥文件"
309+
"en": "Redis SSL Key File",
310+
"zh": "Redis SSL 密钥文件"
295311
},
296312
"$redis_ssl_keyfile_desc": {
297313
"en": "Path to SSL key file",

‎priv/config_schema.avsc‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,22 @@
151151
"description": "$mysql_batch_time_desc"
152152
}
153153
},
154-
{
154+
{
155+
"name": "query_mode",
156+
"type": "string",
157+
"default": "sync",
158+
"$ui": {
159+
"component": "select",
160+
"required": true,
161+
"label": "$mysql_query_mode_label",
162+
"description": "$mysql_query_mode_desc",
163+
"options": [
164+
{ "label": "Sync", "value": "sync" },
165+
{ "label": "Async", "value": "async" }
166+
]
167+
}
168+
},
169+
{
155170
"name": "ssl",
156171
"type": {
157172
"type": "record",
@@ -311,7 +326,7 @@
311326
"default": "",
312327
"$ui": {
313328
"component": "input",
314-
"required": true,
329+
"required": false,
315330
"label": "$redis_username_label",
316331
"description": "$redis_username_desc"
317332
}
@@ -382,6 +397,21 @@
382397
"description": "$redis_batch_time_desc"
383398
}
384399
},
400+
{
401+
"name": "query_mode",
402+
"type": "string",
403+
"default": "sync",
404+
"$ui": {
405+
"component": "select",
406+
"required": true,
407+
"label": "$redis_query_mode_label",
408+
"description": "$redis_query_mode_desc",
409+
"options": [
410+
{ "label": "Sync", "value": "sync" },
411+
{ "label": "Async", "value": "async" }
412+
]
413+
}
414+
},
385415
{
386416
"name": "ssl",
387417
"type": {

0 commit comments

Comments
 (0)