Merge remote-tracking branch 'origin/master'

edu-task/src/main/java/com/keao/edu/task/TaskApplication.java

@@ -17,7 +17,7 @@ import com.spring4all.swagger.EnableSwagger2Doc;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients("com.keao.edu")
-@MapperScan("com.keao.edu.task.dal.dao")
+@MapperScan({"com.keao.edu.task.dal.dao","com.keao.edu.common.dao"})
 @ComponentScan("com.keao.edu")
 @Configuration
 @EnableSwagger2Doc

edu-task/src/main/resources/application.yml

@@ -79,8 +79,8 @@ logging:
 security:
   oauth2:
     client:
-      client-id: app
-      client-secret: app
+      client-id: system
+      client-secret: system
     resource:
       token-info-uri: http://localhost:8001/oauth/check_token