Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/yau/digitalrmb/platformintegration/application/CasTicketValidator.java
# src/main/java/com/yau/digitalrmb/platformintegration/infrastructure/JdbcPlatformIdentityRepository.java
# src/main/java/com/yau/digitalrmb/platformintegration/infrastructure/PlatformReadOnlyDataSourceConfig.java
# src/main/java/com/yau/digitalrmb/platformintegration/interfaces/CasAuthenticationController.java
# src/main/java/com/yau/digitalrmb/platformintegration/interfaces/PlatformSsoController.java
# src/main/resources/application-test.yml
# src/test/java/com/yau/digitalrmb/platformintegration/infrastructure/PlatformReadOnlyDataSourceConfigTest.java
|