refactor: 修改tco产品数据同步

LICENSE

@@ -1,208 +0,0 @@
-Apache License
-
-Version 2.0, January 2004
-
-http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION,
-AND DISTRIBUTION
-
-   1. Definitions.
-
-      
-
-"License" shall mean the terms and conditions for use, reproduction, and distribution
-as defined by Sections 1 through 9 of this document.
-
-      
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright
-owner that is granting the License.
-
-      
-
-"Legal Entity" shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, "control" means (i) the power, direct
-or indirect, to cause the direction or management of such entity, whether
-by contract or otherwise, or (ii) ownership of fifty percent (50%) or more
-of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-      
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions
-granted by this License.
-
-      
-
-"Source" form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and configuration
-files.
-
-      
-
-"Object" form shall mean any form resulting from mechanical transformation
-or translation of a Source form, including but not limited to compiled object
-code, generated documentation, and conversions to other media types.
-
-      
-
-"Work" shall mean the work of authorship, whether in Source or Object form,
-made available under the License, as indicated by a copyright notice that
-is included in or attached to the work (an example is provided in the Appendix
-below).
-
-      
-
-"Derivative Works" shall mean any work, whether in Source or Object form,
-that is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship. For the purposes of this License, Derivative
-Works shall not include works that remain separable from, or merely link (or
-bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-      
-
-"Contribution" shall mean any work of authorship, including the original version
-of the Work and any modifications or additions to that Work or Derivative
-Works thereof, that is intentionally submitted to Licensor for inclusion in
-the Work by the copyright owner or by an individual or Legal Entity authorized
-to submit on behalf of the copyright owner. For the purposes of this definition,
-"submitted" means any form of electronic, verbal, or written communication
-sent to the Licensor or its representatives, including but not limited to
-communication on electronic mailing lists, source code control systems, and
-issue tracking systems that are managed by, or on behalf of, the Licensor
-for the purpose of discussing and improving the Work, but excluding communication
-that is conspicuously marked or otherwise designated in writing by the copyright
-owner as "Not a Contribution."
-
-      
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
-of whom a Contribution has been received by Licensor and subsequently incorporated
-within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this
-License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable copyright license to reproduce, prepare
-Derivative Works of, publicly display, publicly perform, sublicense, and distribute
-the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this License,
-each Contributor hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section) patent
-license to make, have made, use, offer to sell, sell, import, and otherwise
-transfer the Work, where such license applies only to those patent claims
-licensable by such Contributor that are necessarily infringed by their Contribution(s)
-alone or by combination of their Contribution(s) with the Work to which such
-Contribution(s) was submitted. If You institute patent litigation against
-any entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that the Work or a Contribution incorporated within the Work constitutes direct
-or contributory patent infringement, then any patent licenses granted to You
-under this License for that Work shall terminate as of the date such litigation
-is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or
-Derivative Works thereof in any medium, with or without modifications, and
-in Source or Object form, provided that You meet the following conditions:
-
-(a) You must give any other recipients of the Work or Derivative Works a copy
-of this License; and
-
-(b) You must cause any modified files to carry prominent notices stating that
-You changed the files; and
-
-(c) You must retain, in the Source form of any Derivative Works that You distribute,
-all copyright, patent, trademark, and attribution notices from the Source
-form of the Work, excluding those notices that do not pertain to any part
-of the Derivative Works; and
-
-(d) If the Work includes a "NOTICE" text file as part of its distribution,
-then any Derivative Works that You distribute must include a readable copy
-of the attribution notices contained within such NOTICE file, excluding those
-notices that do not pertain to any part of the Derivative Works, in at least
-one of the following places: within a NOTICE text file distributed as part
-of the Derivative Works; within the Source form or documentation, if provided
-along with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear. The contents
-of the NOTICE file are for informational purposes only and do not modify the
-License. You may add Your own attribution notices within Derivative Works
-that You distribute, alongside or as an addendum to the NOTICE text from the
-Work, provided that such additional attribution notices cannot be construed
-as modifying the License.
-
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction,
-or distribution of Your modifications, or for any such Derivative Works as
-a whole, provided Your use, reproduction, and distribution of the Work otherwise
-complies with the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise, any
-Contribution intentionally submitted for inclusion in the Work by You to the
-Licensor shall be under the terms and conditions of this License, without
-any additional terms or conditions. Notwithstanding the above, nothing herein
-shall supersede or modify the terms of any separate license agreement you
-may have executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names,
-trademarks, service marks, or product names of the Licensor, except as required
-for reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to
-in writing, Licensor provides the Work (and each Contributor provides its
-Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied, including, without limitation, any warranties
-or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR
-A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness
-of using or redistributing the Work and assume any risks associated with Your
-exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether
-in tort (including negligence), contract, or otherwise, unless required by
-applicable law (such as deliberate and grossly negligent acts) or agreed to
-in writing, shall any Contributor be liable to You for damages, including
-any direct, indirect, special, incidental, or consequential damages of any
-character arising as a result of this License or out of the use or inability
-to use the Work (including but not limited to damages for loss of goodwill,
-work stoppage, computer failure or malfunction, or any and all other commercial
-damages or losses), even if such Contributor has been advised of the possibility
-of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the Work
-or Derivative Works thereof, You may choose to offer, and charge a fee for,
-acceptance of support, warranty, indemnity, or other liability obligations
-and/or rights consistent with this License. However, in accepting such obligations,
-You may act only on Your own behalf and on Your sole responsibility, not on
-behalf of any other Contributor, and only if You agree to indemnify, defend,
-and hold each Contributor harmless for any liability incurred by, or claims
-asserted against, such Contributor by reason of your accepting any such warranty
-or additional liability. END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets "[]" replaced with your own identifying
-information. (Don't include the brackets!) The text should be enclosed in
-the appropriate comment syntax for the file format. We also recommend that
-a file or class name and description of purpose be included on the same "printed
-page" as the copyright notice for easier identification within third-party
-archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-
-you may not use this file except in compliance with the License.
-
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-
-distributed under the License is distributed on an "AS IS" BASIS,
-
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-
-See the License for the specific language governing permissions and
-
-limitations under the License.

app/admin/controller/ReceiveProductSync.php

@@ -201,15 +201,16 @@ class ReceiveProductSync
                     throw new \Exception('产品创建失败');
                 }
             }
