-
2. 增加社交平台的绑定与解绑
-
2. 将三方登陆，统一改成社交登陆
-
Conflicts: yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
-
Merge pull request !44 from 芋道源码/feature/user-admin-server
-
2. 优化 trace 相关的逻辑
-
Conflicts: src/main/resources/application-local.yaml
-
Conflicts: src/main/resources/application.yaml
-
梳理 druid 的配置
-
Conflicts: pom.xml src/main/resources/application-local.yaml
-
Conflicts: src/test/resources/sql/clean.sql src/test/resources/sql/create_tables.sql