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.

Sign up for GitHub

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

Jump to bottom

解决 AppId 为 search 时和搜索接口 apps/search 产生的冲突 #2805

Merged
merged 5 commits into from
Nov 30, 2019
Merged

解决 AppId 为 search 时和搜索接口 apps/search 产生的冲突 #2805

merged 5 commits into from
Nov 30, 2019

Conversation

crecel
Copy link
Contributor

@crecel crecel commented Nov 29, 2019

fix #2803

@crecel
Update AppController.java
fc3357f 
modify /apps/search -> /apps/search/by
@crecel
Update directive.js
9aa3c85 
modify /apps/search -> /apps/search/by
@JaredTan95 JaredTan95 added backend bug Categorizes issue or PR as related to a bug. labels Nov 29, 2019
@JaredTan95 JaredTan95 added this to the 1.6.0 milestone Nov 29, 2019
@coveralls
Copy link

coveralls commented Nov 29, 2019 •
edited
Loading

Coverage Status

Coverage remained the same at 54.058% when pulling 4c1cf77 on crecel:crecel into d83c6e2 on ctripcorp:master.

@crecel
Update AppController.java
80899b8 
modify apps/search -> apps/by-appId-or-name
@crecel
Update directive.js
286ce01 
modify /apps/search -> /apps/search/by-appId-or-name
@crecel
Update AppController.java
4c1cf77 
modify /apps/search -> /apps/search/by-appId-or-name
@codecov-io
Copy link

codecov-io commented Nov 30, 2019 •
edited
Loading

Codecov Report

Merging #2805 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #2805   +/-   ##
=========================================
  Coverage     50.48%   50.48%           
  Complexity     2084     2084           
=========================================
  Files           413      413           
  Lines         12666    12666           
  Branches       1294     1294           
=========================================
  Hits           6394     6394           
  Misses         5819     5819           
  Partials        453      453
Impacted Files Coverage Δ Complexity Δ
...mework/apollo/portal/controller/AppController.java 26.25% <ø> (ø) 3 <0> (ø) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d83c6e2...4c1cf77. Read the comment docs.

JaredTan95
JaredTan95 approved these changes Nov 30, 2019
View reviewed changes
Copy link
Member

@JaredTan95 JaredTan95 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@JaredTan95 JaredTan95 merged commit 0f8166f into apolloconfig:master Nov 30, 2019
@crecel crecel deleted the crecel branch December 18, 2019 10:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nobodyiam nobodyiam nobodyiam left review comments

@JaredTan95 JaredTan95 JaredTan95 approved these changes

Assignees
No one assigned
Labels
bug Categorizes issue or PR as related to a bug.
Projects
None yet
Milestone
1.6.0
Development

Successfully merging this pull request may close these issues.

当 AppId 叫 search 时会和搜索接口冲突
5 participants
@crecel @coveralls @codecov-io @nobodyiam @JaredTan95