Commit 51dcf2f1 by 张宗强

Merge branch 'master' of git@60.205.210.36:proudkids-pub/config-center.git

parents fee41a05 647d00ae
...@@ -37,7 +37,7 @@ sharding: ...@@ -37,7 +37,7 @@ sharding:
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
username: proudkids username: proudkids
password: pds123!@# password: pds123!@#
jdbc-url: jdbc:mysql://60.205.210.36:3306/proudkids_ce?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false jdbc-url: jdbc:mysql://192.168.1.82:3306/proudkids_ems?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
datasource: datasource:
names: ds names: ds
ds: ds:
...@@ -45,7 +45,7 @@ sharding: ...@@ -45,7 +45,7 @@ sharding:
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
username: proudkids username: proudkids
password: pds123!@# password: pds123!@#
jdbc-url: jdbc:mysql://60.205.210.36:3306/proudkids_ce?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false jdbc-url: jdbc:mysql://192.168.1.82:3306/proudkids_ems?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
config: config:
sharding: sharding:
tables: tables:
......
...@@ -102,7 +102,8 @@ urls: ...@@ -102,7 +102,8 @@ urls:
- /swagger/api-docs - /swagger/api-docs
- /webjars/** - /webjars/**
- /aom/lesson/downloadZip/* - /aom/lesson/downloadZip/*
- /aom/tutorUptime/classAssign/statistics/exportExcel/* - /aom/tutorUptime/classAssign/statistics/exportExcel*
- /aom/classLessonDetail/subscription
- /ruser/** - /ruser/**
- /ruser/v1/ruserChannel/installRuser/** - /ruser/v1/ruserChannel/installRuser/**
......
...@@ -96,7 +96,8 @@ urls: ...@@ -96,7 +96,8 @@ urls:
- /swagger/api-docs - /swagger/api-docs
- /webjars/** - /webjars/**
- /aom/lesson/downloadZip/* - /aom/lesson/downloadZip/*
- /aom/tutorUptime/classAssign/statistics/exportExcel/* - /aom/tutorUptime/classAssign/statistics/exportExcel*
- /aom/classLessonDetail/subscription
- /ruser/** - /ruser/**
- /ruser/v1/ruserChannel/installRuser/** - /ruser/v1/ruserChannel/installRuser/**
......
...@@ -90,7 +90,8 @@ urls: ...@@ -90,7 +90,8 @@ urls:
- /swagger/api-docs - /swagger/api-docs
- /webjars/** - /webjars/**
- /aom/lesson/downloadZip/* - /aom/lesson/downloadZip/*
- /aom/tutorUptime/classAssign/statistics/exportExcel/* - /aom/tutorUptime/classAssign/statistics/exportExcel*
- /aom/classLessonDetail/subscription
- /ruser/v1/ruserChannel/installRuser/** - /ruser/v1/ruserChannel/installRuser/**
logging: logging:
config: classpath:logback.xml config: classpath:logback.xml
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment