From f55fc7b374832ed36c4a1067e560c0ee94acb645 Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 18 May 2025 12:16:45 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9A=A0=EF=B8=8F=20BREAKING:=20Rename=20XGen?= =?UTF-8?q?=20to=20CUI=20and=20update=20license=20terms?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Major Changes: - Migrate all XGen references to CUI - Update project naming conventions across codebase 2. License Updates: - Revise open source license terms - Update copyright and usage conditions This is a breaking change that requires updates in dependent projects. --- .github/workflows/build-docker-internal.yml | 2 +- .github/workflows/build-docker.yml | 2 +- .github/workflows/build-linux.yml | 2 +- .github/workflows/build-macos.yml | 12 +- COMMERCIAL_LICENSE.md | 2 + COMMERCIAL_LICENSE.zh-CN.md | 6 +- LICENSE | 207 +--------- Makefile | 95 +++-- cui/setup/index.html | 1 + cui/v0.9/index.html | 1 + {xgen => cui}/v1.0/index.html | 2 +- {xgen => cui}/v1.0/layouts__index.async.js | 0 {xgen => cui}/v1.0/umi.js | 0 data/bindata.go | 402 ++++++++++---------- data/data.go | 48 +-- data/data_test.go | 8 +- docker/build/Dockerfile | 16 +- docker/build/build.sh | 2 +- engine/process.go | 1 + service/middleware.go | 4 +- service/static.go | 4 +- share/const.go | 16 +- widgets/app/app.go | 6 +- xgen/setup/index.html | 1 - xgen/v0.9/index.html | 1 - 25 files changed, 336 insertions(+), 505 deletions(-) create mode 100644 cui/setup/index.html create mode 100644 cui/v0.9/index.html rename {xgen => cui}/v1.0/index.html (72%) rename {xgen => cui}/v1.0/layouts__index.async.js (100%) rename {xgen => cui}/v1.0/umi.js (100%) delete mode 100644 xgen/setup/index.html delete mode 100644 xgen/v0.9/index.html diff --git a/.github/workflows/build-docker-internal.yml b/.github/workflows/build-docker-internal.yml index 46b9991a..9de17689 100644 --- a/.github/workflows/build-docker-internal.yml +++ b/.github/workflows/build-docker-internal.yml @@ -11,7 +11,7 @@ on: - completed env: - VERSION: 0.10.4 + VERSION: 0.10.5 jobs: build: if: ${{ github.event.workflow_run.conclusion == 'success' }} diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index d7ff1b6f..0c252d8c 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -11,7 +11,7 @@ on: - completed env: - VERSION: 0.10.4 + VERSION: 0.10.5 jobs: build: if: ${{ github.event.workflow_run.conclusion == 'success' }} diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 02836500..185486b7 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -10,7 +10,7 @@ jobs: build: runs-on: "ubuntu-latest" container: - image: yaoapp/yao-build:0.10.4 + image: yaoapp/yao-build:0.10.5 env: CF_ACCESS_KEY_ID: ${{ secrets.CF_ACCESS_KEY_ID }} diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index c1acd01d..7a350e66 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -13,7 +13,7 @@ jobs: build: strategy: matrix: - go: [1.23.4] + go: [1.24.3] runs-on: "macos-latest" steps: - name: Setup Node.js @@ -68,13 +68,13 @@ jobs: rm -rf $dir/__MACOSX done - - name: Checkout XGen v1.0 - # ** XGEN will be renamed to DUI in the feature. and move to the new repository. ** - # ** new repository: https://github.com/YaoApp/dui.git ** + - name: Checkout CUI v1.0 + # ** XGEN will be renamed to CUI in the feature. and move to the new repository. ** + # ** new repository: https://github.com/YaoApp/cui.git ** uses: actions/checkout@v4 with: - repository: yaoapp/xgen - path: xgen-v1.0 + repository: yaoapp/cui + path: cui-v1.0 - name: Checkout Yao-Init uses: actions/checkout@v4 diff --git a/COMMERCIAL_LICENSE.md b/COMMERCIAL_LICENSE.md index 81b0f8f0..74f46699 100644 --- a/COMMERCIAL_LICENSE.md +++ b/COMMERCIAL_LICENSE.md @@ -1,3 +1,5 @@ +> **DEPRECATED**: This license is no longer in effect. Please refer to the [LICENSE](LICENSE) file for current licensing terms. + # Commercial License for Yao This document outlines the terms for the commercial license of the **Yao** project. While the Yao project is primarily licensed under the **Apache License, Version 2.0**, certain commercial use cases require a separate commercial license. diff --git a/COMMERCIAL_LICENSE.zh-CN.md b/COMMERCIAL_LICENSE.zh-CN.md index b0b081a0..9c784e5a 100644 --- a/COMMERCIAL_LICENSE.zh-CN.md +++ b/COMMERCIAL_LICENSE.zh-CN.md @@ -1,3 +1,5 @@ +> **已废弃**: 本许可证已不再生效。请参考 [LICENSE](LICENSE) 文件获取当前的许可条款。 + # Yao 商业许可证 本文件概述了 **Yao** 项目的商业许可证条款。虽然 Yao 项目主要使用 **Apache 许可证 2.0 版** 授权，但某些商业使用场景需要单独的商业许可证。 @@ -12,7 +14,7 @@ ### 定义：应用托管服务 - “应用托管服务”指任何涉及托管基于 Yao 的应用程序或使用 Yao 创建的 WEB 应用程序（包括 Yao 的修改版本）的服务，服务对象为第三方用户。包括但不限于： + "应用托管服务"指任何涉及托管基于 Yao 的应用程序或使用 Yao 创建的 WEB 应用程序（包括 Yao 的修改版本）的服务，服务对象为第三方用户。包括但不限于： - **托管平台** 提供基于 Yao 的软件或服务给第三方用户。 - **SaaS 或 PaaS 服务**，在这些服务中，您管理并托管基于或利用 Yao 的应用程序，可能是原版或修改版。 @@ -25,7 +27,7 @@ ### 定义：AI WEB 应用生成服务 - “AI WEB 应用生成服务”指任何利用 Yao（或任何分支版本或修改版本的 Yao）自动化创建具有 AI 功能的 WEB 应用程序的服务或功能。包括但不限于，为第三方用户提供以下服务： + "AI WEB 应用生成服务"指任何利用 Yao（或任何分支版本或修改版本的 Yao）自动化创建具有 AI 功能的 WEB 应用程序的服务或功能。包括但不限于，为第三方用户提供以下服务： - **AI 驱动的自动化 WEB 应用开发**，该服务生成完整或部分 WEB 应用程序。 - **可定制的 WEB 解决方案**，这些解决方案由 AI 提供支持，并以 Yao 作为核心技术构建。 diff --git a/LICENSE b/LICENSE index 261eeb9e..0795284a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,201 +1,24 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ +# Open Source License - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION +Yao App Engine is licensed under a modified version of the Apache License 2.0, with the following additional conditions: - 1. Definitions. +1. Commercial Usage Terms: + Yao App Engine may be utilized commercially, A commercial license from the producer is required if: - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. + a. Trademark and Branding Requirements - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. + - The Yao App Engine console/application logo and copyright information must not be removed or modified + - Logo and copyright information can only be changed with an authorization certificate issued through Yao Developer Certificate - "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. + b. Authorization Verification Requirements - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. + - The Yao certificate verification logic, processes, and related pages (marked in code comments) must be preserved + - The complete Yao certificate verification system must be maintained regardless of usage purpose - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. +2. Contributor Agreement: + - The producer reserves the right to modify the open-source agreement terms + - Contributed code may be used for commercial purposes, including cloud business operations - "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. +All other rights and restrictions follow the Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0). - "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. +© 2025 Infinite Wisdom Software. diff --git a/Makefile b/Makefile index 5fec9386..c0b57699 100644 --- a/Makefile +++ b/Makefile @@ -129,7 +129,7 @@ bindata: cp -r .tmp/yao-init .tmp/data/init cp -r ui .tmp/data/ cp -r ui .tmp/data/public - cp -r xgen .tmp/data/ + cp -r cui .tmp/data/ cp -r yao .tmp/data/ cp -r sui/libsui .tmp/data/ find .tmp/data -name ".DS_Store" -type f -delete @@ -142,11 +142,11 @@ bindata: artifacts-linux: clean mkdir -p dist/release -# Building XGEN v1.0 +# Building CUI v1.0 export NODE_ENV=production -# rm -f ../xgen-v1.0/pnpm-lock.yaml - echo "BASE=__yao_admin_root" > ../xgen-v1.0/packages/xgen/.env - cd ../xgen-v1.0 && pnpm install --no-frozen-lockfile && pnpm run build +# rm -f ../cui-v1.0/pnpm-lock.yaml + echo "BASE=__yao_admin_root" > ../cui-v1.0/packages/cui/.env + cd ../cui-v1.0 && pnpm install --no-frozen-lockfile && pnpm run build # Init Application cd ../yao-init && rm -rf .git @@ -162,11 +162,11 @@ artifacts-linux: clean # rm -rf .tmp/yao-builder-latest.tar.gz # Packing -# ** XGEN will be renamed to DUI in the feature. and move to the new repository. ** -# ** new repository: https://github.com/YaoApp/dui.git ** - mkdir -p .tmp/data/xgen +# ** CUI will be renamed to CUI in the feature. and move to the new repository. ** +# ** new repository: https://github.com/YaoApp/cui.git ** + mkdir -p .tmp/data/cui cp -r ./ui .tmp/data/ui - cp -r ../xgen-v1.0/packages/xgen/dist .tmp/data/xgen/v1.0 + cp -r ../cui-v1.0/packages/cui/dist .tmp/data/cui/v1.0 cp -r ../yao-init .tmp/data/init cp -r yao .tmp/data/ cp -r sui/libsui .tmp/data/ @@ -197,11 +197,11 @@ artifacts-macos: clean mkdir -p dist/release -# Building XGEN v1.0 +# Building CUI v1.0 export NODE_ENV=production -# rm -f ../xgen-v1.0/pnpm-lock.yaml - echo "BASE=__yao_admin_root" > ../xgen-v1.0/packages/xgen/.env - cd ../xgen-v1.0 && pnpm install --no-frozen-lockfile && pnpm run build +# rm -f ../cui-v1.0/pnpm-lock.yaml + echo "BASE=__yao_admin_root" > ../cui-v1.0/packages/cui/.env + cd ../cui-v1.0 && pnpm install --no-frozen-lockfile && pnpm run build # Init Application cd ../yao-init && rm -rf .git @@ -217,11 +217,11 @@ artifacts-macos: clean # rm -rf .tmp/yao-builder-latest.tar.gz # Packing -# ** XGEN will be renamed to DUI in the feature. and move to the new repository. ** -# ** new repository: https://github.com/YaoApp/dui.git ** - mkdir -p .tmp/data/xgen +# ** CUI will be renamed to CUI in the feature. and move to the new repository. ** +# ** new repository: https://github.com/YaoApp/cui.git ** + mkdir -p .tmp/data/cui cp -r ./ui .tmp/data/ui - cp -r ../xgen-v1.0/packages/xgen/dist .tmp/data/xgen/v1.0 + cp -r ../cui-v1.0/packages/cui/dist .tmp/data/cui/v1.0 cp -r ../yao-init .tmp/data/init cp -r yao .tmp/data/ cp -r sui/libsui .tmp/data/ @@ -275,18 +275,18 @@ release: clean mkdir -p dist/release mkdir .tmp -# Building XGEN v0.9 - mkdir -p .tmp/xgen/v0.9/dist - echo "XGEN v0.9" > .tmp/xgen/v0.9/dist/index.html +# Building CUI v0.9 + mkdir -p .tmp/cui/v0.9/dist + echo "CUI v0.9" > .tmp/cui/v0.9/dist/index.html -# Building XGEN v1.0 -# ** XGEN will be renamed to DUI in the feature. and move to the new repository. ** -# ** new repository: https://github.com/YaoApp/dui.git ** +# Building CUI v1.0 +# ** CUI will be renamed to CUI in the feature. and move to the new repository. ** +# ** new repository: https://github.com/YaoApp/cui.git ** export NODE_ENV=production - git clone https://github.com/YaoApp/xgen.git .tmp/xgen/v1.0 -# cd .tmp/xgen/v1.0 && git checkout 5002c3fded585aaa69a4366135b415ea3234964e - echo "BASE=__yao_admin_root" > .tmp/xgen/v1.0/packages/xgen/.env - cd .tmp/xgen/v1.0 && pnpm install --no-frozen-lockfile && pnpm run build + git clone https://github.com/YaoApp/cui.git .tmp/cui/v1.0 +# cd .tmp/cui/v1.0 && git checkout 5002c3fded585aaa69a4366135b415ea3234964e + echo "BASE=__yao_admin_root" > .tmp/cui/v1.0/packages/cui/.env + cd .tmp/cui/v1.0 && pnpm install --no-frozen-lockfile && pnpm run build # Checkout init git clone https://github.com/YaoApp/yao-init.git .tmp/yao-init @@ -303,16 +303,16 @@ release: clean # rm -rf .tmp/yao-builder-latest.tar.gz # Packing - mkdir -p .tmp/data/xgen + mkdir -p .tmp/data/cui cp -r ./ui .tmp/data/ui cp -r ./yao .tmp/data/yao cp -r ./sui/libsui .tmp/data/libsui - cp -r .tmp/xgen/v0.9/dist .tmp/data/xgen/v0.9 - cp -r .tmp/xgen/v1.0/packages/xgen/dist .tmp/data/xgen/v1.0 + cp -r .tmp/cui/v0.9/dist .tmp/data/cui/v0.9 + cp -r .tmp/cui/v1.0/packages/cui/dist .tmp/data/cui/v1.0 cp -r .tmp/yao-init .tmp/data/init go-bindata -fs -pkg data -o data/bindata.go -prefix ".tmp/data/" .tmp/data/... rm -rf .tmp/data - rm -rf .tmp/xgen + rm -rf .tmp/cui # Replace PRVERSION sed -ie "s/const PRVERSION = \"DEV\"/const PRVERSION = \"${COMMIT}-${NOW}\"/g" share/const.go @@ -336,24 +336,17 @@ linux-release: clean mkdir -p dist/release mkdir .tmp -# Building XGEN v0.9 - git clone https://github.com/YaoApp/xgen-deprecated.git .tmp/xgen/v0.9 - sed -ie "s/url('\/icon/url('\/xiang\/icon/g" .tmp/xgen/v0.9/public/icon/md_icon.css - cd .tmp/xgen/v0.9 && yarn install && yarn build - mkdir -p .tmp/xgen/v0.9 - cp -r xgen/v0.9 .tmp/xgen/v0.9/dist - -# Building XGEN v1.0 -# ** XGEN will be renamed to DUI in the feature. and move to the new repository. ** -# ** new repository: https://github.com/YaoApp/dui.git ** +# Building CUI v1.0 +# ** CUI will be renamed to CUI in the feature. and move to the new repository. ** +# ** new repository: https://github.com/YaoApp/cui.git ** export NODE_ENV=production - git clone https://github.com/YaoApp/xgen.git .tmp/xgen/v1.0 - rm -f .tmp/xgen/v1.0/pnpm-lock.yaml - echo "BASE=__yao_admin_root" > .tmp/xgen/v1.0/packages/xgen/.env - cd .tmp/xgen/v1.0 && pnpm install --no-frozen-lockfile && pnpm run build + git clone https://github.com/YaoApp/cui.git .tmp/cui/v1.0 + rm -f .tmp/cui/v1.0/pnpm-lock.yaml + echo "BASE=__yao_admin_root" > .tmp/cui/v1.0/packages/cui/.env + cd .tmp/cui/v1.0 && pnpm install --no-frozen-lockfile && pnpm run build # Setup UI - cd .tmp/xgen/v1.0/packages/setup && pnpm install --no-frozen-lockfile && pnpm run build + cd .tmp/cui/v1.0/packages/setup && pnpm install --no-frozen-lockfile && pnpm run build # Checkout init @@ -371,16 +364,16 @@ linux-release: clean # rm -rf .tmp/yao-builder-latest.tar.gz # Packing - mkdir -p .tmp/data/xgen + mkdir -p .tmp/data/cui cp -r ./ui .tmp/data/ui cp -r ./yao .tmp/data/yao - cp -r .tmp/xgen/v0.9/dist .tmp/data/xgen/v0.9 - cp -r .tmp/xgen/v1.0/packages/setup/build .tmp/data/xgen/setup - cp -r .tmp/xgen/v1.0/packages/xgen/dist .tmp/data/xgen/v1.0 + cp -r .tmp/cui/v0.9/dist .tmp/data/cui/v0.9 + cp -r .tmp/cui/v1.0/packages/setup/build .tmp/data/cui/setup + cp -r .tmp/cui/v1.0/packages/cui/dist .tmp/data/cui/v1.0 cp -r .tmp/yao-init .tmp/data/init go-bindata -fs -pkg data -o data/bindata.go -prefix ".tmp/data/" .tmp/data/... rm -rf .tmp/data - rm -rf .tmp/xgen + rm -rf .tmp/cui # Making artifacts mkdir -p dist diff --git a/cui/setup/index.html b/cui/setup/index.html new file mode 100644 index 00000000..844008d7 --- /dev/null +++ b/cui/setup/index.html @@ -0,0 +1 @@ +CUI SETUP diff --git a/cui/v0.9/index.html b/cui/v0.9/index.html new file mode 100644 index 00000000..a9ce4ce5 --- /dev/null +++ b/cui/v0.9/index.html @@ -0,0 +1 @@ +# CUI v0.9.2 diff --git a/xgen/v1.0/index.html b/cui/v1.0/index.html similarity index 72% rename from xgen/v1.0/index.html rename to cui/v1.0/index.html index 0ff2cf02..038dcfbd 100644 --- a/xgen/v1.0/index.html +++ b/cui/v1.0/index.html @@ -1,3 +1,3 @@ -# XGEN v1.0.1 +# CUI v1.0.0 ## ROOT /__yao_admin_root/ diff --git a/xgen/v1.0/layouts__index.async.js b/cui/v1.0/layouts__index.async.js similarity index 100% rename from xgen/v1.0/layouts__index.async.js rename to cui/v1.0/layouts__index.async.js diff --git a/xgen/v1.0/umi.js b/cui/v1.0/umi.js similarity index 100% rename from xgen/v1.0/umi.js rename to cui/v1.0/umi.js diff --git a/data/bindata.go b/data/bindata.go index eea7d9ad..02a1f1a2 100644 --- a/data/bindata.go +++ b/data/bindata.go @@ -1,5 +1,10 @@ // Code generated for package data by go-bindata DO NOT EDIT. (@generated) // sources: +// .tmp/data/cui/setup/index.html +// .tmp/data/cui/v0.9/index.html +// .tmp/data/cui/v1.0/index.html +// .tmp/data/cui/v1.0/layouts__index.async.js +// .tmp/data/cui/v1.0/umi.js // .tmp/data/init/.env // .tmp/data/init/.vscode/settings.json // .tmp/data/init/.vscode/types/runtime/console.d.ts @@ -64,11 +69,6 @@ // .tmp/data/libsui/yao.ts // .tmp/data/public/index.html // .tmp/data/ui/index.html -// .tmp/data/xgen/setup/index.html -// .tmp/data/xgen/v0.9/index.html -// .tmp/data/xgen/v1.0/index.html -// .tmp/data/xgen/v1.0/layouts__index.async.js -// .tmp/data/xgen/v1.0/umi.js // .tmp/data/yao/data/icons/404.png // .tmp/data/yao/data/icons/icon.icns // .tmp/data/yao/data/icons/icon.ico @@ -246,6 +246,106 @@ func AssetFile() http.FileSystem { return &assetOperator{} } +var _cuiSetupIndexHtml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x72\x0e\xf5\x54\x08\x76\x0d\x09\x0d\xe0\x02\x04\x00\x00\xff\xff\x32\x5d\xd2\x39\x0a\x00\x00\x00") + +func cuiSetupIndexHtmlBytes() ([]byte, error) { + return bindataRead( + _cuiSetupIndexHtml, + "cui/setup/index.html", + ) +} + +func cuiSetupIndexHtml() (*asset, error) { + bytes, err := cuiSetupIndexHtmlBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "cui/setup/index.html", size: 10, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil +} + +var _cuiV09IndexHtml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x52\x56\x70\x0e\xf5\x54\x28\x33\xd0\xb3\xd4\x33\xe2\x02\x04\x00\x00\xff\xff\xde\x4d\x47\xc5\x0d\x00\x00\x00") + +func cuiV09IndexHtmlBytes() ([]byte, error) { + return bindataRead( + _cuiV09IndexHtml, + "cui/v0.9/index.html", + ) +} + +func cuiV09IndexHtml() (*asset, error) { + bytes, err := cuiV09IndexHtmlBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "cui/v0.9/index.html", size: 13, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil +} + +var _cuiV10IndexHtml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x52\x56\x70\x0e\xf5\x54\x28\x33\xd4\x33\xd0\x33\xe0\xe2\xb2\x49\xb2\x53\x56\x56\x08\xf2\xf7\x0f\x51\xd0\x8f\x8f\xaf\x4c\xcc\x8f\x4f\x4c\xc9\xcd\xcc\x8b\x2f\xca\xcf\x2f\xd1\x57\xb0\xd1\x4f\xb2\xe3\x02\x04\x00\x00\xff\xff\x89\xe6\x5d\x70\x31\x00\x00\x00") + +func cuiV10IndexHtmlBytes() ([]byte, error) { + return bindataRead( + _cuiV10IndexHtml, + "cui/v1.0/index.html", + ) +} + +func cuiV10IndexHtml() (*asset, error) { + bytes, err := cuiV10IndexHtmlBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "cui/v1.0/index.html", size: 49, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil +} + +var _cuiV10Layouts__indexAsyncJs = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x2a\x4b\x2c\x52\x28\x48\x2c\xc9\x50\xb0\x55\x50\xd2\x8f\x8f\xaf\x4c\xcc\x8f\x4f\x4c\xc9\xcd\xcc\x8b\x2f\xca\xcf\x2f\xd1\x57\xb2\xe6\x02\x29\x48\xcb\xcf\x57\xb0\x55\x48\xce\xcf\x4b\x4e\x2c\xd1\x50\x42\x57\xa5\xa4\x69\xcd\x05\x08\x00\x00\xff\xff\x99\x7c\xcb\xfe\x47\x00\x00\x00") + +func cuiV10Layouts__indexAsyncJsBytes() ([]byte, error) { + return bindataRead( + _cuiV10Layouts__indexAsyncJs, + "cui/v1.0/layouts__index.async.js", + ) +} + +func cuiV10Layouts__indexAsyncJs() (*asset, error) { + bytes, err := cuiV10Layouts__indexAsyncJsBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "cui/v1.0/layouts__index.async.js", size: 71, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil +} + +var _cuiV10UmiJs = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x2a\x4b\x2c\x52\x28\x48\x2c\xc9\x50\xb0\x55\x50\xd2\x8f\x8f\xaf\x4c\xcc\x8f\x4f\x4c\xc9\xcd\xcc\x8b\x2f\xca\xcf\x2f\xd1\x57\xb2\xe6\x02\x29\x48\xcb\xcf\x57\xb0\x55\x48\xce\xcf\x4b\x4e\x2c\xd1\x50\x42\x57\xa5\xa4\x69\xcd\x05\x08\x00\x00\xff\xff\x99\x7c\xcb\xfe\x47\x00\x00\x00") + +func cuiV10UmiJsBytes() ([]byte, error) { + return bindataRead( + _cuiV10UmiJs, + "cui/v1.0/umi.js", + ) +} + +func cuiV10UmiJs() (*asset, error) { + bytes, err := cuiV10UmiJsBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "cui/v1.0/umi.js", size: 71, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil +} + var _initEnv = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x54\xce\xc1\x8a\x83\x30\x10\x06\xe0\xbb\x8f\x31\x0f\x10\x85\x65\x0f\x1e\x72\x70\x31\xbb\x1b\x50\x47\x92\x20\xf5\x14\xb4\xa6\x12\x48\x8d\x25\x52\xe8\xdb\x97\x1a\x29\x94\x39\xcd\x37\xff\xc0\xdf\x17\xa8\xcb\x1f\x5d\x0a\xde\x31\x41\x21\xdc\x9c\xdd\xcc\x17\x24\x87\xb7\x82\xd7\x85\xe8\x29\x90\x74\x1a\xd3\xc7\xe0\xc9\x34\xc6\x23\x6b\x3a\x0a\x93\xb9\x1b\xe7\xd7\xab\x59\xb6\xa8\xff\x28\x15\x85\x8c\xec\x13\xa9\xc2\xbf\xd7\xbb\xf3\x73\x48\x87\x75\x75\xf6\x3c\x6c\xd6\x2f\xc4\xf9\xf9\x1d\xd0\x35\x96\x8c\x82\x62\x27\x15\xad\x45\xa1\xe8\x77\x96\xe7\xfb\x26\x99\x94\x1c\x1b\xfd\xcb\x2b\x76\x54\x21\xc1\x84\x60\xfd\x02\x1f\x01\xa9\x50\x30\x0a\x17\xeb\x0c\x24\xcf\x00\x00\x00\xff\xff\xd9\xd2\x5d\x9c\xdb\x00\x00\x00") func initEnvBytes() ([]byte, error) { @@ -261,7 +361,7 @@ func initEnv() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/.env", size: 219, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/.env", size: 219, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -281,7 +381,7 @@ func initVscodeSettingsJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/.vscode/settings.json", size: 4666, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/.vscode/settings.json", size: 4666, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -301,7 +401,7 @@ func initVscodeTypesRuntimeConsoleDTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/.vscode/types/runtime/console.d.ts", size: 221, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/.vscode/types/runtime/console.d.ts", size: 221, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -321,7 +421,7 @@ func initVscodeTypesRuntimeExceptionDTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/.vscode/types/runtime/exception.d.ts", size: 738, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/.vscode/types/runtime/exception.d.ts", size: 738, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -341,7 +441,7 @@ func initVscodeTypesRuntimeFsDTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/.vscode/types/runtime/fs.d.ts", size: 8554, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/.vscode/types/runtime/fs.d.ts", size: 8554, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -361,7 +461,7 @@ func initVscodeTypesRuntimeGlobalDTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/.vscode/types/runtime/global.d.ts", size: 1759, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/.vscode/types/runtime/global.d.ts", size: 1759, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -381,7 +481,7 @@ func initVscodeTypesRuntimeHttpDTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/.vscode/types/runtime/http.d.ts", size: 6179, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/.vscode/types/runtime/http.d.ts", size: 6179, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -401,7 +501,7 @@ func initVscodeTypesRuntimeIoDTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/.vscode/types/runtime/io.d.ts", size: 587, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/.vscode/types/runtime/io.d.ts", size: 587, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -421,7 +521,7 @@ func initVscodeTypesRuntimeLogDTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/.vscode/types/runtime/log.d.ts", size: 1692, mode: os.FileMode(493), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/.vscode/types/runtime/log.d.ts", size: 1692, mode: os.FileMode(493), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -441,7 +541,7 @@ func initVscodeTypesRuntimeNeoDTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/.vscode/types/runtime/neo.d.ts", size: 3750, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/.vscode/types/runtime/neo.d.ts", size: 3750, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -461,7 +561,7 @@ func initVscodeTypesRuntimeProcessFsDTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/.vscode/types/runtime/process/fs.d.ts", size: 11133, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/.vscode/types/runtime/process/fs.d.ts", size: 11133, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -481,7 +581,7 @@ func initVscodeTypesRuntimeProcessHttpDTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/.vscode/types/runtime/process/http.d.ts", size: 5653, mode: os.FileMode(493), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/.vscode/types/runtime/process/http.d.ts", size: 5653, mode: os.FileMode(493), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -501,7 +601,7 @@ func initVscodeTypesRuntimeProcessModelDTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/.vscode/types/runtime/process/model.d.ts", size: 6656, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/.vscode/types/runtime/process/model.d.ts", size: 6656, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -521,7 +621,7 @@ func initVscodeTypesRuntimeProcessDTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/.vscode/types/runtime/process.d.ts", size: 23165, mode: os.FileMode(493), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/.vscode/types/runtime/process.d.ts", size: 23165, mode: os.FileMode(493), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -541,7 +641,7 @@ func initVscodeTypesRuntimeQueryDTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/.vscode/types/runtime/query.d.ts", size: 6124, mode: os.FileMode(493), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/.vscode/types/runtime/query.d.ts", size: 6124, mode: os.FileMode(493), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -561,7 +661,7 @@ func initVscodeTypesRuntimeStoreDTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/.vscode/types/runtime/store.d.ts", size: 2251, mode: os.FileMode(493), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/.vscode/types/runtime/store.d.ts", size: 2251, mode: os.FileMode(493), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -581,7 +681,7 @@ func initVscodeTypesRuntimeSuiDTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/.vscode/types/runtime/sui.d.ts", size: 1713, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/.vscode/types/runtime/sui.d.ts", size: 1713, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -601,7 +701,7 @@ func initVscodeTypesRuntimeTimeDTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/.vscode/types/runtime/time.d.ts", size: 711, mode: os.FileMode(493), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/.vscode/types/runtime/time.d.ts", size: 711, mode: os.FileMode(493), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -621,7 +721,7 @@ func initVscodeTypesRuntimeDTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/.vscode/types/runtime.d.ts", size: 424, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/.vscode/types/runtime.d.ts", size: 424, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -641,7 +741,7 @@ func initVscodeTypesSuiDTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/.vscode/types/sui.d.ts", size: 8931, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/.vscode/types/sui.d.ts", size: 8931, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -661,7 +761,7 @@ func initAppYao() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/app.yao", size: 3115, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/app.yao", size: 3115, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -681,7 +781,7 @@ func initDataReadmeMd() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/data/README.md", size: 41, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/data/README.md", size: 41, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -701,7 +801,7 @@ func initDataTemplatesDefault__assetsReadmeMd() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/data/templates/default/__assets/README.md", size: 33, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/data/templates/default/__assets/README.md", size: 33, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -721,7 +821,7 @@ func initDataTemplatesDefault__assetsImagesIconsAppPng() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/data/templates/default/__assets/images/icons/app.png", size: 34558, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/data/templates/default/__assets/images/icons/app.png", size: 34558, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -741,7 +841,7 @@ func initDataTemplatesDefault__assetsImagesLogosLogo_colorSvg() (*asset, error) return nil, err } - info := bindataFileInfo{name: "init/data/templates/default/__assets/images/logos/logo_color.svg", size: 2909, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/data/templates/default/__assets/images/logos/logo_color.svg", size: 2909, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -761,7 +861,7 @@ func initDataTemplatesDefault__assetsImagesLogosWordmarkSvg() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/data/templates/default/__assets/images/logos/wordmark.svg", size: 3615, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/data/templates/default/__assets/images/logos/wordmark.svg", size: 3615, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -781,7 +881,7 @@ func initDataTemplatesDefault__dataJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/data/templates/default/__data.json", size: 30, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/data/templates/default/__data.json", size: 30, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -801,7 +901,7 @@ func initDataTemplatesDefault__documentHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/data/templates/default/__document.html", size: 492, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/data/templates/default/__document.html", size: 492, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -821,7 +921,7 @@ func initDataTemplatesDefaultIndexIndexCss() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/data/templates/default/index/index.css", size: 2896, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/data/templates/default/index/index.css", size: 2896, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -841,7 +941,7 @@ func initDataTemplatesDefaultIndexIndexHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/data/templates/default/index/index.html", size: 2361, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/data/templates/default/index/index.html", size: 2361, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -861,7 +961,7 @@ func initDataTemplatesDefaultIndexIndexJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/data/templates/default/index/index.json", size: 31, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/data/templates/default/index/index.json", size: 31, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -881,7 +981,7 @@ func initDbReadmeMd() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/db/README.md", size: 84, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/db/README.md", size: 84, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -901,7 +1001,7 @@ func initFlowsMenuFlowYao() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/flows/menu.flow.yao", size: 813, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/flows/menu.flow.yao", size: 813, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -921,7 +1021,7 @@ func initFormsAccountFormYao() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/forms/account.form.yao", size: 1194, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/forms/account.form.yao", size: 1194, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -941,7 +1041,7 @@ func initIconsAppIcns() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/icons/app.icns", size: 67465, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/icons/app.icns", size: 67465, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -961,7 +1061,7 @@ func initIconsAppIco() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/icons/app.ico", size: 54993, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/icons/app.ico", size: 54993, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -981,7 +1081,7 @@ func initIconsAppPng() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/icons/app.png", size: 34558, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/icons/app.png", size: 34558, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1001,7 +1101,7 @@ func initLoginsAdminLoginYao() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/logins/admin.login.yao", size: 302, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/logins/admin.login.yao", size: 302, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1021,7 +1121,7 @@ func initLogsReadmeMd() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/logs/README.md", size: 28, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/logs/README.md", size: 28, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1041,7 +1141,7 @@ func initModelsAdminUserModYao() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/models/admin/user.mod.yao", size: 6416, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/models/admin/user.mod.yao", size: 6416, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1061,7 +1161,7 @@ func initModelsTestsPetModYao() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/models/tests/pet.mod.yao", size: 525, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/models/tests/pet.mod.yao", size: 525, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1081,7 +1181,7 @@ func initNeoNeoYml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/neo/neo.yml", size: 724, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/neo/neo.yml", size: 724, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1101,7 +1201,7 @@ func initPublicReadmeMd() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/public/README.md", size: 108, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/public/README.md", size: 108, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1121,7 +1221,7 @@ func initPublicAssetsReadmeMd() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/public/assets/README.md", size: 33, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/public/assets/README.md", size: 33, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1141,7 +1241,7 @@ func initPublicAssetsImagesIconsAppPng() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/public/assets/images/icons/app.png", size: 34558, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/public/assets/images/icons/app.png", size: 34558, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1161,7 +1261,7 @@ func initPublicAssetsImagesLogosLogo_colorSvg() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/public/assets/images/logos/logo_color.svg", size: 2909, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/public/assets/images/logos/logo_color.svg", size: 2909, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1181,7 +1281,7 @@ func initPublicAssetsImagesLogosWordmarkSvg() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/public/assets/images/logos/wordmark.svg", size: 3615, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/public/assets/images/logos/wordmark.svg", size: 3615, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1201,7 +1301,7 @@ func initPublicAssetsLibsuiMinJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/public/assets/libsui.min.js", size: 12569, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/public/assets/libsui.min.js", size: 12569, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1221,7 +1321,7 @@ func initPublicAssetsLibsuiMinJsMap() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/public/assets/libsui.min.js.map", size: 38553, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/public/assets/libsui.min.js.map", size: 38553, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1241,7 +1341,7 @@ func initPublicIndexCfg() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/public/index.cfg", size: 85, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/public/index.cfg", size: 85, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1261,7 +1361,7 @@ func initPublicIndexSui() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/public/index.sui", size: 5682, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/public/index.sui", size: 5682, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1281,7 +1381,7 @@ func initScriptsAccountTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/scripts/account.ts", size: 2521, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/scripts/account.ts", size: 2521, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1301,7 +1401,7 @@ func initScriptsAiNeoTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/scripts/ai/neo.ts", size: 375, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/scripts/ai/neo.ts", size: 375, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1321,7 +1421,7 @@ func initScriptsTestsTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/scripts/tests.ts", size: 1044, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/scripts/tests.ts", size: 1044, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1341,7 +1441,7 @@ func initScriptsUtilsTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/scripts/utils.ts", size: 1230, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/scripts/utils.ts", size: 1230, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1361,7 +1461,7 @@ func initSuisWebSuiYao() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/suis/web.sui.yao", size: 675, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/suis/web.sui.yao", size: 675, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1381,7 +1481,7 @@ func initTablesAccountTabYao() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/tables/account.tab.yao", size: 5597, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/tables/account.tab.yao", size: 5597, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1401,7 +1501,7 @@ func initTsconfigJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init/tsconfig.json", size: 178, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "init/tsconfig.json", size: 178, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1421,7 +1521,7 @@ func libsuiAgentTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "libsui/agent.ts", size: 15267, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "libsui/agent.ts", size: 15267, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1441,7 +1541,7 @@ func libsuiIndexTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "libsui/index.ts", size: 13049, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "libsui/index.ts", size: 13049, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1461,7 +1561,7 @@ func libsuiUtilsTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "libsui/utils.ts", size: 5959, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "libsui/utils.ts", size: 5959, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1481,7 +1581,7 @@ func libsuiYaoTs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "libsui/yao.ts", size: 4338, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "libsui/yao.ts", size: 4338, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1501,7 +1601,7 @@ func publicIndexHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "public/index.html", size: 11, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "public/index.html", size: 11, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1521,107 +1621,7 @@ func uiIndexHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/index.html", size: 11, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil -} - -var _xgenSetupIndexHtml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8a\x70\x77\xf5\x53\x08\x76\x0d\x09\x0d\xe0\x02\x04\x00\x00\xff\xff\xdb\x53\x4c\xdc\x0b\x00\x00\x00") - -func xgenSetupIndexHtmlBytes() ([]byte, error) { - return bindataRead( - _xgenSetupIndexHtml, - "xgen/setup/index.html", - ) -} - -func xgenSetupIndexHtml() (*asset, error) { - bytes, err := xgenSetupIndexHtmlBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "xgen/setup/index.html", size: 11, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil -} - -var _xgenV09IndexHtml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x52\x56\x88\x70\x77\xf5\x53\x28\x33\xd0\xb3\xd4\x33\xe2\x02\x04\x00\x00\xff\xff\xff\x2b\x17\xc6\x0e\x00\x00\x00") - -func xgenV09IndexHtmlBytes() ([]byte, error) { - return bindataRead( - _xgenV09IndexHtml, - "xgen/v0.9/index.html", - ) -} - -func xgenV09IndexHtml() (*asset, error) { - bytes, err := xgenV09IndexHtmlBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "xgen/v0.9/index.html", size: 14, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil -} - -var _xgenV10IndexHtml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x52\x56\x88\x70\x77\xf5\x53\x28\x33\xd4\x33\xd0\x33\xe4\xe2\xb2\x49\xb2\x53\x56\x56\x08\xf2\xf7\x0f\x51\xd0\x8f\x8f\xaf\x4c\xcc\x8f\x4f\x4c\xc9\xcd\xcc\x8b\x2f\xca\xcf\x2f\xd1\x57\xb0\xd1\x4f\xb2\xe3\x02\x04\x00\x00\xff\xff\xb5\x26\x94\x2e\x32\x00\x00\x00") - -func xgenV10IndexHtmlBytes() ([]byte, error) { - return bindataRead( - _xgenV10IndexHtml, - "xgen/v1.0/index.html", - ) -} - -func xgenV10IndexHtml() (*asset, error) { - bytes, err := xgenV10IndexHtmlBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "xgen/v1.0/index.html", size: 50, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil -} - -var _xgenV10Layouts__indexAsyncJs = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x2a\x4b\x2c\x52\x28\x48\x2c\xc9\x50\xb0\x55\x50\xd2\x8f\x8f\xaf\x4c\xcc\x8f\x4f\x4c\xc9\xcd\xcc\x8b\x2f\xca\xcf\x2f\xd1\x57\xb2\xe6\x02\x29\x48\xcb\xcf\x57\xb0\x55\x48\xce\xcf\x4b\x4e\x2c\xd1\x50\x42\x57\xa5\xa4\x69\xcd\x05\x08\x00\x00\xff\xff\x99\x7c\xcb\xfe\x47\x00\x00\x00") - -func xgenV10Layouts__indexAsyncJsBytes() ([]byte, error) { - return bindataRead( - _xgenV10Layouts__indexAsyncJs, - "xgen/v1.0/layouts__index.async.js", - ) -} - -func xgenV10Layouts__indexAsyncJs() (*asset, error) { - bytes, err := xgenV10Layouts__indexAsyncJsBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "xgen/v1.0/layouts__index.async.js", size: 71, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil -} - -var _xgenV10UmiJs = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x2a\x4b\x2c\x52\x28\x48\x2c\xc9\x50\xb0\x55\x50\xd2\x8f\x8f\xaf\x4c\xcc\x8f\x4f\x4c\xc9\xcd\xcc\x8b\x2f\xca\xcf\x2f\xd1\x57\xb2\xe6\x02\x29\x48\xcb\xcf\x57\xb0\x55\x48\xce\xcf\x4b\x4e\x2c\xd1\x50\x42\x57\xa5\xa4\x69\xcd\x05\x08\x00\x00\xff\xff\x99\x7c\xcb\xfe\x47\x00\x00\x00") - -func xgenV10UmiJsBytes() ([]byte, error) { - return bindataRead( - _xgenV10UmiJs, - "xgen/v1.0/umi.js", - ) -} - -func xgenV10UmiJs() (*asset, error) { - bytes, err := xgenV10UmiJsBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "xgen/v1.0/umi.js", size: 71, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "ui/index.html", size: 11, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1641,7 +1641,7 @@ func yaoDataIcons404Png() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/data/icons/404.png", size: 9342, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "yao/data/icons/404.png", size: 9342, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1661,7 +1661,7 @@ func yaoDataIconsIconIcns() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/data/icons/icon.icns", size: 67465, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "yao/data/icons/icon.icns", size: 67465, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1681,7 +1681,7 @@ func yaoDataIconsIconIco() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/data/icons/icon.ico", size: 54993, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "yao/data/icons/icon.ico", size: 54993, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1701,7 +1701,7 @@ func yaoDataIconsIconPng() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/data/icons/icon.png", size: 34558, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "yao/data/icons/icon.png", size: 34558, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1721,7 +1721,7 @@ func yaoDataIndexHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/data/index.html", size: 282, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "yao/data/index.html", size: 282, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1741,7 +1741,7 @@ func yaoFieldsModelTransJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/fields/model.trans.json", size: 14938, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "yao/fields/model.trans.json", size: 14938, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1761,7 +1761,7 @@ func yaoLangsEnUsJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/langs/en-US.json", size: 66, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "yao/langs/en-US.json", size: 66, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1781,7 +1781,7 @@ func yaoLangsZhCnGlobalYml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/langs/zh-cn/global.yml", size: 1762, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "yao/langs/zh-cn/global.yml", size: 1762, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1801,7 +1801,7 @@ func yaoLangsZhCnLoginsAdminLoginYml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/langs/zh-cn/logins/admin.login.yml", size: 94, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "yao/langs/zh-cn/logins/admin.login.yml", size: 94, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1821,7 +1821,7 @@ func yaoLangsZhCnLoginsUserLoginYml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/langs/zh-cn/logins/user.login.yml", size: 90, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "yao/langs/zh-cn/logins/user.login.yml", size: 90, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1841,7 +1841,7 @@ func yaoLangsZhHkGlobalYml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/langs/zh-hk/global.yml", size: 1762, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "yao/langs/zh-hk/global.yml", size: 1762, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1861,7 +1861,7 @@ func yaoLangsZhHkLoginsAdminLoginYml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/langs/zh-hk/logins/admin.login.yml", size: 94, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "yao/langs/zh-hk/logins/admin.login.yml", size: 94, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1881,7 +1881,7 @@ func yaoLangsZhHkLoginsUserLoginYml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/langs/zh-hk/logins/user.login.yml", size: 90, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "yao/langs/zh-hk/logins/user.login.yml", size: 90, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1901,7 +1901,7 @@ func yaoReleaseAppYaz() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/release/app.yaz", size: 181682, mode: os.FileMode(420), modTime: time.Unix(1746759039, 0)} + info := bindataFileInfo{name: "yao/release/app.yaz", size: 181682, mode: os.FileMode(420), modTime: time.Unix(1747541324, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1958,6 +1958,11 @@ func AssetNames() []string { // _bindata is a table, holding each asset generator, mapped to its name. var _bindata = map[string]func() (*asset, error){ + "cui/setup/index.html": cuiSetupIndexHtml, + "cui/v0.9/index.html": cuiV09IndexHtml, + "cui/v1.0/index.html": cuiV10IndexHtml, + "cui/v1.0/layouts__index.async.js": cuiV10Layouts__indexAsyncJs, + "cui/v1.0/umi.js": cuiV10UmiJs, "init/.env": initEnv, "init/.vscode/settings.json": initVscodeSettingsJson, "init/.vscode/types/runtime/console.d.ts": initVscodeTypesRuntimeConsoleDTs, @@ -2022,11 +2027,6 @@ var _bindata = map[string]func() (*asset, error){ "libsui/yao.ts": libsuiYaoTs, "public/index.html": publicIndexHtml, "ui/index.html": uiIndexHtml, - "xgen/setup/index.html": xgenSetupIndexHtml, - "xgen/v0.9/index.html": xgenV09IndexHtml, - "xgen/v1.0/index.html": xgenV10IndexHtml, - "xgen/v1.0/layouts__index.async.js": xgenV10Layouts__indexAsyncJs, - "xgen/v1.0/umi.js": xgenV10UmiJs, "yao/data/icons/404.png": yaoDataIcons404Png, "yao/data/icons/icon.icns": yaoDataIconsIconIcns, "yao/data/icons/icon.ico": yaoDataIconsIconIco, @@ -2086,6 +2086,19 @@ type bintree struct { } var _bintree = &bintree{nil, map[string]*bintree{ + "cui": {nil, map[string]*bintree{ + "setup": {nil, map[string]*bintree{ + "index.html": {cuiSetupIndexHtml, map[string]*bintree{}}, + }}, + "v0.9": {nil, map[string]*bintree{ + "index.html": {cuiV09IndexHtml, map[string]*bintree{}}, + }}, + "v1.0": {nil, map[string]*bintree{ + "index.html": {cuiV10IndexHtml, map[string]*bintree{}}, + "layouts__index.async.js": {cuiV10Layouts__indexAsyncJs, map[string]*bintree{}}, + "umi.js": {cuiV10UmiJs, map[string]*bintree{}}, + }}, + }}, "init": {nil, map[string]*bintree{ ".env": {initEnv, map[string]*bintree{}}, ".vscode": {nil, map[string]*bintree{ @@ -2220,19 +2233,6 @@ var _bintree = &bintree{nil, map[string]*bintree{ "ui": {nil, map[string]*bintree{ "index.html": {uiIndexHtml, map[string]*bintree{}}, }}, - "xgen": {nil, map[string]*bintree{ - "setup": {nil, map[string]*bintree{ - "index.html": {xgenSetupIndexHtml, map[string]*bintree{}}, - }}, - "v0.9": {nil, map[string]*bintree{ - "index.html": {xgenV09IndexHtml, map[string]*bintree{}}, - }}, - "v1.0": {nil, map[string]*bintree{ - "index.html": {xgenV10IndexHtml, map[string]*bintree{}}, - "layouts__index.async.js": {xgenV10Layouts__indexAsyncJs, map[string]*bintree{}}, - "umi.js": {xgenV10UmiJs, map[string]*bintree{}}, - }}, - }}, "yao": {nil, map[string]*bintree{ "data": {nil, map[string]*bintree{ "icons": {nil, map[string]*bintree{ diff --git a/data/data.go b/data/data.go index e6be82f2..85e1b41b 100644 --- a/data/data.go +++ b/data/data.go @@ -10,25 +10,25 @@ import ( assetfs "github.com/elazarl/go-bindata-assetfs" ) -// XgenV0 XGen 0.9 -func XgenV0() *assetfs.AssetFS { +// CuiV0 CUI 0.9 +func CuiV0() *assetfs.AssetFS { assetInfo := func(path string) (os.FileInfo, error) { return os.Stat(path) } for k := range _bintree.Children { - k = "xgen/v0.9" + k = "cui/v0.9" return &assetfs.AssetFS{Asset: Asset, AssetDir: AssetDir, AssetInfo: assetInfo, Prefix: k, Fallback: "index.html"} } panic("unreachable") } -// XgenV1 XGen 1.0 -func XgenV1() *assetfs.AssetFS { +// CuiV1 CUI 1.0 +func CuiV1() *assetfs.AssetFS { assetInfo := func(path string) (os.FileInfo, error) { return os.Stat(path) } for k := range _bintree.Children { - k = "xgen/v1.0" + k = "cui/v1.0" return &assetfs.AssetFS{Asset: Asset, AssetDir: AssetDir, AssetInfo: assetInfo, Prefix: k, Fallback: "index.html"} } panic("unreachable") @@ -40,25 +40,25 @@ func Setup() *assetfs.AssetFS { return os.Stat(path) } for k := range _bintree.Children { - k = "xgen/setup" + k = "cui/setup" return &assetfs.AssetFS{Asset: Asset, AssetDir: AssetDir, AssetInfo: assetInfo, Prefix: k, Fallback: "index.html"} } panic("unreachable") } -// ReplaceXGen bindata file -func ReplaceXGen(search, replace string) error { - err := replaceXGenIndex(search, replace) +// ReplaceCUI bindata file +func ReplaceCUI(search, replace string) error { + err := replaceCUIIndex(search, replace) if err != nil { return err } - err = replaceXGenUmi(search, replace) + err = replaceCUIUmi(search, replace) if err != nil { return err } - return replaceXGenLayouts(search, replace) + return replaceCUILayouts(search, replace) } // Read file from bin @@ -81,10 +81,10 @@ func RemoveApp() { delete(_bindata, "yao/release/app.yaz") } -// ReplaceXGenIndex bindata file -func replaceXGenIndex(search, replace string) error { +// ReplaceCUIIndex bindata file +func replaceCUIIndex(search, replace string) error { - content, err := bindataRead(_xgenV10IndexHtml, "xgen/v1.0/index.html") + content, err := bindataRead(_cuiV10IndexHtml, "cui/v1.0/index.html") if err != nil { return err } @@ -100,14 +100,14 @@ func replaceXGenIndex(search, replace string) error { return err } - _xgenV10IndexHtml = b.Bytes() + _cuiV10IndexHtml = b.Bytes() return nil } -// replaceXGenUmi bindata file -func replaceXGenUmi(search, replace string) error { +// replaceCUIUmi bindata file +func replaceCUIUmi(search, replace string) error { - content, err := bindataRead(_xgenV10UmiJs, "xgen/v1.0/umi.js") + content, err := bindataRead(_cuiV10UmiJs, "cui/v1.0/umi.js") if err != nil { return err } @@ -123,14 +123,14 @@ func replaceXGenUmi(search, replace string) error { return err } - _xgenV10UmiJs = b.Bytes() + _cuiV10UmiJs = b.Bytes() return nil } -// replaceXGenLayouts bindata file -func replaceXGenLayouts(search, replace string) error { +// replaceCUILayouts bindata file +func replaceCUILayouts(search, replace string) error { - content, err := bindataRead(_xgenV10Layouts__indexAsyncJs, "xgen/v1.0/layouts__index.async.js") + content, err := bindataRead(_cuiV10Layouts__indexAsyncJs, "cui/v1.0/layouts__index.async.js") if err != nil { return err } @@ -146,6 +146,6 @@ func replaceXGenLayouts(search, replace string) error { return err } - _xgenV10Layouts__indexAsyncJs = b.Bytes() + _cuiV10Layouts__indexAsyncJs = b.Bytes() return nil } diff --git a/data/data_test.go b/data/data_test.go index 59dde1bf..403ff7f4 100644 --- a/data/data_test.go +++ b/data/data_test.go @@ -6,18 +6,18 @@ import ( "github.com/stretchr/testify/assert" ) -func TestReplaceXGenIndex(t *testing.T) { - err := ReplaceXGen("__yao_admin_root", "Admin-Replaced") +func TestReplaceCUIIndex(t *testing.T) { + err := ReplaceCUI("__yao_admin_root", "Admin-Replaced") if err != nil { t.Fatal(err) } - content, err := bindataRead(_xgenV10IndexHtml, "index.html") + content, err := bindataRead(_cuiV10IndexHtml, "index.html") if err != nil { t.Fatal(err) } - content, err = bindataRead(_xgenV10UmiJs, "umi.js") + content, err = bindataRead(_cuiV10UmiJs, "umi.js") if err != nil { t.Fatal(err) } diff --git a/docker/build/Dockerfile b/docker/build/Dockerfile index b91a9c14..4c006b00 100644 --- a/docker/build/Dockerfile +++ b/docker/build/Dockerfile @@ -2,14 +2,14 @@ # Yao Build Environment (Ubuntu 24.04 AMD64) # # Build: -# docker build --platform linux/amd64 -t yaoapp/yao-build:0.10.4 . +# docker build --platform linux/amd64 -t yaoapp/yao-build:0.10.5 . # # Usage: -# docker run --rm -it -v /local/path/dist:/data yaoapp/yao-build:0.10.4 +# docker run --rm -it -v /local/path/dist:/data yaoapp/yao-build:0.10.5 # # Tests: -# docker run --rm -it yaoapp/yao-build:0.10.4 /bin/bash -# docker run --rm -it -v ./test:/data yaoapp/yao-build:0.10.4 /bin/bash +# docker run --rm -it yaoapp/yao-build:0.10.5 /bin/bash +# docker run --rm -it -v ./test:/data yaoapp/yao-build:0.10.5 /bin/bash # # =========================================== FROM ubuntu:24.04 @@ -29,10 +29,10 @@ RUN apt-get update && \ apt-get install -y git && \ apt-get install -y unzip -# Install Go 1.23.3 -RUN wget https://golang.org/dl/go1.23.3.linux-amd64.tar.gz && \ - tar -C /usr/local -xzf go1.23.3.linux-amd64.tar.gz && \ - rm go1.23.3.linux-amd64.tar.gz +# Install Go 1.24.0 +RUN wget https://golang.org/dl/go1.24.0.linux-amd64.tar.gz && \ + tar -C /usr/local -xzf go1.24.0.linux-amd64.tar.gz && \ + rm go1.24.0.linux-amd64.tar.gz # Install Node.js 18.x RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \ diff --git a/docker/build/build.sh b/docker/build/build.sh index abe435dd..fad2ece8 100644 --- a/docker/build/build.sh +++ b/docker/build/build.sh @@ -4,7 +4,7 @@ git clone https://github.com/yaoapp/kun.git /app/kun && \ git clone https://github.com/yaoapp/xun.git /app/xun && \ git clone https://github.com/yaoapp/gou.git /app/gou && \ git clone https://github.com/yaoapp/v8go.git /app/v8go && \ -git clone https://github.com/yaoapp/xgen.git /app/xgen-v1.0 && \ +git clone https://github.com/yaoapp/cui.git /app/cui-v1.0 && \ git clone https://github.com/yaoapp/yao-init.git /app/yao-init && \ git clone https://github.com/yaoapp/yao.git /app/yao diff --git a/engine/process.go b/engine/process.go index 6ef8f01f..5a93ce0e 100644 --- a/engine/process.go +++ b/engine/process.go @@ -39,6 +39,7 @@ func processPing(process *process.Process) interface{} { func processInspect(process *process.Process) interface{} { return map[string]interface{}{ "VERSION": fmt.Sprintf("%s %s", share.VERSION, share.PRVERSION), + "CUI": fmt.Sprintf("%s %s", share.CUI, share.PRECUI), "BUILDNAME": share.BUILDNAME, "CONFIG": config.Conf, } diff --git a/service/middleware.go b/service/middleware.go index ae8a998c..badc4fa7 100644 --- a/service/middleware.go +++ b/service/middleware.go @@ -34,7 +34,7 @@ func withStaticFileServer(c *gin.Context) { // Xgen 1.0 if length >= AdminRootLen && c.Request.URL.Path[0:AdminRootLen] == AdminRoot { c.Request.URL.Path = strings.TrimPrefix(c.Request.URL.Path, c.Request.URL.Path[0:AdminRootLen-1]) - XGenFileServerV1.ServeHTTP(c.Writer, c.Request) + CUIFileServerV1.ServeHTTP(c.Writer, c.Request) c.Abort() return } @@ -42,7 +42,7 @@ func withStaticFileServer(c *gin.Context) { // __yao_admin_root if length >= 18 && c.Request.URL.Path[0:18] == "/__yao_admin_root/" { c.Request.URL.Path = strings.TrimPrefix(c.Request.URL.Path, "/__yao_admin_root") - XGenFileServerV1.ServeHTTP(c.Writer, c.Request) + CUIFileServerV1.ServeHTTP(c.Writer, c.Request) c.Abort() return } diff --git a/service/static.go b/service/static.go index 53f90ae5..6e0c6fcd 100644 --- a/service/static.go +++ b/service/static.go @@ -15,8 +15,8 @@ import ( // AppFileServer static file server var AppFileServer http.Handler -// XGenFileServerV1 XGen v1.0 -var XGenFileServerV1 http.Handler = http.FileServer(data.XgenV1()) +// CUIFileServerV1 CUI v1.0 +var CUIFileServerV1 http.Handler = http.FileServer(data.CuiV1()) // AdminRoot cache var AdminRoot = "" diff --git a/share/const.go b/share/const.go index 64ca66f3..03201cbe 100644 --- a/share/const.go +++ b/share/const.go @@ -1,15 +1,21 @@ package share -// VERSION 版本号 -const VERSION = "0.10.4" +// VERSION Yao App Engine Version +const VERSION = "0.10.5" -// PRVERSION PreRelease Version +// PRVERSION Yao App Engine PreRelease Version const PRVERSION = "DEV" -// BUILDIN 打包应用合成一个制品 +// CUI Version +const CUI = "0.10.5" + +// PRECUI PreRelease Version +const PRECUI = "DEV" + +// BUILDIN If true, the application will be built into a single artifact const BUILDIN = false -// BUILDNAME 制品名称 +// BUILDNAME The name of the artifact const BUILDNAME = "yao" // MoapiHosts the master mirror diff --git a/widgets/app/app.go b/widgets/app/app.go index 4150ed7d..090fb711 100644 --- a/widgets/app/app.go +++ b/widgets/app/app.go @@ -586,6 +586,10 @@ func processXgen(process *process.Process) interface{} { "version": share.VERSION, "prversion": share.PRVERSION, }, + "cui": map[string]interface{}{ + "version": share.CUI, + "prversion": share.PRECUI, + }, "theme": Setting.Theme, "lang": Setting.Lang, "mode": mode, @@ -627,7 +631,7 @@ func (dsl *DSL) replaceAdminRoot() error { // return err // } - return data.ReplaceXGen("__yao_admin_root", root) + return data.ReplaceCUI("__yao_admin_root", root) } // icons diff --git a/xgen/setup/index.html b/xgen/setup/index.html deleted file mode 100644 index 1d68d1b6..00000000 --- a/xgen/setup/index.html +++ /dev/null @@ -1 +0,0 @@ -XGEN SETUP diff --git a/xgen/v0.9/index.html b/xgen/v0.9/index.html deleted file mode 100644 index e2e951c8..00000000 --- a/xgen/v0.9/index.html +++ /dev/null @@ -1 +0,0 @@ -# XGEN v0.9.2