Merge branch 'develop' of github.com:lu-yg/tiny-engine-backend-java into develop

Author: lu-yg

CONTRIBUTING.md

@@ -0,0 +1,64 @@
+# Contributing
+We are glad that you are willing to contribute to the TinyEngine open source project. There are many forms of contribution. You can choose one or more of them based on your strengths and interests:
+
+* Report new defect.
+* Provide more detailed information for the existing defects, such as supplementary screenshots, more detailed reproduction steps, minimum reproducible demo links, etc.
+* Submit Pull requests to fix typos in the document or make the document clearer and better.
+* Add the official assistant WeChat opentiny-official and join the technical exchange group to participate in the discussion.
+
+When you personally use the TinyEngine and participate in many of the above contributions, as you become familiar with TinyEngine , you can try to do something more challenging, such as:
+
+* Fix the defect. You can start with Good-first issue.
+* Implementation of new features
+* Complete unit tests.
+* Translate documents
+* Participate in code review.
+
+### Bug Reports
+If you encounter problems when using TinyEngine-backend-java, please submit an issue to us. Before submitting an issue, read the related official documents carefully to check whether the issue is a defect or a function that has not been implemented.
+
+If the issue is a defect, select the bug report template when creating a new issue. The title must comply with the defect description format. For example, [TinyEngine-backend-java] cannot be refreshed.
+
+To report a defect, you need to fill in the following information:
+
+* Screenshots can be used to describe the defect. If an error is reported, the error information can be posted.
+* It is recommended that a minimum demo link be provided to reproduce the defect.
+
+If the feature is a new feature, select the Feature request template. The title complies with the format of the new feature description, for example, [TinyEngine-backend-java].
+
+For an issue of a new feature, you need to fill in the following information:
+
+* What problems does this feature solve
+* What is the API of this feature
+
+### Pull Requests
+
+Before submitting pull request, please make sure that your submission is in line with the overall plan of TinyEngine-backend-java. Generally, issues that marked as bug are encouraged to submit pull requests. If you are not sure, you can create a Discussion for discussion.
+
+
+```
+# username indicates the user name. Replace it before running the command.
+git clone git@github.com:username/tiny-engine-backend-java.git
+cd tiny-engine-backend-java
+git remote add upstream git@github.com:opentiny/tiny-engine-backend-java.git
+
+```
+To submit a PR:
+
+* Click the Fork button in the upper right corner of the tiny-engine-backend-java repository to fork the upstream repository to your personal repository.
+* Clone personal warehouse to local
+* Local coding.
+* Submit according to Commit Message Format specification. PR that do not conform to the submission specification will not be merged.
+* Submit to remote repository: git push origin branchName.
+* Open the Pull requests link of the TinyEngine-backend-java code repository and click the New pull request button to submit the PR.
+* Project Committer conducts Code Review and makes comments.
+* The PR author adjusts the code according to the opinion. Please note that when a branch initiates PR, the subsequent commit will be synchronized automatically, and there is no need to resubmit the PR.
+* Project administrator merges PR.
+
+The contribution process is over, thank you for your contribution!
+
+### Join the open source community
+If you are interested in our open source projects, please join our open source community in the following ways.
+
+* Add the official assistant WeChat: opentiny-official, join our technical exchange group
+* Join the mailing list: opentiny@googlegroups.com

CONTRIBUTING.zh-CN.md

@@ -21,7 +21,6 @@
 
 报告缺陷的 Issue 主要需要填写以下信息：
 
-* TinyEngine-backend-java 和 node 的版本号
 * 缺陷的表现，可截图辅助说明，如果有报错可贴上报错信息
 * 缺陷的复现步骤，最好能提供一个最小可复现 demo 链接
 

README.md

@@ -17,7 +17,7 @@
 * 在 tiny-engine-backend-java/app/src/main/resources/application-dev.yml文件里修改连接数据库相关配置
 * 在 tiny-engine-backend-java/app/src/main/java/com/tinyengine/it/TinyEngineApplication主函数入口启动项目进行本地开发
 
