Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ i...

chenshijun

2019-03-07 7e58157f116d5dde56ac21f1be8cb67457b8b625

 QiaoJiaSystem/DataManagerServer/vss/dao/BaseDao.h

@@ -8,11 +8,15 @@
#include <iostream>
#include <mysql++.h>
#include <AppConfig.h>
#include <QtCore/QMutex>

using namespace std;

static mysqlpp::Connection* conn;
class BaseDao {
public:
    static QMutex m_mutexVisit;
private:
    static mysqlpp::Connection* conn;
public:
    static mysqlpp::SimpleResult add(std::map<std::string, std::string>& columns, string tableName) {
        initConnection();
@@ -126,20 +130,20 @@
        return updateSql;
    }
    static void doConnect() {
        //            if (conn->connect(
//                    appConfig.getStringProperty("database").c_str(),
//                    appConfig.getStringProperty("db_host").c_str(),
//                    appConfig.getStringProperty("db_user").c_str(),
//                    appConfig.getStringProperty("db_password").c_str(),
//                    appConfig.getIntProperty("db_port")
//            )) {
        if (conn->connect(
                "EGEyesForVSS",
                "127.0.0.1",
                "root",
                "123456",
                3306
            appConfig.getStringProperty("database").c_str(),
            appConfig.getStringProperty("db_host").c_str(),
            appConfig.getStringProperty("db_user").c_str(),
            appConfig.getStringProperty("db_password").c_str(),
            appConfig.getIntProperty("db_port")
        )) {
//        if (conn->connect(
//                "EGEyesForVSS",
//                "192.168.1.148",
//                "root",
//                "123456",
//                3306
//        )) {
            cout << "connect success" << endl;
        } else {
            cout << "connect failed" << endl;