comparison: src/bmsapp.cpp
src/bmsapp.cpp
- changeset 89
- 231a0b1292f3
- parent 85
- 34ca34ed81df
equal
deleted
inserted
replaced
| 88:64cf5468fd22 | 89:231a0b1292f3 |
|---|---|
| 68 dbProd.user = settings.value("user").toString(); | 68 dbProd.user = settings.value("user").toString(); |
| 69 dbProd.pass = settings.value("pass").toString(); | 69 dbProd.pass = settings.value("pass").toString(); |
| 70 dbProd.charset = settings.value("charset").toString(); | 70 dbProd.charset = settings.value("charset").toString(); |
| 71 } | 71 } |
| 72 settings.endGroup(); | 72 settings.endGroup(); |
| 73 qDebug() << dbProd.host << dbProd.port << dbProd.name << dbProd.pass; | 73 qDebug() << "MySQL prod" << dbProd.host << dbProd.port << dbProd.name << dbProd.pass; |
| 74 | 74 |
| 75 settings.beginGroup("dbdev"); | 75 settings.beginGroup("dbdev"); |
| 76 dbDev.host = settings.value("host").toString(); | 76 dbDev.host = settings.value("host").toString(); |
| 77 if (dbDev.host.isEmpty()) { | 77 if (dbDev.host.isEmpty()) { |
| 78 dbDev.host = "localhost"; | 78 dbDev.host = "localhost"; |
| 93 dbDev.user = settings.value("user").toString(); | 93 dbDev.user = settings.value("user").toString(); |
| 94 dbDev.pass = settings.value("pass").toString(); | 94 dbDev.pass = settings.value("pass").toString(); |
| 95 dbDev.charset = settings.value("charset").toString(); | 95 dbDev.charset = settings.value("charset").toString(); |
| 96 } | 96 } |
| 97 settings.endGroup(); | 97 settings.endGroup(); |
| 98 qDebug() << dbDev.host << dbDev.port << dbDev.name << dbDev.pass; | 98 qDebug() << "MySQL dev" << dbDev.host << dbDev.port << dbDev.name << dbDev.pass; |
| 99 | |
| 100 settings.beginGroup("mqttprod"); | |
| 101 mqttProd.host = settings.value("host").toString(); | |
| 102 if (mqttProd.host.isEmpty()) { | |
| 103 mqttProd.host = "localhost"; | |
| 104 mqttProd.port = "1883"; | |
| 105 mqttProd.user = "nobody"; | |
| 106 mqttProd.pass = "secret"; | |
| 107 settings.setValue("host", mqttProd.host); | |
| 108 settings.setValue("port", mqttProd.port); | |
| 109 settings.setValue("user", mqttProd.user); | |
| 110 settings.setValue("pass", mqttProd.pass); | |
| 111 } else { | |
| 112 mqttProd.port = settings.value("port").toString(); | |
| 113 mqttProd.user = settings.value("user").toString(); | |
| 114 mqttProd.pass = settings.value("pass").toString(); | |
| 115 } | |
| 116 settings.endGroup(); | |
| 117 qDebug() << "MQTT prod" << mqttProd.host << mqttProd.port << mqttProd.user << mqttProd.pass; | |
| 118 | |
| 119 settings.beginGroup("mqttdev"); | |
| 120 mqttDev.host = settings.value("host").toString(); | |
| 121 if (mqttDev.host.isEmpty()) { | |
| 122 mqttDev.host = "localhost"; | |
| 123 mqttDev.port = "1883"; | |
| 124 mqttDev.user = "nobody"; | |
| 125 mqttDev.pass = "secret"; | |
| 126 settings.setValue("host", mqttDev.host); | |
| 127 settings.setValue("port", mqttDev.port); | |
| 128 settings.setValue("user", mqttDev.user); | |
| 129 settings.setValue("pass", mqttDev.pass); | |
| 130 } else { | |
| 131 mqttDev.port = settings.value("port").toString(); | |
| 132 mqttDev.user = settings.value("user").toString(); | |
| 133 mqttDev.pass = settings.value("pass").toString(); | |
| 134 } | |
| 135 settings.endGroup(); | |
| 136 qDebug() << "MQTT dev" << mqttDev.host << mqttDev.port << mqttDev.user << mqttDev.pass; | |
| 99 } | 137 } |
| 100 | 138 |
| 101 | 139 |
| 102 void Bmsapp::writesettings() | 140 void Bmsapp::writesettings() |
| 103 { | 141 { |
| 118 settings.setValue("name", dbDev.name); | 156 settings.setValue("name", dbDev.name); |
| 119 settings.setValue("user", dbDev.user); | 157 settings.setValue("user", dbDev.user); |
| 120 settings.setValue("pass", dbDev.pass); | 158 settings.setValue("pass", dbDev.pass); |
| 121 settings.setValue("charset", dbDev.charset); | 159 settings.setValue("charset", dbDev.charset); |
| 122 settings.endGroup(); | 160 settings.endGroup(); |
| 161 | |
| 162 settings.beginGroup("mqttprod"); | |
| 163 settings.setValue("host", mqttProd.host); | |
| 164 settings.setValue("port", mqttProd.port); | |
| 165 settings.setValue("user", mqttProd.user); | |
| 166 settings.setValue("pass", mqttProd.pass); | |
| 167 settings.endGroup(); | |
| 168 | |
| 169 settings.beginGroup("mqttdev"); | |
| 170 settings.setValue("host", mqttDev.host); | |
| 171 settings.setValue("port", mqttDev.port); | |
| 172 settings.setValue("user", mqttDev.user); | |
| 173 settings.setValue("pass", mqttDev.pass); | |
| 174 settings.endGroup(); | |
| 175 | |
| 123 qDebug() << "writesettings() done."; | 176 qDebug() << "writesettings() done."; |
| 124 } | 177 } |
| 125 | 178 |
| 126 | 179 |
| 127 int Bmsapp::run(bool useDevelop, bool startConfig) { | 180 int Bmsapp::run(bool useDevelop, bool startConfig) { |