-            else if (strtotime($product['updated_at']) < strtotime($data['created_at'])) {
+            // 注释更新同步，防止tco同步修改官网手动调整数据
-                $product->spu         = $data['spu'];
+            // else if (strtotime($product['updated_at']) < strtotime($data['created_at'])) {
-                $product->name        = $data['name'];
+            //     $product->spu         = $data['spu'];
-                $product->category_id = $product_category['id'];
+            //     $product->name        = $data['name'];
-                $product->status      = Operate_Of_ReceiveSync::Disable == $data['operate'] ? -1 : 1;
+            //     $product->category_id = $product_category['id'];
-                if (!$product->save()) {
+            //     $product->status      = Operate_Of_ReceiveSync::Disable == $data['operate'] ? -1 : 1;
-                    throw new \Exception('产品更新失败');
+            //     if (!$product->save()) {
-                }
+            //         throw new \Exception('产品更新失败');
-            }
+            //     }
+            // }
         } catch (\Throwable $th) {
             return error(sprintf('%s %s:%d', $th->getMessage(), $th->getFile(), $th->getLine()));
         }

app/index/view/mobile/topic_laptop/index.html

@@ -1082,18 +1082,18 @@
         const allVideos = document.querySelectorAll('.fs-video');
         const fsBox = document.querySelector('.fs-box');
         let isVideoPlaying = false;
-        let videoTip = null;
+        // let videoTip = null;
 
         // 初始化视频提示
-        const initVideoTip = () =>
+        // const initVideoTip = () =>
-        {
+        // {
-            if (!fsBox || videoTip) return;
+        //     if (!fsBox || videoTip) return;
-            videoTip = document.createElement('div');
+        //     videoTip = document.createElement('div');
-            videoTip.className = 'video-tip';
+        //     videoTip.className = 'video-tip';
-            videoTip.innerText = '点击播放视频';
+        //     videoTip.innerText = '点击播放视频';
-            fsBox.appendChild(videoTip);
+        //     fsBox.appendChild(videoTip);
-            videoTip.style.display = 'none';
+        //     videoTip.style.display = 'none';
-        };
+        // };
 
         // 停止所有视频（仅暂停，无显隐）
         function stopAllVideos ()
@@ -1103,7 +1103,7 @@
                 video.pause(); // 仅暂停，删除display修改
             });
             isVideoPlaying = false;
-            if (videoTip) videoTip.style.display = 'none';
+            // if (videoTip) videoTip.style.display = 'none';
         }
 
         // 播放指定视频（仅播放，无显隐）
@@ -1117,17 +1117,17 @@
             video.play().then(() =>
             {
                 isVideoPlaying = true;
-                if (videoTip) videoTip.style.display = 'none';
+                // if (videoTip) videoTip.style.display = 'none';
             }).catch((err) =>
             {
                 console.log('视频自动播放失败：', err);
-                if (videoTip) videoTip.style.display = 'block';
+                // if (videoTip) videoTip.style.display = 'block';
                 // 点击视频手动播放（仅执行一次）
                 video.addEventListener('click', () =>
                 {
                     video.play();
                     isVideoPlaying = true;
-                    if (videoTip) videoTip.style.display = 'none';
+                    // if (videoTip) videoTip.style.display = 'none';
                 }, { once: true });
             });
         };
