From ad9b3c2ade43fbd3b2f2cd8af0653c58753591cc Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期四, 28 九月 2023 15:30:17 +0800
Subject: [PATCH] 9.26。14
---
cloud-server-account/src/main/resources/sharding-jdbc.properties | 4 +-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 8 ++-
.idea/workspace.xml | 36 +++++++++++-------
cloud-server-activity/src/main/resources/sharding-jdbc.properties | 4 +-
cloud-server-course/src/main/resources/sharding-jdbc.properties | 4 +-
cloud-server-competition/src/main/resources/sharding-jdbc.properties | 4 +-
cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/examineCoursePackage.html | 3 -
cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html | 2
8 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dd823e1..a8b2190 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -25,18 +25,15 @@
<select />
</component>
<component name="ChangeListManager">
- <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。12">
+ <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。13">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/KaptchaController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/KaptchaController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/Convert.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/Convert.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/MD5.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/MD5.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/SignUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/SignUtil.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/OrderUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/OrderUtil.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/three/Base64Coder.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/three/Base64Coder.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/resources/sharding-jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/resources/sharding-jdbc.properties" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-activity/src/main/resources/sharding-jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-activity/src/main/resources/sharding-jdbc.properties" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-competition/src/main/resources/sharding-jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/resources/sharding-jdbc.properties" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/resources/sharding-jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/resources/sharding-jdbc.properties" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/examineCoursePackage.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/examineCoursePackage.html" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -244,8 +241,8 @@
<item itemvalue="Spring Boot.OtherApplication" />
<item itemvalue="Spring Boot.UserApplication" />
<item itemvalue="Spring Boot.AccountApplication" />
- <item itemvalue="Spring Boot.AuthApplication" />
<item itemvalue="Spring Boot.ActivityApplication" />
+ <item itemvalue="Spring Boot.AuthApplication" />
<item itemvalue="Spring Boot.CourseApplication" />
<item itemvalue="Spring Boot.CompetitionApplication" />
<item itemvalue="应用程序.BigDecimalToChineseWords" />
@@ -305,6 +302,8 @@
<workItem from="1695775091167" duration="4246000" />
<workItem from="1695794503293" duration="3283000" />
<workItem from="1695799021203" duration="5869000" />
+ <workItem from="1695820563853" duration="56000" />
+ <workItem from="1695863479059" duration="8278000" />
</task>
<task id="LOCAL-00001" summary="后台代码删除">
<created>1690249807612</created>
@@ -557,7 +556,15 @@
<option name="project" value="LOCAL" />
<updated>1695795966970</updated>
</task>
- <option name="localTasksCounter" value="34" />
+ <task id="LOCAL-00034" summary="9.26。13">
+ <option name="closed" value="true" />
+ <created>1695820597140</created>
+ <option name="number" value="00034" />
+ <option name="presentableId" value="LOCAL-00034" />
+ <option name="project" value="LOCAL" />
+ <updated>1695820597140</updated>
+ </task>
+ <option name="localTasksCounter" value="35" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -595,7 +602,8 @@
<MESSAGE value="9.26。10" />
<MESSAGE value="9.26。11" />
<MESSAGE value="9.26。12" />
- <option name="LAST_COMMIT_MESSAGE" value="9.26。12" />
+ <MESSAGE value="9.26。13" />
+ <option name="LAST_COMMIT_MESSAGE" value="9.26。13" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
diff --git a/cloud-server-account/src/main/resources/sharding-jdbc.properties b/cloud-server-account/src/main/resources/sharding-jdbc.properties
index d3f7a4e..9c041c5 100644
--- a/cloud-server-account/src/main/resources/sharding-jdbc.properties
+++ b/cloud-server-account/src/main/resources/sharding-jdbc.properties
@@ -3,9 +3,9 @@
#��������
datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
-datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_account?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+datasource.master0.url=jdbc:mysql://8.137.22.229:3306/playpai_account?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
datasource.master0.username=root
-datasource.master0.password=123456
+datasource.master0.password=playpai2023!
datasource.master0.maxActive=20
datasource.master0.maxWait=60000
datasource.master0.minIdle=5
diff --git a/cloud-server-activity/src/main/resources/sharding-jdbc.properties b/cloud-server-activity/src/main/resources/sharding-jdbc.properties
index 54db095..f7b7fb6 100644
--- a/cloud-server-activity/src/main/resources/sharding-jdbc.properties
+++ b/cloud-server-activity/src/main/resources/sharding-jdbc.properties
@@ -3,9 +3,9 @@
#��������
datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
-datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_activity?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+datasource.master0.url=jdbc:mysql://8.137.22.229:3306/playpai_activity?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
datasource.master0.username=root
-datasource.master0.password=123456
+datasource.master0.password=playpai2023!
datasource.master0.maxActive=20
datasource.master0.maxWait=60000
datasource.master0.minIdle=5
diff --git a/cloud-server-competition/src/main/resources/sharding-jdbc.properties b/cloud-server-competition/src/main/resources/sharding-jdbc.properties
index ffe6f6b..e9334d0 100644
--- a/cloud-server-competition/src/main/resources/sharding-jdbc.properties
+++ b/cloud-server-competition/src/main/resources/sharding-jdbc.properties
@@ -3,9 +3,9 @@
#��������
datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
-datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_competition?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+datasource.master0.url=jdbc:mysql://8.137.22.229:3306/playpai_competition?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
datasource.master0.username=root
-datasource.master0.password=123456
+datasource.master0.password=playpai2023!
datasource.master0.maxActive=20
datasource.master0.maxWait=60000
datasource.master0.minIdle=5
diff --git a/cloud-server-course/src/main/resources/sharding-jdbc.properties b/cloud-server-course/src/main/resources/sharding-jdbc.properties
index 09e20a5..ca0dde7 100644
--- a/cloud-server-course/src/main/resources/sharding-jdbc.properties
+++ b/cloud-server-course/src/main/resources/sharding-jdbc.properties
@@ -3,9 +3,9 @@
#��������
datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
-datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_course?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+datasource.master0.url=jdbc:mysql://8.137.22.229:3306/playpai_course?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
datasource.master0.username=root
-datasource.master0.password=123456
+datasource.master0.password=playpai2023!
datasource.master0.maxActive=20
datasource.master0.maxWait=60000
datasource.master0.minIdle=5
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
index b29cf19..c67343c 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
@@ -587,11 +587,13 @@
List<Coach> coaches = coachClient.queryCoachByCity(cityCode);
model.addAttribute("coach", coaches);
List<CoursePackagePaymentConfig> list4 = coursePackagePaymentConfigClient.queryCoursePackagePaymentConfigList(id);
+ if(list4.size()!=0){
+ CoursePackagePaymentConfig coursePackagePaymentConfig = list4.get(0);
+ model.addAttribute("cashPayment", coursePackagePaymentConfig.getCashPayment() == 0 ? false : true);
+ model.addAttribute("playPaiCoin", coursePackagePaymentConfig.getPlayPaiCoin() == 0 ? false : true);}
model.addAttribute("coursePackagePaymentConfig", list4.remove(0));
model.addAttribute("coursePackagePaymentConfigs", list4);
- CoursePackagePaymentConfig coursePackagePaymentConfig = list4.get(0);
- model.addAttribute("cashPayment", coursePackagePaymentConfig.getCashPayment() == 0 ? false : true);
- model.addAttribute("playPaiCoin", coursePackagePaymentConfig.getPlayPaiCoin() == 0 ? false : true);
+
return PREFIX + "examineCoursePackage_info.html";
}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/examineCoursePackage.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/examineCoursePackage.html
index b490e0e..152721d 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/examineCoursePackage.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/examineCoursePackage.html
@@ -58,9 +58,8 @@
@if(shiro.hasPermission("/coursePackage/examineCoursePackage")){
<#button name="审核" icon="fa-plus" clickFun="ExamineCoursePackage.examineCoursePackage()"/>
@}
- @if(shiro.hasPermission("/coursePackage/detailsExamineCoursePackage")){
<#button name="详情" icon="fa-check-circle" clickFun="ExamineCoursePackage.detailsExamineCoursePackage()" space="true"/>
- @}
+
</div>
<#table id="managerTable"/>
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html
index 3795524..dc30dbe 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html
@@ -838,7 +838,7 @@
"url": "/tStudent/backmoney",
"params": {
"ids": "$ids",
- "id": "$id"
+ "id": "$studentId"
}
}
}
--
Gitblit v1.7.1