diff --git a/web/src/main/resources/application-dev.properties b/web/src/main/resources/application-dev.properties index 798251e4..c5cb9bbd 100644 --- a/web/src/main/resources/application-dev.properties +++ b/web/src/main/resources/application-dev.properties @@ -30,9 +30,10 @@ spring.datasource.dynamic.datasource.master.hikari.max-lifetime=60000 #spring.datasource.dynamic.datasource.ds2.hikari.max-lifetime=60000 # sqlManagers = \u591A\u4E2A sqlManager \u5217\u8868 -dynamic.beetlsql.sqlManagers = master,ds2,cs +#dynamic.beetlsql.sqlManagers = master,ds2,cs +dynamic.beetlsql.sqlManagers = master # primary \u9ED8\u8BA4 sqlManager -dynamic.beetlsql.primary = cs +dynamic.beetlsql.primary = master # transactionManager \u9ED8\u8BA4\u81EA\u52A8\u751F\u6210\uFF0C\u5982\u9700\u81EA\u5DF1\u7BA1\u7406\u5219\u8BBE\u7F6E\u4E3A false # dynamic.beetlsql.transactionManager = false @@ -45,7 +46,7 @@ dynamic.beetlsql.master.sqlPath = sql dynamic.beetlsql.master.daoSuffix = Dao dynamic.beetlsql.master.basePackage = com.ibeetl dynamic.beetlsql.master.dbStyle = org.beetl.sql.core.db.MySqlStyle -dynamic.beetlsql.master.slave = ds2 +#dynamic.beetlsql.master.slave = ds2 # B) \u540D\u79F0: ds2, dataSource \u540C\u540D\u79F0 ds2, \u6216 dynamic.beetlsql.ds2.ds = ds2 dynamic.beetlsql.ds2.sqlPath = sql diff --git a/web/src/main/resources/application-prod.properties b/web/src/main/resources/application-prod.properties index d98a1827..a517830f 100644 --- a/web/src/main/resources/application-prod.properties +++ b/web/src/main/resources/application-prod.properties @@ -30,14 +30,15 @@ spring.datasource.dynamic.datasource.master.hikari.max-lifetime=60000 #spring.datasource.dynamic.datasource.ds2.hikari.max-lifetime=60000 # sqlManagers = \u591A\u4E2A sqlManager \u5217\u8868 -dynamic.beetlsql.sqlManagers = master,ds2,cs +#dynamic.beetlsql.sqlManagers = master,ds2,cs +dynamic.beetlsql.sqlManagers = master # primary \u9ED8\u8BA4 sqlManager -dynamic.beetlsql.primary = cs +dynamic.beetlsql.primary = master # transactionManager \u9ED8\u8BA4\u81EA\u52A8\u751F\u6210\uFF0C\u5982\u9700\u81EA\u5DF1\u7BA1\u7406\u5219\u8BBE\u7F6E\u4E3A false # dynamic.beetlsql.transactionManager = false -# \u9ED8\u8BA4\u503C _default -dynamic.beetlsql._default.dev = true +# \u9ED8\u8BA4\u503C _default \u662F\u5426\u8F93\u51FADEBUG +dynamic.beetlsql._default.dev = false # 1, \u914D\u7F6E\u5355\u72EC sqlManager # A) \u540D\u79F0: ds1, dataSource \u540C\u540D\u79F0 ds1, \u6216 dynamic.beetlsql.ds1.ds = ds1 diff --git a/web/src/main/resources/application.properties b/web/src/main/resources/application.properties index eb2589f7..a691bf41 100644 --- a/web/src/main/resources/application.properties +++ b/web/src/main/resources/application.properties @@ -1,5 +1,6 @@ spring.profiles.active=dev #spring.profiles.active=local +#spring.profiles.active=prod m3u8.ffmpegPath=D:/ #admin.isOnline=false diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourse.md b/web/src/main/resources/sql/jlw/teacherOpenCourse.md index 775b33ba..83f7eff5 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourse.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourse.md @@ -63,6 +63,7 @@ queryByCondition @if(!isEmpty(teacherOpenCourseMergeAuthCode)){ and ta.teacher_open_course_merge_teacher_auth_code =#teacherOpenCourseMergeAuthCode# @} + order by ta.teacher_merge_application_order_index desc queryByConditionQuery @@ -128,7 +129,7 @@ queryByConditionQuery @if(!isEmpty(teacherOpenCourseMergeAuthCode)){ and ta.teacher_open_course_merge_teacher_auth_code =#teacherOpenCourseMergeAuthCode# @} - + order by ta.teacher_merge_application_order_index desc deleteTeacherOpenCourseByIds ===