From 35eed6b5b8716b5fb4b94666ad58686e44cfccce Mon Sep 17 00:00:00 2001 From: jingyun <> Date: Thu, 18 Jun 2026 15:13:24 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9Ajinzhi=E5=8C=85=E5=90=8D=E5=92=8C?= =?UTF-8?q?=E7=AD=BE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 2 +- android/app/build.gradle.kts | 4 ++-- android/app/files/jinzhi.jks | Bin 2728 -> 2728 bytes .../jinzhi/{app => butler}/MainActivity.kt | 2 +- lib/common/config/app_config.dart | 2 +- scripts/build_web.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename android/app/src/main/kotlin/com/jinzhi/{app => butler}/MainActivity.kt (78%) 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 22af8aa5c3e54c1f9f2e3e842751fbd33fbce061..addc3da6b93363ea79773389cd34c6dc09aa837b 100644 GIT binary patch delta 2467 zcmV;U30(H56{r=Eb`*LzWH@3sX2(O^pMsm_xIv)8Kyi~X1|)w?*8n9PObPIOSCl{B zyA+%Rf&|b%LQ0R#alY8jh-qyq*T3Vq(gbj55@C%mt^w*&)_^teMS`;?@Z+XP#;LME zR1dw^5d?>9ASm{2liM$fPhuP`G21Yg$d$pw1I*$~v2mVGj)Je}=eK`?q8=;%wv>j* zXY1(#uEbU}XJ>!GhRpxyZf51!#79vD^)xLzlW}tfAhK?ZdiKAMi9r$s4DApA&62(s z z3n>nLw=zM$srH|m4avpQy6*;$`*;komT`*Z4%eoCv**2|odjzEG}2z&fhDqpa2-?r zv^O0%4zcK@ZJwf4*ZtJJlg0C^k`f*d8H)wq5rl#9Nn4)&V?p+os^(Pj$w~EipN8w9 zKuzd{#_xY}cuD+{X6x<9Hh%s`_uF$^Q~xMYo5fb}VTZ#ugvlrKH{5CEhT(?5tXm`E zG)LAl_m#2i?VV^Hw|JNGhlN>yTmUWAn5aH&FINzP?z6BFeH?jwdKrka8?0KBF9tUSo0U~ZvN zs5ZyU3+KI(mkF*p*fwnNbhB4{E0U@C3jcd4sjm~7}=e-zUJ7%zg6NaYu zTy=k$YNY%1-CB7$o57Xllj?xKLwXH0L{Yydp&b3fB|S}B>`HSMuW*ISs!^04Q;~X# zb46VpFlUSN33`4%e7rjo!fEccDNXS+-uYIen*ve^Ybhto*fJ@d7)+L0&kbOZvXBlZ zE0_fH*3(flXHT^49IMHm1QXPB29wMg?<{|NV+xVeya~J9pA5t0vA`14aK-m^gW{l5!I@c4R+gp9zKsRPk@$OdHq3JNArS2afG{t}ncJc3yKr|I zfw=KvS(cBz3-qPP^|PJk`YK!dE{1P7Yb6s$uv0oLeXk-JXXcREgP8|mjIUvI;>3T> z{(ywBMF>a-xQbU}TE}rnC$bhmAVGbzWcRp1JhCR>F~T99D8{pu196bck6=~w3^XUI zzpHgZ?SxKeok@Bus{NUCi+H+bK-fF|K+`+@5XzkX*<2thoiW+ejp-qarWi98TDPMK zKOEf8_uo+_QOUht6GP=tH#Ucz861D3a_h>zu4KOQ*Xu>r`Vy#B=}3a4BF}+r}n+CW`?lnaHkjn`w&WQWeOTteS$eod1+^ zX)t7!j3rZp=-CyF%sk|X5gX=0dM6NJDMh+2Dg%TD&xuxoV=InlV0ou_-+eHkL>&LNQUUM+YgSX zZWNO-1|)y^$VK>AC^&3=CnFK(<)3AMf&=g=TF98KG89}ZY)&qlNb9XfjQgp>$71;!S7+b!p8t;2orpW$mG&|plXD3dW@rT}vo#}lo z3w@fOOvk_V)@(7_@22N56+e*k9Opci(>u-DGq8UGRSa5xO42Au)&H`6d#$)d8*N7XEQz5ChS!P3Y>Co~Xak2^|!SHIIJiUkr+P*`% zH@0g#j3p((8>};Mp70P!e$tyc@}@0RcGv+;7nv^mHsL7a00HN$?YM&}RpxO;X~3q^ z*foFVS^L2=4FkcDEe2a?27kCtyI)*RDjoJMIa@(Px@+gjds^hHr=u{h!e!QlcwV)I z&8{8pl;GH?YEHIU3hoR?erD7LXDF7FY`qFCh(n`j74=WN5%BIhttiX4t3u&sns@wL z@=@-FEEXk2XN6l~WAT}Xw41hoJe0RpeiwfkC%yTwmsX*reAKZM>yE`tItP!@_Y78(Pd z@9lK(!NZXq?I&0K8Ccy135lf`!8?8We+D(*#n_L3{ z^S+G@*54Ie%rnO0EIl8;X9$E4@*M`G+GKFc__OZ;=sf?K-CQaX`dKlQ>7R~9>c@)HHf740yGSoS0QB(UV`(k z&*tq0k{T{@%Ru%P00dcsX()1$z}Jzvmxlge(v>uF1zl*@+s)mceF}poLeZ@UvT&-4 z*#R`O>pbMmBx&LpwAMijTN;0i@Ret{fpnbuiC=6;`h`r=i>r~Lv-4EprwfIDj2lhf zC0i-W8qXs0Ka-elqXIBpe|jY2zSA{66N07-%3SDfQ&fV2@;A5TL4 zMmd*zvL5FXp6jr+5}M}ePnkg#oD~MtSPG-JgRS>S(t$E$X#ts<7wcQ%yv7Zklp;r* zg#;upO)xPq4F(BdhDZTr0|WvA1povf$MMqR-^@Z1u#`9HZZy67w7EV*3^8j;s*Un) hrGJU51Qc`Ruq62~U`;$E8S37^DPU<)UF!k@ClC$7xOe~n delta 2467 zcmV;U30(H56{r=Eb`*f`JFl$Bd*K6S))wed|4eH2rf`!n1|)y~=IDzKE6(@J-oq6w z6@|TNmQp>-HHB(WFUOg|4dITZ)2W0YY;S8p=l3 zaa!VlEQZT5IS?g*8eKCc!ddLQHCCy>=%QjXf?aXlB6?4V+8)bR9h_YP$u(jX2PmGY ztNq_e;xcSMDE@CV^zAYLKnQanE0Rex{qI+0tjCjn$#;J^6R_hx*Nq<8xkO*r_8p~c z%M-9};vr_roNgEsNCn#$-W_Tv~5C6i9*}+1{6Ujl;HQoLDCk zJTW>Ip(|y_Ac#&eghJpj1JK#cb-A-I$<3-_zLf?WG6Uu{Bzsq&tel^SWH?*Xk2=Df z7kANJolk%9!3LJP2(0A=5_IB=HJ>yPI6eHdKWVP38zb}a{TnjuNf*OB%aCGI-A>4u z2QnIshfg+6aKWvu%C;k}zJzfY%dEOfYSJBv=-{XT&AbW@bNa-OeQfWX(d0*L9zB6YYQ@` z-JNuNP8{;$N&%YqFfQ`uq~|>X8{S*tN49}C%mlofFS*v4PrL@K`OCPMLJ**ceg8Q< zhX!m2eVhFG5n@PTGRo_+%3Y-Ttm2Z+?udPQwN}d1lv}Dy!0p&|0+v}FH=ERO%!9;) z)^LA%f<&7Z_xy-(y3A+Tc?+axC9nMlKK6e!5X5XSa|lbebiy_4n_SBMem)H$!Ol$a z@LmNK&NUN8MPt4YjU_ZPt93o;*0dKt3ax+#W?i!00@olKp(Q&*%0vcr(9vrA%}RR* z#Sc<2J*~|HwfeFy)XF*vz#gel+8CF-TlteuBn%Mx!sbGxrwNjbt#zo$**6kqXD@%6 z@DfX(tVYZ;uv?U^dXobQfU{0_l?vO4#zT5|Rm=B$4C<{)a zzCvF;o!=t7k@X0?S4OTTPAAuq9^nm_&|KZYPqQiqslt;>YDaS>&>sSde(OoNv} z15a==A)i<+Sb9;C+BH@h1~Bf_P4+4RY znT;;!;LZL)&Sp8Vbmht*tF^WfewRhtA2TjRWCjjFi_oS$7M6)Ri(fO&J0;yNM4yrB zF+eaI1_>&LNQUN)$)SpO>85ef(G4+jON#L#{^7P*Z4JKIX z9c?Se%%w{w)?RQLMMYrZ2rTj@hC*8pz1N9sX-*Q7->^GcP%?D0A#?eOOT zNu$T(vs6V{Na`pdqwo3LCfJ@p;btX9uC-C$KiD>0zO}(9i8KUU0>sf?J!?yOLm#u^ z77BkXmVmy#;8!)@OWzF}$3GG22iwJ%-5?Z#*y0-Hg#-WWa`@Q1{?tnze2RWpWTGWEHiAiIB9zAL3C zWJm}c>FfwAvOc~NQK{cLHuFo6@yspm6TnZ9yt0+`FdI7!4q23Q9W~S0g2--ew0AKKzlwS5 zeIC|z8^Ves@F589s$fS^)jCo!!w7$TaMFi?p@4LcJY?X3Ak9hT&ngF^%w*30c8v}H z1X%O^%@KbTA~j1N{l<8c9bk2ve)kugxp?`fol^%;vH+&`V<;}VM9vc#$0(i6A&5?H;NL? zE3uq6KeajOe|SK~&VNrVS(1uF!;iJ@MbP_y6fF^aZ)C*igds{I@?k!N7MAVkqLb+d z_OVlv6Y6WiJuGklPh7<>R%4IfXm@eNAd?mBz}vM|TB4A+vYg9u%uB-b#kF?ZaZp|W zo5^JazAJ|dZz5^9pMjyzbEtn^=EOMb@16T%1qe9CT`4FBg+gqmOi{Y!?0ZHz+|(V3 zlqx#+OtAKM(e`+6c&*?GbWVslE))IpMv5mhfb?{>k|7F23R?$h!U)qM7!CyuY)%eu za9IVLUl=Bv*d7QSJhWSw59FRfu(x!@qGVTsQB!Hjf79yq-lCA(p7C1&@7oR4JQZtE zX14|~O)xPq4F(BdhDZTr0|WvA1povfVFFwb(?a*Sr^rxMh;+1j3#G>&z1g|VDFJJL h9pSU81Qg%<46{7!=&JT;oBpCzU_S~wz(E26ClG-2nwkIr 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"