diff --git a/Makefile b/Makefile index 4569704..8236dee 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ .PHONY: runner run test lint apk ipa build-web -WEB_API_URL ?= https://jinzhi.api.local +WEB_API_URL ?= https://jinzhi.api.yqzhice.top WEB_BASE_HREF ?= /flutter/ GITVERSION := $(shell git describe --tags --always --dirty 2>/dev/null || git rev-parse --short HEAD) COMMON_DART_DEFINES := --dart-define=GITVERSION=$(GITVERSION) diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index ce70da5..f72c60c 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -23,7 +23,7 @@ fun requireSigningProperty(name: String): String { } android { - namespace = "com.jinzhi.app" + namespace = "com.jinzhi.butler" compileSdk = flutter.compileSdkVersion ndkVersion = flutter.ndkVersion @@ -47,7 +47,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId = "com.jinzhi.app" + applicationId = "com.jinzhi.butler" // You can update the following values to match your application needs. // For more information, see: https://flutter.dev/to/review-gradle-config. minSdk = flutter.minSdkVersion diff --git a/android/app/files/jinzhi.jks b/android/app/files/jinzhi.jks index 22af8aa..addc3da 100644 Binary files a/android/app/files/jinzhi.jks and b/android/app/files/jinzhi.jks differ diff --git a/android/app/src/main/kotlin/com/jinzhi/app/MainActivity.kt b/android/app/src/main/kotlin/com/jinzhi/butler/MainActivity.kt similarity index 78% rename from android/app/src/main/kotlin/com/jinzhi/app/MainActivity.kt rename to android/app/src/main/kotlin/com/jinzhi/butler/MainActivity.kt index d7d0fe6..4cec161 100644 --- a/android/app/src/main/kotlin/com/jinzhi/app/MainActivity.kt +++ b/android/app/src/main/kotlin/com/jinzhi/butler/MainActivity.kt @@ -1,4 +1,4 @@ -package com.jinzhi.app +package com.jinzhi.butler import io.flutter.embedding.android.FlutterActivity diff --git a/lib/common/config/app_config.dart b/lib/common/config/app_config.dart index 118476e..9169b43 100644 --- a/lib/common/config/app_config.dart +++ b/lib/common/config/app_config.dart @@ -4,7 +4,7 @@ class AppConfig { factory AppConfig.fromEnvironment() { const url = String.fromEnvironment( 'JINZHI_API_BASE_URL', - defaultValue: 'https://jinzhi.api.local', + defaultValue: 'https://jinzhi.api.yqzhice.top', ); return const AppConfig(apiBaseUrl: url); } diff --git a/scripts/build_web.sh b/scripts/build_web.sh index b212c50..e285583 100755 --- a/scripts/build_web.sh +++ b/scripts/build_web.sh @@ -5,7 +5,7 @@ # BASE_HREF base href(默认 /flutter/) set -euo pipefail -API_BASE_URL="${API_BASE_URL:-https://jinzhi.api.local}" +API_BASE_URL="${API_BASE_URL:-https://jinzhi.api.yqzhice.top}" BASE_HREF="${BASE_HREF:-/flutter/}" echo "▶ flutter pub get"