@@ -1180,7 +1180,7 @@
         };
 
         // 初始化执行
-        initVideoTip();
+        // initVideoTip();
         window.addEventListener('scroll', handleVideoScroll, { passive: true });
         window.addEventListener('resize', handleVideoResize);
         // 页面加载完成后尝试播放视频

app/index/view/pc/topic_laptop/index.html

@@ -1037,17 +1037,17 @@
         const allVideos = document.querySelectorAll('.fs-video');
         const fsBox = document.querySelector('.fs-box');
         let isVideoPlaying = false;
-        let videoTip = null;
+        // let videoTip = null;
 
         // 初始化视频提示
-        const initVideoTip = () => {
+        // const initVideoTip = () => {
-            if (!fsBox || videoTip) return;
+        //     if (!fsBox || videoTip) return;
-            videoTip = document.createElement('div');
+        //     videoTip = document.createElement('div');
-            videoTip.className = 'video-tip';
+        //     videoTip.className = 'video-tip';
-            videoTip.innerText = '点击播放视频';
+        //     videoTip.innerText = '点击播放视频';
-            fsBox.appendChild(videoTip);
+        //     fsBox.appendChild(videoTip);
-            videoTip.style.display = 'none';
+        //     videoTip.style.display = 'none';
-        };
+        // };
 
         // 停止所有视频
         function stopAllVideos ()
@@ -1060,7 +1060,7 @@
                 if (img) img.style.display = 'block';
             });
             isVideoPlaying = false;
-            if (videoTip) videoTip.style.display = 'none';
+            // if (videoTip) videoTip.style.display = 'none';
         }
 
         // 播放指定视频
@@ -1075,7 +1075,7 @@
             video.muted = true;
             video.play().then(() => {
                 isVideoPlaying = true;
-                if (videoTip) videoTip.style.display = 'none';
+                // if (videoTip) videoTip.style.display = 'none';
             }).catch((err) => {
                 console.log('视频自动播放失败：', err);
                 video.style.display = 'block';
@@ -1085,7 +1085,7 @@
                 video.addEventListener('click', () => {
                     video.play();
                     isVideoPlaying = true;
-                    if (videoTip) videoTip.style.display = 'none';
+                    // if (videoTip) videoTip.style.display = 'none';
                 }, { once: true });
             });
         };
@@ -1140,7 +1140,7 @@
         };
 
         // 初始化
-        initVideoTip();
+        // initVideoTip();
         window.addEventListener('scroll', handleVideoScroll, { passive: true });
         window.addEventListener('resize', handleVideoResize);
         // 页面加载完成后尝试播放

scripts/image_migrate.py

@@ -244,6 +244,25 @@ class ImageMigrator:
         if self.verbose:
             print("连接已关闭")
 
+    def chown_target(self, owner: str, target_path: str) -> bool:
+        command = f"sudo chown {owner} {target_path}"
+        stdin, stdout, stderr = self.target_client.exec_command(command)
+        # 如果需要输入sudo密码
+        if "sudo" in command and self.target_config.password:
+            stdin.write(self.target_config.password + "\n")
+            stdin.flush()
+
+        if self.verbose:
+            # 获取输出和错误
+            # output = stdout.read().decode()
+            error = stderr.read().decode()
+            exit_code = stdout.channel.recv_exit_status()
+            if exit_code == 0:
+                return True
+            else:
+                print(f"DEBUG chown_target: 修改 {target_path} 的所有者失败: {error}")
+        return False
+
     def ensure_target_directory(self, remote_dir: str) -> bool:
         """确保目标目录存在（递归创建）"""
         try:
@@ -298,11 +317,17 @@ class ImageMigrator:
                                 f"DEBUG ensure_target_directory: 创建目录: {current_path}"
                             )
                         try:
+                            # 创建目录
                             self.target_sftp.mkdir(current_path)
                             if self.verbose:
                                 print(
                                     f"DEBUG ensure_target_directory: 目录创建成功: {current_path}"
                                 )
+                            # 修改目录所有者
+                            if self.chown_target("www", current_path) and self.verbose:
+                                print(
+                                    f"DEBUG ensure_target_directory: {current_path} 所有者修改为 www 成功"
+                                )
                         except Exception as mkdir_e:
                             # 如果创建失败，可能是权限问题或目录已存在
                             if self.verbose:
@@ -519,6 +544,8 @@ class ImageMigrator:
                             print(f"DEBUG: 目录stat也失败: {stat_e}")
 
                 self.target_sftp.put(temp_path, target_path)
+                if self.chown_target("www", target_path) and self.verbose:
+                    print(f"DEBUG transfer_file: {target_path} 所有者修改为 www 成功")
 
                 if self.verbose:
                     print("DEBUG: 上传完成")