部署工具优化

Tools/Flyinsono.Deployment/lib/PublishProcessView.dart

@@ -37,6 +37,8 @@ class _PublishProcessViewState extends State<PublishProcessView> {
   String installDirectory = "D:/WingServer";
   final TextEditingController _directoryController = TextEditingController();
   String domain = "";
+  int getwayPort = 8303;
+  int remotePort = 9304;
   String ipAddress = ""; //IP+端口
   String remoteDeployServerIp = ""; //IP+端口
   String emailAccount = '';
@@ -90,8 +92,9 @@ class _PublishProcessViewState extends State<PublishProcessView> {
 
   Future<void> _startDeployment(BuildContext context) async {
     setState(() {
+      _fetchIpAddress();
       _isInstallDirectoryValid = isValidPath(installDirectory);
-      _isIpValid = isValidIPAndPort(ipAddress);
+      _isIpValid = getwayPort > 0;
       _isEmailValid = emailAccount.trim() != '' && isEmail(emailAccount);
       _isEmailServerValid = emailServer.trim() != '';
       _isEmailPortValid = smtpPort > 0;
@@ -105,7 +108,7 @@ class _PublishProcessViewState extends State<PublishProcessView> {
         _isCFSServerUrlValid = cfsServerUrl.trim() != '';
       }
       if (isRemoteDeployable) {
-        _isRemoteDeployServerIpValid = isValidIPAndPort(remoteDeployServerIp);
+        _isRemoteDeployServerIpValid = remotePort > 0;
       }
       _isShareDirectoryValid = isValidPath(shareDirectory);
     });
@@ -219,8 +222,8 @@ class _PublishProcessViewState extends State<PublishProcessView> {
   void _fetchIpAddress() async {
     String? ipAddress = await _publishService.getLocalIPv4Address();
     setState(() {
-      this.ipAddress = (ipAddress ?? "127.0.0.1") + ":8303";
-      this.remoteDeployServerIp = (ipAddress ?? "127.0.0.1") + ":8305";
+      this.ipAddress = (ipAddress ?? "127.0.0.1") + ":$getwayPort";
+      this.remoteDeployServerIp = (ipAddress ?? "127.0.0.1") + ":$remotePort";
     });
   }
 
@@ -389,12 +392,12 @@ class _PublishProcessViewState extends State<PublishProcessView> {
                 SizedBox(
                   height: 40,
                   child: TextFormField(
-                    controller: TextEditingController(text: ipAddress),
+                    initialValue: getwayPort.toString(),
                     decoration: InputDecoration(
                       contentPadding:
                           EdgeInsets.symmetric(vertical: 0.0, horizontal: 10),
-                      labelText: 'IP',
-                      hintText: AppLocalizations.of(context)!.ipAuto,
+                      labelText: AppLocalizations.of(context)!.getwayPort,
+                      hintText: AppLocalizations.of(context)!.getwayPort,
                       border: OutlineInputBorder(
                         borderSide: BorderSide(
                           color: Colors.grey.withOpacity(0.5),
@@ -418,9 +421,8 @@ class _PublishProcessViewState extends State<PublishProcessView> {
                     ),
                     onChanged: (value) {
                       setState(() {
-                        ipAddress = value;
-                        _isIpValid =
-                            value.trim() != '' && isValidIPAndPort(value);
+                        getwayPort = int.tryParse(value) ?? 0;
+                        _isIpValid = getwayPort > 0;
                       });
                     },
                   ),
@@ -965,13 +967,13 @@ class _PublishProcessViewState extends State<PublishProcessView> {
                   if (isRemoteDeployable) ...[
                     SizedBox(height: 18),
                     TextFormField(
-                      initialValue: remoteDeployServerIp,
+                      initialValue: remotePort.toString(),
                       decoration: InputDecoration(
                         contentPadding:
                             EdgeInsets.symmetric(vertical: 0.0, horizontal: 10),
                         labelText: AppLocalizations.of(context)!.remoteDeployIp,
                         hintText: AppLocalizations.of(context)!
-                            .remoteDeployIpHintText,
+                            .remoteDeployIp,
                         border: OutlineInputBorder(
                           borderSide: BorderSide(
                             color: Colors.grey.withOpacity(0.5),
@@ -995,9 +997,8 @@ class _PublishProcessViewState extends State<PublishProcessView> {
                       ),
                       onChanged: (value) {
                         setState(() {
-                          remoteDeployServerIp = value;
-                          _isRemoteDeployServerIpValid =
-                              value.trim() != '' && isValidIPAndPort(value);
+                          remotePort = int.tryParse(value) ?? 0;
+                          _isRemoteDeployServerIpValid = remotePort > 0;
                         });
                       },
                     ),
@@ -1231,14 +1232,14 @@ class _PublishProcessViewState extends State<PublishProcessView> {
                       },
                     ),
                   ),
-                  SizedBox(height: 35),
+                  SizedBox(height: 50),
                 ],
               ],
             ),
           ),
           if (_isDeploying)
             Container(
-              color: Colors.black.withOpacity(0.2),
+              color: Colors.black.withOpacity(0.1),
               width: MediaQuery.of(context).size.width,
               height: MediaQuery.of(context).size.height,
               child: Column(
@@ -1256,7 +1257,7 @@ class _PublishProcessViewState extends State<PublishProcessView> {
       ),
       bottomNavigationBar: _isDeploying
           ? Container(
-              color: Colors.black.withOpacity(0.2),
+              color: Colors.black.withOpacity(0.1),
               width: MediaQuery.of(context).size.width,
               height: MediaQuery.of(context).size.height,
               child: Column(
@@ -1271,10 +1272,11 @@ class _PublishProcessViewState extends State<PublishProcessView> {
               ),
             )
           : Container(
-              height: 100,
+              height: 150,
               child: Align(
                 alignment: FractionalOffset.center, // 将对齐设置为底部容器的中心
                 child: ElevatedButton(
+                  style: ElevatedButton.styleFrom(minimumSize: Size(150,50)),
                   onPressed: () => _startDeployment(context),
                   child: Text(AppLocalizations.of(context)!.startDeployment),
                 ),

Tools/Flyinsono.Deployment/lib/l10n/app_en.arb

@@ -112,5 +112,7 @@
   "selectLanguage":"Please select a language",
   "zh":"Chinese",
   "en":"English",
-  "upgrade":"upgradeSetting"
+  "upgrade":"upgradeSetting",
+  "getwayPort":"getway Port",
+  "remoteDeployIp":"remote deploy server port"
 }

Tools/Flyinsono.Deployment/lib/l10n/app_zh.arb

@@ -112,5 +112,7 @@
   "selectLanguage":"请选择语言",
   "zh":"中文",
   "en":"英文",
-  "upgrade":"检查更新配置"
+  "upgrade":"检查更新配置",
+  "getwayPort":"网关端口",
+  "remoteDeployIp":"远程服务端口"
 }

Tools/Flyinsono.Deployment/lib/main.dart

@@ -89,8 +89,8 @@ Future<void> initialize() async {
     getIt.registerSingleton<JsonRpcProxy>(rpc);
     runApp(const MyApp());
     doWhenWindowReady(() {
-      final initialSize = Size(800, 800);
-      appWindow.title = "杏聆荟部署工具";
+      final initialSize = Size(800, 900);
+      appWindow.title = "杏聆荟部署工具";//Flyinsono.Deployment.Tool  
       appWindow.minSize = initialSize;
       appWindow.maxSize = initialSize;
       appWindow.alignment = Alignment.center;

Tools/Flyinsono.Deployment/windows/runner/Runner.rc

@@ -90,12 +90,12 @@ BEGIN
         BLOCK "040904e4"
         BEGIN
             VALUE "CompanyName", "com.example" "\0"
-            VALUE "FileDescription", "杏聆荟部署工具" "\0"
+            VALUE "FileDescription", "Flyinsono.Deployment.Tool" "\0"
             VALUE "FileVersion", VERSION_AS_STRING "\0"
-            VALUE "InternalName", "杏聆荟部署工具" "\0"
+            VALUE "InternalName", "Flyinsono.Deployment.Tool" "\0"
             VALUE "LegalCopyright", "Copyright (C) 2022 com.example. All rights reserved." "\0"
-            VALUE "OriginalFilename", "杏聆荟部署工具.exe" "\0"
-            VALUE "ProductName", "杏聆荟部署工具" "\0"
+            VALUE "OriginalFilename", "Flyinsono.Deployment.Tool.exe" "\0"
+            VALUE "ProductName", "Flyinsono.Deployment.Tool" "\0"
             VALUE "ProductVersion", VERSION_AS_STRING "\0"
         END
     END