Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ISSUE #90] Merge dev branch into main #93

Merged
merged 41 commits into from
Apr 8, 2024
Merged

[ISSUE #90] Merge dev branch into main #93

merged 41 commits into from
Apr 8, 2024

Conversation

Pil0tXia
Copy link
Member

@Pil0tXia Pil0tXia commented Apr 8, 2024

Fixes #90

Attention

Please DO NOT merge this PR with "Squash and Merge", otherwise all git commit history will be lost. Please use the other merge option, which is the most basic merge function.

Description

In order to show contribution statistics, the new Dashboard will use main branch to develop. The current main have been backed up to the nextjs-dashboard branch.

Since the main branch is the default branch, the Fixes #XXXX keyword is effective now, so any PR should follow the EventMesh standard format. I will submit PR templates later.

Pil0tXia and others added 30 commits January 4, 2024 08:42
* Archive old frontend project

* Migrate eventmesh-admin from https://github.com/apache/eventmesh pil0txia_feat_4501

* Extract project to root path

* Rename project from eventmesh-admin to eventmesh-dashboard

* Rename package from .admin to .dashboard
Co-authored-by: jie@apache.org <2732554140@qq.com>
* Set up CI

* Add LICENSE

* Add CheckStyle

* Set up DB

* Add druid StatFilter controller

* sync CI change in apache/eventmesh#4722

* fix(*)1. 完成项目设计 2. 完成项目与模块搭建

* Supplement module dependency relation and fix project info

* Move original Admin into Core & rewrite dependencies

---------

Co-authored-by: laohu <2732554140@qq.com>
* Set up CI

* Add LICENSE

* Add CheckStyle

* Set up DB

* Add druid StatFilter controller

* sync CI change in apache/eventmesh#4722

* Supplement module dependency relation and fix project info

* Move original Admin into Core & rewrite dependencies

* Rename package to .core

* Add .asf.yaml

* Enable branches with namespace triggering CI

* Set up Maven CI

* Downgrade JDK from 17 to 8

* Remove failed empty test

* Remove failed dependabot task

* Unify version number (using maven 3.8.1, maven wrapper to be added)

---------

Co-authored-by: laohu <2732554140@qq.com>
* refactor: add dependency of console module and move controllers into console module.

* fix: add logback config, fix application-dev.yml and move `</dependencyManagement>` to root `pom.xml` as pointed out in PR#19.
* integrate checkstyle

* fix import order & remove excessive try-catch
* fixes #21

ADD:
connection related code:
Connection/Client/Connector: Mapper,Entity
Connection: ConnectionService,ConnectionDataService
others:
eventmesh-dashboard.sql
test resources

MODIFY:
pom file: remove dependency of junit, spring-boot-starter-test contains it.
pom file: let service module depend on core module.

* [ISSUE #23] Integrate Checkstyle into Build and CI process (#24)

* integrate checkstyle

* fix import order & remove excessive try-catch

* [ISSUE #23] Integrate Checkstyle into Build and CI process (#24)

* integrate checkstyle

* fix import order & remove excessive try-catch

* fixes #21

fixed according to PR#22 conversation
Database schema definition modified

* fix checkstyle for ConnectorMapper

* fix: add StatusEnum
add enum support for entity class.

* fix: rename KubernetesPodStatus

* fix checkstyle

---------

Co-authored-by: Pil0tXia <xiatian@apache.org>
…peration (#28) (#34)

* refactor: add dependency of console module and move controllers into console module.

* fix: add logback config, fix application-dev.yml and move `</dependencyManagement>` to root `pom.xml` as pointed out in PR#19.

* FirstCommit

* remerge

* first improve

* second improve

* third improve

* fourth improve

* fourth improve

* fourth improve

* Update and rename EventmeshConsoleApplication.java to EventMeshDashboardApplication.java

* rename this starter class file to EventMeshDashboardApplication

* rename this starter class file to EventMeshDashboardApplication

* change some resource file

* improve name

* improve name

* Modify the fields of the synchronized log table

* improve name

* improve name

---------

Co-authored-by: zzx <142965157+zzxxiansheng@users.noreply.github.com>
Co-authored-by: lambert@arch <lambertrao@outlook.com>
* test: add mappers' tests.

improved connection, connector, client, meta, health mappers and add their unit tests.

* fix: rename database name

rename test database name to `eventmesh_dashboard_test`

* fix: modify text default value into an literal expression

* fix: remove endtime field from client mapper insert method

* style: unify mapper style

array format when using dynamic scripts (<script>)
`+` format when using simple statements
* feat: add health service module

* feat: add FunctionManager

* chore: style optimize

* chore: remove redundant code

* chore: rename FunctionManagerBean to FunctionManagerLoader
#43)

* fix: let HealthExecutor support async doCheck

* chore: move test files out of unit folder

* chore: add HealthConstant

* chore

* style: rewrite description assign in CheckResultCache in if-else
[ISSUE #46] Refactor and split `core` module
…er SQL (#52)

* refactor: add dependency of console module and move controllers into console module.

* fix: add logback config, fix application-dev.yml and move `</dependencyManagement>` to root `pom.xml` as pointed out in PR#19.

* FirstCommit

* remerge

* first improve

* second improve

* third improve

* fourth improve

* fourth improve

* fourth improve

* Update and rename EventmeshConsoleApplication.java to EventMeshDashboardApplication.java

* rename this starter class file to EventMeshDashboardApplication

* rename this starter class file to EventMeshDashboardApplication

* change some resource file

* improve name

* improve name

* Modify the fields of the synchronized log table

* improve name

* improve name

* config basic function and config ,runtime,store,cluster sql

* try to resolve build error

* Some changes in the specification

* something rename

* one sql update

* tag something to do

---------

Co-authored-by: lambert@arch <lambertrao@outlook.com>
Co-authored-by: 周倬贤 <14100340+zhou-zhuoxian@user.noreply.gitee.com>
* style: `sql` `entities` `mapper` improvement

* refactor: move health module into function module.
more files will be added in function module

* feat: add rocketmq check and nacos check

* fix: ci utf8

* fix: pom

* feat: add StoreType Enum
* added view code

* added navigation interaction

* added empty pages

* add topic statistics ui

* complete topic page style

---------

Co-authored-by: SUN <350916525@qq.com>
…he mapper method (#58)

* refactor: add dependency of console module and move controllers into console module.

* fix: add logback config, fix application-dev.yml and move `</dependencyManagement>` to root `pom.xml` as pointed out in PR#19.

* FirstCommit

* remerge

* first improve

* second improve

* third improve

* fourth improve

* fourth improve

* fourth improve

* Update and rename EventmeshConsoleApplication.java to EventMeshDashboardApplication.java

* rename this starter class file to EventMeshDashboardApplication

* rename this starter class file to EventMeshDashboardApplication

* change some resource file

* improve name

* improve name

* Modify the fields of the synchronized log table

* improve name

* improve name

* config basic function and config ,runtime,store,cluster sql

* try to resolve build error

* Some changes in the specification

* something rename

* one sql update

* tag something to do

* The distinction between state and status is_delete fields is unified, and selectAll() and batchInsert() are added to all instance tables for subsequent data synchronization. Modification of some fields.

* Delete eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/meta/ClusterEntity1.java

delete something no use

* Delete eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/meta/RuntimeEntity1.java

delete something no use

* improve something checkstyle error

* try to solve something sql test error

* try to resolve something test error

* try to resolve something test error

* something is_delete(error) change to status (#3)

Co-authored-by: 周倬贤 <14100340+zhou-zhuoxian@user.noreply.gitee.com>

---------

Co-authored-by: lambert@arch <lambertrao@outlook.com>
Co-authored-by: 周倬贤 <14100340+zhou-zhuoxian@user.noreply.gitee.com>
* feat: add SDK manager

* fix: SDKManagerTest

* fix: use SimpleEntry to replace Pair

* style: better name for SDK codes

* style

* style

* style: just rename SDK

* fix: checkstyle
…rors (#65)

* add back missing build label

* Fix module name

* add test scope

* exclude log4j-to-slf4j

* exclude log4j-slf4j-impl

* add auto deploy script

* add license

* refine the script
Pil0tXia and others added 11 commits March 19, 2024 16:09
* add DB_ADDRESS env var

* add env file

* skip tests & add manual

* add a hello endpoint

* exclude .env

* refine manual
* Refine logging level in different profiles

* Console logs are no longer recorded

* Reorder packages to avoid overwriting
* modify RocketmqTopicCore, using SDKManager

* fix style

* delete some variable in RocketmqProperties and TopicProperties & remote additional endPoint name

* remove junit dependency back to console module

* remove unnecessary brackets & revert em-dashboard-pom.xml & move RocketmqProperties to core.dto

* add todo

* move todo to common sdk dependencies & fix style

* add test and junit dependencies in core pom.xml

* revert the indentation in pom.xml & move test related dependencies to bottom in core-pom.xml

* revert indentation in pom.xml

* revert indentation in pom.xml

* remove unnecessary params

* remove params

* remove empty line
* add remoting service and move models into common module

* chore: fix mistakes and several rename

* [ISSUE #45] Implement methods from storage-plugin.admin(rocketmq) (#66)

* modify RocketmqTopicCore, using SDKManager

* fix style

* delete some variable in RocketmqProperties and TopicProperties & remote additional endPoint name

* remove junit dependency back to console module

* remove unnecessary brackets & revert em-dashboard-pom.xml & move RocketmqProperties to core.dto

* add todo

* move todo to common sdk dependencies & fix style

* add test and junit dependencies in core pom.xml

* revert the indentation in pom.xml & move test related dependencies to bottom in core-pom.xml

* revert indentation in pom.xml

* revert indentation in pom.xml

* remove unnecessary params

* remove params

* remove empty line

* chore: fix typos

---------

Co-authored-by: scwlkq <89067331+scwlkq@users.noreply.github.com>
* added view code

* added navigation interaction

* added empty pages

* add topic statistics ui

* complete topic page style

* update the UI style

---------

Co-authored-by: SUN <350916525@qq.com>
…pplication exits (#82)

* Add line number to log output

* No need to chmod anymore

* Exclude redundant task and check pid running
* add etcd sdk impl

* check
* feat: add service user and acl

* feat: add service user and acl

* feat: add service user and acl

* feat: add service user and acl

* feat: replace serviceuser with instanceuser

* feat: replace serviceuser with instanceuser #2

* feat: commit deletion serviceusermapperTest

* feat: 提交 application-test.yml 改回密码password的

* feat: 最终更改

* feat: 最终更改-2

* feat: 最终更改-3

* Revert "feat: 最终更改-3"

This reverts commit 528d6f2.

* feat: 最终更改-4

* feat: 最终更改-5
…e` module (#85)

* feat: tidy up pom, tidy up common module

* fix: set rocketmq-tools version the same as rocketmq-client

* fix: Optimize style
* Add view controller

* Some fixes to the position of the dynamic properties in the request, changes to the controller, and added comments to the config table

* improve somme method name

* Sync the modification of #85

* Sync the modification of #85

* Removed the use of delete annotations

---------

Co-authored-by: 周倬贤 <14100340+zhou-zhuoxian@user.noreply.gitee.com>
* Copy templates from EventMesh

* Change branch name from `master` to `main`

* Temporarily set `approving_count` to 0 to allow committers to merge themselves PR
@Pil0tXia Pil0tXia merged commit d296881 into main Apr 8, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Breaking Change] Merge dev branch into main
8 participants