-详细请看[TinyEngine 官网-使用手册](https://opentiny.design/tiny-engine#/help-center/course/backend/51)中的前后端本地如何启动章节
+详细请看[TinyEngine 官网-使用手册-平台开发指南-前后端代码本地启动联调](https://opentiny.design/tiny-engine#/help-center/course/dev/1200)章节
 
 
 ### 目录规则
@@ -160,7 +160,7 @@
 
 ### 使用手册
 
-具体服务端使用文档请查看[TinyEngine 官网-使用手册](https://opentiny.design/tiny-engine#/help-center/course/backend/51)
+具体服务端使用文档请查看[TinyEngine 官网-使用手册-平台开发指南](https://opentiny.design/tiny-engine#/help-center/course/dev/90)
 
 
 #### 本地运行时配置：
@@ -197,7 +197,6 @@ mysql 8
 | blocks_groups__block_groups_blocks |  r_block_group_block    | |                                                                             |block-group_id -> block_group_id、 |
 |blocks_carriers_relations|t_block_carriers_relation|tenant_id、site_id、renter_id|                                                                             |block -> block_id、 host ->host_id、created_at -> created_time、updated_by -> last_updated_by、updated_at -> last_updated_time |
 | block_histories_material_histories__material_histories_blocks |   r_material_history_block   |    |                                                                             |                   material-history_id ->  material_history_id、  block-history_id -> block_history_id                                                                                            |
-| i18n_langs |         t_i18n_lang          |                                                                                         |                                                                             |                                                                                updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time                                                                                | 
 | material_histories |      t_material_history      | image_url、build_info、tgz_url、 material_size、site_id、renter_id                           |                                                                             |                                                           material -> ref_id、 tenant -> tenant_id 、updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time                                                            |
 | material_histories_components__user_components_mhs | r_material_history_component |                                                                                         |                                                                             |                                                                                     material-history_id -> material_history_id、 user-component_id ->  component_id                                                                                      |
 | materials |          t_material          | material_category_id、material_size、tgz_url、unzip_tgz_root_path_url、unzip_tgz_files、tenant_id、site_id、renter_id                                                                                        | name_cn、user_components、latest                                              |                                              version -> latest_version、material_histories -> latest_history_id、isOfficial -> is_official、isDefault ->is_default、component_library -> component_library_id、                                              |
@@ -212,6 +211,8 @@ mysql 8
 | user_components |         t_component          |name_en、tenant_id、site_id、renter_id | component                                                                   |                                            isOfficial ->is_official、isDefault -> is_default、library -> library_id、updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time                                             |
 | users-permissions_user |            t_user            |enable、tenant_id、site_id、renter_id | provider、password、resetPasswordToken、confirmationToken、confirmed、blocked    |                                                                                updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time                                                                                |
 | tenants |           t_tenant           | | created_by、updated_by                                                       |                                                         tenant_id -> org_code、createdBy -> created_by、updatedBy -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time                                                          |
+| platforms                                                     | t_platform| latest_history_id、site_id、renter_id                                                                                                               |   is_java、created_by、updated_by                                                                          | theme -> theme_id、latest -> latest_version、material_history -> material_history_id、business_category -> business_category_id、tenant -> tenant_id、createdBy -> created_by、updatedBy -> last_updated_by、created_at -> created_time、updated_at -> last_updated_time    |
+|platform_histories|t_platform_history|publish_url、image_url、tenant_id、site_id、renter_id | |platform -> ref_id、material_history -> material_history_id、created_at -> created_time、updated_by -> last_updated_by、updated_at -> last_updated_time |
 
 
 ### 🤝 参与贡献

README.zh-CN.md

@@ -39,4 +39,11 @@ logging:
   pattern:
     file: "%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n"
   file:
-    name: /logs
+    name: /logs
+
+cors:
+  allowed-origins: "http://127.0.0.1:8090"
+  allowed-methods: "GET,POST,PUT,DELETE,OPTIONS"
+  allowed-headers: "Accept,Referer,User-Agent,x-lowcode-mode,x-lowcode-org,Content-Type,Authorization"
+  exposed-headers: "Authorization"
+  allow-credentials: true