diff --git a/community_server/skeema/gradido_community/transaction_creations.sql b/community_server/skeema/gradido_community/transaction_creations.sql index a2ff37539..8612c764a 100644 --- a/community_server/skeema/gradido_community/transaction_creations.sql +++ b/community_server/skeema/gradido_community/transaction_creations.sql @@ -3,7 +3,7 @@ CREATE TABLE `transaction_creations` ( `transaction_id` int(10) unsigned NOT NULL, `state_user_id` int(10) unsigned NOT NULL, `amount` bigint(20) NOT NULL, - `ident_hash` binary(32) NOT NULL, + `ident_hash` binary(32) NULL, `target_date` timestamp NULL DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; diff --git a/configs/community_server/app.php b/configs/community_server/app.php index ee2244636..f0cf46220 100644 --- a/configs/community_server/app.php +++ b/configs/community_server/app.php @@ -427,6 +427,6 @@ return [ ], 'ServerAdminEmail' => 'info@gradido.net', 'noReplyEmail' => 'no-reply@gradido.net', - 'disableEmail' => false + 'disableEmail' => true ]; diff --git a/login_server/skeema/gradido_login/insert/setup_docker_group.sql b/login_server/skeema/gradido_login/insert/setup_docker_group.sql index ab600e1af..5f1b64c3f 100644 --- a/login_server/skeema/gradido_login/insert/setup_docker_group.sql +++ b/login_server/skeema/gradido_login/insert/setup_docker_group.sql @@ -1,5 +1,5 @@ INSERT INTO `groups` (`id`, `alias`, `name`, `url`, `host`, `home`, `description`) VALUES -(2, 'docker', 'docker gradido group', 'localhost', 'nginx', '/', 'gradido test group for docker and stage2 with blockchain db'); +(1, 'docker', 'docker gradido group', 'localhost', 'nginx', '/', 'gradido test group for docker and stage2 with blockchain db'); diff --git a/login_server/skeema/gradido_login/insert/setup_hedera_group.sql b/login_server/skeema/gradido_login/insert/setup_hedera_group.sql index 8dd601b97..4e227be6c 100644 --- a/login_server/skeema/gradido_login/insert/setup_hedera_group.sql +++ b/login_server/skeema/gradido_login/insert/setup_hedera_group.sql @@ -1,5 +1,5 @@ -INSERT INTO `groups` (`id`, `alias`, `name`, `url`, `home`, `description`) VALUES -(1, 'dockerStage2', 'docker stage2 gradido group', 'localhost', '/', 'gradido test group for docker and stage2'); +INSERT INTO `groups` (`id`, `alias`, `name`, `url`, `host`, `home`, `description`) VALUES +(2, 'dockerStage2', 'docker stage2 gradido group', 'localhost', 'nginx', '/', 'gradido test group for docker and stage2'); INSERT INTO `hedera_ids` (`id`, `shardNum`, `realmNum`, `num`) VALUES (1, 0, 0, 3), @@ -7,7 +7,7 @@ INSERT INTO `hedera_ids` (`id`, `shardNum`, `realmNum`, `num`) VALUES (3, 0, 0, 413151); INSERT INTO `node_servers` (`id`, `url`, `port`, `group_id`, `server_type`, `node_hedera_id`, `last_live_sign`) VALUES -(1, 'http://0.testnet.hedera.com', 50211, 0, 4, 1, '2000-01-01 00:00:00'); +(1, 'http://0.testnet.hedera.com', 50211, 0, 4, 2, '2000-01-01 00:00:00'); INSERT INTO `hedera_accounts` (`id`, `user_id`, `account_hedera_id`, `account_key_id`, `balance`, `network_type`, `updated`) VALUES (1, 1, 2, 1, 1000000000000, 1, '2021-01-07 10:22:52'); diff --git a/login_server/src/cpp/lib/JsonRequest.cpp b/login_server/src/cpp/lib/JsonRequest.cpp index 2af0a2039..c20c69898 100644 --- a/login_server/src/cpp/lib/JsonRequest.cpp +++ b/login_server/src/cpp/lib/JsonRequest.cpp @@ -136,6 +136,8 @@ JsonRequestReturn JsonRequest::request(const char* methodName, const Poco::JSON: } catch (Poco::Exception& e) { addError(new ParamError(functionName, "connect error to php server", e.displayText().data())); + addError(new ParamError(functionName, "host", mServerHost)); + addError(new ParamError(functionName, "port", mServerPort)); sendErrorsAsEmail(); return JSON_REQUEST_CONNECT_ERROR; }