fix
This commit is contained in:
@@ -307,7 +307,7 @@ export default class HomeScreen extends Component<any, HomeScreenState> {
|
|||||||
clientId: this.clientId || '',
|
clientId: this.clientId || '',
|
||||||
userId,
|
userId,
|
||||||
heartbeatInterval: 10000,
|
heartbeatInterval: 10000,
|
||||||
reconnectInterval: 5000,
|
reconnectInterval: 2000,
|
||||||
reconnectMaxAttempts: Infinity,
|
reconnectMaxAttempts: Infinity,
|
||||||
registerFcmToken: (clientId, fcmToken) => Api.instance.registerFcmToken(clientId, fcmToken),
|
registerFcmToken: (clientId, fcmToken) => Api.instance.registerFcmToken(clientId, fcmToken),
|
||||||
onConnected: () => this.setState({ proxyStatus: 'connected' }),
|
onConnected: () => this.setState({ proxyStatus: 'connected' }),
|
||||||
|
|||||||
@@ -10,10 +10,11 @@ REMOTE_BASE="${REMOTE_BASE:-/home/ec2-user/walletman}"
|
|||||||
REMOTE_BIN_DIR="${REMOTE_BASE}/cmd/server"
|
REMOTE_BIN_DIR="${REMOTE_BASE}/cmd/server"
|
||||||
REMOTE_BIN="${REMOTE_BIN_DIR}/ipay.bin"
|
REMOTE_BIN="${REMOTE_BIN_DIR}/ipay.bin"
|
||||||
REMOTE_WALLETS="${REMOTE_BASE}/cmd/wallets.json"
|
REMOTE_WALLETS="${REMOTE_BASE}/cmd/wallets.json"
|
||||||
|
REMOTE_PROXIES="${REMOTE_BASE}/cmd/proxies.json"
|
||||||
REMOTE_FCM_CONFIG="${REMOTE_BIN_DIR}/config/fcm-service-account.json"
|
REMOTE_FCM_CONFIG="${REMOTE_BIN_DIR}/config/fcm-service-account.json"
|
||||||
REMOTE_LOG="${REMOTE_BASE}/walletman.log"
|
REMOTE_LOG="${REMOTE_BASE}/walletman.log"
|
||||||
REMOTE_PID="${REMOTE_BASE}/walletman.pid"
|
REMOTE_PID="${REMOTE_BASE}/walletman.pid"
|
||||||
GO_TLS_FLAG="${GO_TLS_FLAG:--tls android}"
|
GO_TLS_FLAG="${GO_TLS_FLAG:--tls golang}"
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
WALLETMAN_DIR="$(cd "${SCRIPT_DIR}/../walletman" && pwd)"
|
WALLETMAN_DIR="$(cd "${SCRIPT_DIR}/../walletman" && pwd)"
|
||||||
@@ -152,8 +153,10 @@ cmd_deploy() {
|
|||||||
trap 'rm -rf "${build_dir}"' EXIT
|
trap 'rm -rf "${build_dir}"' EXIT
|
||||||
|
|
||||||
local wallets_json="${WALLETMAN_DIR}/cmd/wallets.json"
|
local wallets_json="${WALLETMAN_DIR}/cmd/wallets.json"
|
||||||
|
local proxies_json="${WALLETMAN_DIR}/cmd/proxies.json"
|
||||||
local fcm_config="${WALLETMAN_DIR}/cmd/server/config/fcm-service-account.json"
|
local fcm_config="${WALLETMAN_DIR}/cmd/server/config/fcm-service-account.json"
|
||||||
[[ -f "${wallets_json}" ]] || die "缺少 ${wallets_json}"
|
[[ -f "${wallets_json}" ]] || die "缺少 ${wallets_json}"
|
||||||
|
[[ -f "${proxies_json}" ]] || die "缺少 ${proxies_json}"
|
||||||
[[ -f "${fcm_config}" ]] || die "缺少 ${fcm_config}"
|
[[ -f "${fcm_config}" ]] || die "缺少 ${fcm_config}"
|
||||||
|
|
||||||
log "构建 linux/amd64 二进制..."
|
log "构建 linux/amd64 二进制..."
|
||||||
@@ -164,6 +167,7 @@ cmd_deploy() {
|
|||||||
)
|
)
|
||||||
cp -R "${WALLETMAN_DIR}/test/." "${staging}/test/"
|
cp -R "${WALLETMAN_DIR}/test/." "${staging}/test/"
|
||||||
cp "${wallets_json}" "${staging}/cmd/wallets.json"
|
cp "${wallets_json}" "${staging}/cmd/wallets.json"
|
||||||
|
cp "${proxies_json}" "${staging}/cmd/proxies.json"
|
||||||
cp "${fcm_config}" "${staging}/config/fcm-service-account.json"
|
cp "${fcm_config}" "${staging}/config/fcm-service-account.json"
|
||||||
if [[ "$(uname -s)" == Darwin ]]; then
|
if [[ "$(uname -s)" == Darwin ]]; then
|
||||||
xattr -cr "${staging}" 2>/dev/null || true
|
xattr -cr "${staging}" 2>/dev/null || true
|
||||||
@@ -188,6 +192,7 @@ REMOTE_BASE="${REMOTE_BASE}"
|
|||||||
REMOTE_BIN_DIR="${REMOTE_BIN_DIR}"
|
REMOTE_BIN_DIR="${REMOTE_BIN_DIR}"
|
||||||
REMOTE_BIN="${REMOTE_BIN}"
|
REMOTE_BIN="${REMOTE_BIN}"
|
||||||
REMOTE_WALLETS="${REMOTE_WALLETS}"
|
REMOTE_WALLETS="${REMOTE_WALLETS}"
|
||||||
|
REMOTE_PROXIES="${REMOTE_PROXIES}"
|
||||||
REMOTE_FCM_CONFIG="${REMOTE_FCM_CONFIG}"
|
REMOTE_FCM_CONFIG="${REMOTE_FCM_CONFIG}"
|
||||||
|
|
||||||
mkdir -p "\${REMOTE_BIN_DIR}" "\${REMOTE_BASE}/cmd" "\${REMOTE_BASE}/test" "\${REMOTE_BIN_DIR}/config"
|
mkdir -p "\${REMOTE_BIN_DIR}" "\${REMOTE_BASE}/cmd" "\${REMOTE_BASE}/test" "\${REMOTE_BIN_DIR}/config"
|
||||||
@@ -208,6 +213,7 @@ if [[ -f "\${REMOTE_WALLETS}" ]]; then
|
|||||||
cp "\${REMOTE_WALLETS}" "\${REMOTE_WALLETS}.bak.\$(date +%Y%m%d%H%M%S)"
|
cp "\${REMOTE_WALLETS}" "\${REMOTE_WALLETS}.bak.\$(date +%Y%m%d%H%M%S)"
|
||||||
fi
|
fi
|
||||||
install -m 644 cmd/wallets.json "\${REMOTE_WALLETS}"
|
install -m 644 cmd/wallets.json "\${REMOTE_WALLETS}"
|
||||||
|
install -m 600 cmd/proxies.json "\${REMOTE_PROXIES}"
|
||||||
install -m 600 config/fcm-service-account.json "\${REMOTE_FCM_CONFIG}"
|
install -m 600 config/fcm-service-account.json "\${REMOTE_FCM_CONFIG}"
|
||||||
rm -f "\${REMOTE_BIN_DIR}/wallets.json"
|
rm -f "\${REMOTE_BIN_DIR}/wallets.json"
|
||||||
EOF
|
EOF
|
||||||
@@ -218,6 +224,7 @@ EOF
|
|||||||
log "部署完成: ${TARGET_HOST}:${REMOTE_BIN}"
|
log "部署完成: ${TARGET_HOST}:${REMOTE_BIN}"
|
||||||
log "wallets.json → ${REMOTE_WALLETS}"
|
log "wallets.json → ${REMOTE_WALLETS}"
|
||||||
log "fcm config → ${REMOTE_FCM_CONFIG}"
|
log "fcm config → ${REMOTE_FCM_CONFIG}"
|
||||||
|
log "proxies.json → ${REMOTE_PROXIES}"
|
||||||
}
|
}
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
|
|||||||
Reference in New Issue
Block a user