Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: xkcoding/spring-boot-demo
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Lilaccoral/spring-boot-demo
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 12 commits
  • 0 files changed
  • 2 contributors

Commits on Aug 22, 2019

  1. 1、spring-boot-admin版本低于spring-boot版本，导致项目启动失败 

    2、spring-boot-admin-server配置context-path需修改至server.servlet下，否则启动后无法正常使用
    @Lilaccoral
    Lilaccoral committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    8eac180 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/xkcoding/spring-boot-demo 

    # Conflicts:
#	spring-boot-demo-admin-client/pom.xml
#	spring-boot-demo-admin-server/pom.xml
#	spring-boot-demo-admin-server/src/main/resources/application.yml
    @Lilaccoral
    Lilaccoral committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    e860938 View commit details
    Browse the repository at this point in the history

  3. 更新

    @Lilaccoral
    Lilaccoral committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    d8effb0 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2019

  1. Merge pull request #2 from xkcoding/master 

    merge from base
    @Lilaccoral
    Lilaccoral authored Sep 4, 2019
    Configuration menu
    Copy the full SHA
    73c5339 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2019

  1. Merge pull request #3 from xkcoding/master 

    merge
    @Lilaccoral
    Lilaccoral authored Sep 11, 2019
    Configuration menu
    Copy the full SHA
    d155ade View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2019

  1. Merge pull request #4 from xkcoding/master 

    merge
    @Lilaccoral
    Lilaccoral authored Sep 16, 2019
    Configuration menu
    Copy the full SHA
    4ab8d49 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2019

  1. Merge pull request #5 from xkcoding/master 

    merge
    @Lilaccoral
    Lilaccoral authored Sep 23, 2019
    Configuration menu
    Copy the full SHA
    32c95ef View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2019

  1. Merge pull request #6 from xkcoding/master 

    merge from origin
    @Lilaccoral
    Lilaccoral authored Nov 15, 2019
    Configuration menu
    Copy the full SHA
    30dc9ee View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2019

  1. Merge pull request #7 from xkcoding/master 

    🐛 修复 swagger 配置缺失 base-package 问题
    @Lilaccoral
    Lilaccoral authored Dec 10, 2019
    Configuration menu
    Copy the full SHA
    2bcf49b View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2020

  1. Merge pull request #8 from xkcoding/master 

    merge
    @Lilaccoral
    Lilaccoral authored Apr 11, 2020
    Configuration menu
    Copy the full SHA
    deac657 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2020

  1. Merge pull request #9 from xkcoding/master 

    merge
    @Lilaccoral
    Lilaccoral authored Nov 7, 2020
    Configuration menu
    Copy the full SHA
    c1e610a View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2021

  1. Merge pull request #11 from xkcoding/master 

    merge
    @Lilaccoral
    Lilaccoral authored Apr 7, 2021
    Configuration menu
    Copy the full SHA
    a483ff0 View commit details
    Browse the repository at this point in the history
Loading