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 #57] Modify the field, synchronize the modification, and add the mapper method #58

Merged
merged 41 commits into from
Mar 12, 2024
Merged

Conversation

zzxxiansheng
Copy link
Contributor

No description provided.

Lambert-Rao and others added 30 commits January 21, 2024 15:19
…cyManagement>` to root `pom.xml` as pointed out in PR#19.
# Conflicts:
#	eventmesh-dashboard-common/pom.xml
#	eventmesh-dashboard-console/pom.xml
#	eventmesh-dashboard-console/src/main/resources/application-dev.yml
#	eventmesh-dashboard-console/src/main/resources/eventmesh-dashboard.sql
#	pom.xml
# Conflicts:
#	eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/linkage/log/TestOprLog.java
#	eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/group/TestGroupDao.java
#	eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/groupmember/testGroupMemberDao.java
# Conflicts:
#	eventmesh-dashboard-console/pom.xml
#	eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/group/OprGroupMapper.java
#	eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/groupmember/OprGroupMemberMapper.java
#	eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/log/OprLogMapper.java
#	eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/topic/TopicMapper.java
#	eventmesh-dashboard-console/src/main/resources/application-dev.yml
#	eventmesh-dashboard-console/src/main/resources/eventmesh-dashboard.sql
@Pil0tXia
Copy link
Member

Please resolve conflicts. Besides, please checkout a new branch to develop, otherwise the readability of your commit history would be poor.

@zzxxiansheng
Copy link
Contributor Author

请解决冲突。此外,请检查一个新分支进行开发,否则提交历史记录的可读性会很差。

OK

# Conflicts:
#	eventmesh-dashboard-console/src/main/resources/eventmesh-dashboard.sql
Co-authored-by: 周倬贤 <14100340+zhou-zhuoxian@user.noreply.gitee.com>
@zzxxiansheng zzxxiansheng changed the title [#ISSUE 57]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.Dev [ISSUE #57]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.Dev Mar 11, 2024
@zzxxiansheng zzxxiansheng changed the title [ISSUE #57]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.Dev [ISSUE #57]Modify the field, synchronize the modification, and add the mapper method Mar 11, 2024
@Pil0tXia Pil0tXia changed the title [ISSUE #57]Modify the field, synchronize the modification, and add the mapper method [ISSUE #57] Modify the field, synchronize the modification, and add the mapper method Mar 12, 2024
@Pil0tXia Pil0tXia merged commit a165e04 into apache:dev Mar 12, 2024
2 checks passed
scwlkq pushed a commit to scwlkq/eventmesh-dashboard that referenced this pull request Mar 17, 2024
… add the mapper method (apache#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 (apache#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>
SLSJL pushed a commit to SLSJL/eventmesh-dashboard that referenced this pull request Mar 31, 2024
…to dev

* 'dev' of https://github.com/SLSJL/eventmesh-dashboard:
  [ISSUE apache#73] Add remoting service (apache#74)
  [ISSUE apache#45] Implement methods from storage-plugin.admin(rocketmq) (apache#66)
  [ISSUE apache#71] Reduce log file size and Streamline debug output (apache#72)
  [ISSUE apache#69] Integrate database credentials in auto-deploy (apache#70)
  [ISSUE apache#67] Fix HealthCheckResultMapper which leads to application error
  [ISSUE apache#64] Support automated deployment and Fix runtime packaging errors (apache#65)
  [ISSUE apache#60] add SDK manager (apache#62)
  [ISSUE apache#57] Modify the field, synchronize the modification, and add the mapper method (apache#58)
  [ISSUE apache#29] Set up EventMesh Dashboard Front-end (apache#56)
  [ISSUE apache#49] RocketMQ and Nacos health check (apache#53)
  [ISSUE apache#51] Config Mgmt basic function and config,runtime,store,cluster SQL (apache#52)

# Conflicts:
#	eventmesh-dashboard-view/public/index.html
#	eventmesh-dashboard-view/src/App.tsx
#	eventmesh-dashboard-view/src/index.tsx
#	eventmesh-dashboard-view/src/routes/RootLayout.tsx
#	eventmesh-dashboard-view/src/routes/navigation/Navigation.tsx
#	eventmesh-dashboard-view/src/routes/navigation/NavigationItem.tsx
#	eventmesh-dashboard-view/src/routes/topic/Topic.tsx
#	eventmesh-dashboard-view/src/routes/topic/stats/AbnormalTopicCount.tsx
#	eventmesh-dashboard-view/src/routes/topic/stats/Stats.tsx
#	eventmesh-dashboard-view/src/routes/topic/stats/StatsChart.tsx
#	eventmesh-dashboard-view/src/routes/topic/stats/TopicCount.tsx
#	eventmesh-dashboard-view/src/routes/topic/topic-list/TopicList.tsx
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.

3 participants