From 41c07e4558ed3a1cbdda0711f78cd3a812c06829 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 28 九月 2023 18:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java | 9 +-
cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml | 4
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java | 4
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java | 4
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/MD5.java | 5
cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/examineCoursePackage_info.html | 7 +
cloud-server-management/src/main/webapp/static/modular/system/coursePackage/examineCoursePackage.js | 6 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java | 2
cloud-server-account/src/main/resources/sharding-jdbc.properties | 4
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java | 2
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 13 ++
.idea/workspace.xml | 55 +++++++++++--
cloud-server-activity/src/main/resources/sharding-jdbc.properties | 4
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/SignUtil.java | 5
cloud-server-course/src/main/resources/sharding-jdbc.properties | 4
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/Convert.java | 23 +++--
cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/three/Base64Coder.java | 26 ++++--
cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/OrderUtil.java | 4
cloud-server-competition/src/main/resources/sharding-jdbc.properties | 4
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/KaptchaController.java | 1
cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/banckmoney.html | 18 +++-
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
23 files changed, 145 insertions(+), 64 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5f05b5b..1396dec 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
+ <component name="AnalysisUIOptions">
+ <option name="GROUP_BY_SEVERITY" value="true" />
+ </component>
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
@@ -22,9 +25,11 @@
<select />
</component>
<component name="ChangeListManager">
- <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。11">
+ <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。14">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java" 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_info.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/examineCoursePackage_info.html" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/examineCoursePackage.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/examineCoursePackage.js" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -54,13 +59,15 @@
<component name="MavenImportPreferences">
<option name="generalSettings">
<MavenGeneralSettings>
- <option name="mavenHome" value="$PROJECT_DIR$/../../../apache-maven/apache-maven-3.6.1" />
- <option name="userSettingsFile" value="D:\apache-maven\apache-maven-3.6.1\conf\settings.xml" />
+ <option name="mavenHome" value="使用 Maven 包装器" />
</MavenGeneralSettings>
</option>
</component>
<component name="PackageJsonUpdateNotifier">
<dismissed value="$PROJECT_DIR$/package.json" />
+ </component>
+ <component name="ProblemsViewState">
+ <option name="selectedTabId" value="ProjectErrors" />
</component>
<component name="ProjectId" id="2T0poWYlZShlnPso29uxjn4gQQo" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
@@ -91,7 +98,7 @@
"project.structure.last.edited": "模块",
"project.structure.proportion": "0.15",
"project.structure.side.proportion": "0.54367816",
- "settings.editor.selected.configurable": "preferences.pluginManager",
+ "settings.editor.selected.configurable": "MavenSettings",
"spring.configuration.checksum": "b0c8222ba40624e179f539b98c2e8cad",
"vue.rearranger.settings.migration": "true"
}
@@ -230,8 +237,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" />
@@ -288,6 +295,11 @@
<workItem from="1695638521906" duration="1415000" />
<workItem from="1695689815334" duration="13353000" />
<workItem from="1695718856285" duration="22098000" />
+ <workItem from="1695775091167" duration="4246000" />
+ <workItem from="1695794503293" duration="3283000" />
+ <workItem from="1695799021203" duration="5869000" />
+ <workItem from="1695820563853" duration="56000" />
+ <workItem from="1695863479059" duration="12419000" />
</task>
<task id="LOCAL-00001" summary="后台代码删除">
<created>1690249807612</created>
@@ -532,7 +544,31 @@
<option name="project" value="LOCAL" />
<updated>1695740202022</updated>
</task>
- <option name="localTasksCounter" value="33" />
+ <task id="LOCAL-00033" summary="9.26。12">
+ <option name="closed" value="true" />
+ <created>1695795966970</created>
+ <option name="number" value="00033" />
+ <option name="presentableId" value="LOCAL-00033" />
+ <option name="project" value="LOCAL" />
+ <updated>1695795966970</updated>
+ </task>
+ <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>
+ <task id="LOCAL-00035" summary="9.26。14">
+ <option name="closed" value="true" />
+ <created>1695886217811</created>
+ <option name="number" value="00035" />
+ <option name="presentableId" value="LOCAL-00035" />
+ <option name="project" value="LOCAL" />
+ <updated>1695886217811</updated>
+ </task>
+ <option name="localTasksCounter" value="36" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -569,7 +605,10 @@
<MESSAGE value="9.26。9" />
<MESSAGE value="9.26。10" />
<MESSAGE value="9.26。11" />
- <option name="LAST_COMMIT_MESSAGE" value="9.26。11" />
+ <MESSAGE value="9.26。12" />
+ <MESSAGE value="9.26。13" />
+ <MESSAGE value="9.26。14" />
+ <option name="LAST_COMMIT_MESSAGE" value="9.26。14" />
</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/mapper/CoursePackageSchedulingMapper.xml b/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml
index 8f0c860..5ea7737 100644
--- a/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml
@@ -25,6 +25,8 @@
cancelClasses,
deductClassHour,
integral
- FROM t_course_package_scheduling where coursePackageId = #{item.coursePackageId} order by classDate desc
+ FROM t_course_package_scheduling where coursePackageId = #{item.coursePackageId} GROUP BY classDate
+ order by classDate desc
+
</select>
</mapper>
\ No newline at end of file
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/CoachController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java
index 162bfbd..260c9bb 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java
@@ -128,7 +128,9 @@
coach.setCityManagerId(objectId);
}
- if (coach.getDiploma().equals("")) coach.setDiploma(null);
+ if (coach.getDiploma().equals("")) {
+ coach.setDiploma(null);
+ }
if (coach.getCertificateImg().equals("") ){
coach.setCertificateImg(null);
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
index 79b3940..4447d2b 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
@@ -172,7 +172,7 @@
for (QueryAppUserVO queryAppUserVO : queryAppUserVOS) {
if (queryAppUserVO.getSalesmanUserId()!=null){
for (User sale : sales) {
- if (queryAppUserVO.getSalesmanUserId() == sale.getId()){
+ if (queryAppUserVO.getSalesmanUserId().equals(sale.getId())){
result.add(queryAppUserVO);
}
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java
index 963fbd3..7f0e88c 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java
@@ -172,7 +172,9 @@
@RequestMapping(value = "/onChange")
@ResponseBody
public Object onChange(Integer oneId) {
- if (oneId == null) return null;
+ if (oneId == null) {
+ return null;
+ }
try {
TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, oneId));
QueryWrapper<TCity> query = new QueryWrapper<TCity>().eq("parent_id", one.getId());
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..bb8cc3f 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
@@ -556,6 +556,11 @@
public String showExamineCoursePackageDetails(Model model, Integer id){
TCoursePackage tCoursePackage = coursePackageService.queryById(id);
model.addAttribute("item", tCoursePackage);
+ System.out.println("============"+ tCoursePackage.getAuditStatus());
+ model.addAttribute("auditStatus", tCoursePackage.getAuditStatus());
+
+ model.addAttribute("authRemark", tCoursePackage.getAuthRemark());
+
model.addAttribute("classTime", tCoursePackage.getClassStartTime() + ":00 - " + tCoursePackage.getClassEndTime() + ":00");
String[] split = tCoursePackage.getClassWeeks().split(";");
List<String> list5 = Arrays.asList("周一", "周二", "周三", "周四", "周五", "周六", "周日");
@@ -587,11 +592,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/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java
index a0b3d26..cfff158 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java
@@ -176,7 +176,7 @@
List<TQueryBenefitsVideosVO> courseByCourseIds = courseClient.getCourseByCourseIds(vo);
for (BenefitsVideos benefitsVideos : benefitVideoById) {
for (TQueryBenefitsVideosVO courseByCourseId : courseByCourseIds) {
- if (benefitsVideos.getCourseId() == courseByCourseId.getId()){
+ if (benefitsVideos.getCourseId().equals(courseByCourseId.getId())){
courseByCourseId.setIntegral(benefitsVideos.getIntegral());
courseByCourseId.setBenefitsVideosId(benefitsVideos.getId());
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/KaptchaController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/KaptchaController.java
index 469f65f..2110f79 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/KaptchaController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/KaptchaController.java
@@ -23,6 +23,7 @@
* @author fengshuonan
* @date 2017-05-05 23:10
*/
+
@Controller
@RequestMapping("/kaptcha")
public class KaptchaController {
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
index 4af6710..8bf7816 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
@@ -558,8 +558,9 @@
if (resultUtil==""||resultUtil==null){
return new ResultUtil<>(0,0,"报名成功");
- }else
- return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);
+ }else{
+ return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);}
+
}
@@ -582,8 +583,8 @@
if (resultUtil==""){
return new ResultUtil<>(0,0,"报名成功");
- }else
- return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);
+ }else{
+ return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);}
}
//赠课
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/Convert.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/Convert.java
index 5e71f40..b89bfd2 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/Convert.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/Convert.java
@@ -37,10 +37,11 @@
try {
if (clazz.isAssignableFrom(String.class)) {
// ----2016-12-19---zhuangqian----防止beetlsql对空字符串不检测导致无法入库的问题----
- if (StrKit.isBlank(String.valueOf(value)))
- return " ";
- else
- return String.valueOf(value);
+ if (StrKit.isBlank(String.valueOf(value))) {
+ return " ";
+ } else {
+ return String.valueOf(value);
+ }
}
return clazz.cast(value);
} catch (ClassCastException e) {
@@ -83,7 +84,9 @@
return null;
}
- if (StrKit.isBlank(valueStr)) return null;
+ if (StrKit.isBlank(valueStr)) {
+ return null;
+ }
BasicType basicType = null;
try {
@@ -971,10 +974,12 @@
c = strText.charAt(i);
intAsc = (int) c;
strHex = Integer.toHexString(intAsc);
- if (intAsc > 128)
- str.append("\\u" + strHex);
- else // 低位在前面补00
- str.append("\\u00" + strHex);
+ if (intAsc > 128) {
+ str.append("\\u" + strHex);
+ } else // 低位在前面补00
+ {
+ str.append("\\u00" + strHex);
+ }
}
return str.toString();
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/MD5.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/MD5.java
index 3e824cd..63cad97 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/MD5.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/MD5.java
@@ -25,8 +25,9 @@
*
*/
public static String md5(String input) {
- if (input == null)
- return null;
+ if (input == null) {
+ return null;
+ }
try {
// 拿到一个MD5转换器（如果想要SHA1参数换成”SHA1”）
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/SignUtil.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/SignUtil.java
index 72a4b79..c256e9b 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/SignUtil.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/SignUtil.java
@@ -73,10 +73,11 @@
private static String byteArrayToString(byte[] byteArray){
StringBuilder strBuilder = new StringBuilder();
for (int i = 0; i < byteArray.length; i++) {
- if (Integer.toHexString(0xFF & byteArray[i]).length() == 1)
+ if (Integer.toHexString(0xFF & byteArray[i]).length() == 1) {
strBuilder.append("0").append(Integer.toHexString(0xFF & byteArray[i]));
- else
+ } else {
strBuilder.append(Integer.toHexString(0xFF & byteArray[i]));
+ }
}
return strBuilder.toString();
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/OrderUtil.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/OrderUtil.java
index 6820eff..649b6a8 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/OrderUtil.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/OrderUtil.java
@@ -12,7 +12,7 @@
public class OrderUtil {
/* 订单号 */
- private static long orderNum = 0l;
+ private static long orderNum = 0L;
/* 日期 */
private static String date;
@@ -25,7 +25,7 @@
String str = new SimpleDateFormat("yyMMddHHmmss").format(new Date());
if (date == null || !date.equals(str)) {
date = str;
- orderNum = 0l;
+ orderNum = 0L;
}
orderNum++;
long orderNo = Long.parseLong((date)) * 1000000;
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/three/Base64Coder.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/three/Base64Coder.java
index be8cd9c..d1bd814 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/three/Base64Coder.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/three/Base64Coder.java
@@ -26,16 +26,18 @@
char_array_4[1] = (byte) (((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4));
char_array_4[2] = (byte) (((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6));
char_array_4[3] = (byte) (char_array_3[2] & 0x3f);
- for (i = 0; (i < 4); i++)
+ for (i = 0; (i < 4); i++) {
retContent += base64_alphabet[char_array_4[i]];
+ }
i = 0;
}
}
// handling the last input content
if (i > 0) {
- for (j = i; j < 3; j++)
+ for (j = i; j < 3; j++) {
char_array_3[j] = 0; // padding of zero
+ }
char_array_4[0] = (byte) ((char_array_3[0] & 0xfc) >> 2); // right
// shift
@@ -43,12 +45,15 @@
char_array_4[2] = (byte) (((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6));
char_array_4[3] = (byte) (char_array_3[2] & 0x3f);
- for (j = 0; (j < i + 1); j++)
+ for (j = 0; (j < i + 1); j++) {
retContent += base64_alphabet[char_array_4[j]];
+ }
while ((i++ < 3))
// padding of '=' of output string
+ {
retContent += '=';
+ }
}
return retContent;
@@ -68,33 +73,38 @@
mLength--;
char_array_4[i++] = data[enCode++];
if (i == 4) {
- for (i = 0; i < 4; i++)
+ for (i = 0; i < 4; i++) {
char_array_4[i] = findChar((char) char_array_4[i]);
+ }
char_array_3[0] = (byte) ((char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4));
char_array_3[1] = (byte) (((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2));
char_array_3[2] = (byte) (((char_array_4[2] & 0x3) << 6) + char_array_4[3]);
- for (i = 0; (i < 3); i++)
+ for (i = 0; (i < 3); i++) {
retContent += (char) char_array_3[i];
+ }
i = 0;
}
}
// last content handling
if (i > 0) {
- for (j = i; j < 4; j++)
+ for (j = i; j < 4; j++) {
char_array_4[j] = 0;
+ }
- for (j = 0; j < 4; j++)
+ for (j = 0; j < 4; j++) {
char_array_4[j] = findChar((char) char_array_4[j]);
+ }
char_array_3[0] = (byte) ((char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4));
char_array_3[1] = (byte) (((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2));
char_array_3[2] = (byte) (((char_array_4[2] & 0x3) << 6) + char_array_4[3]);
- for (j = 0; (j < i - 1); j++)
+ for (j = 0; (j < i - 1); j++) {
retContent += (char) char_array_3[j];
+ }
}
return retContent;
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/coursePackage/examineCoursePackage_info.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/examineCoursePackage_info.html
index 9fe4f92..a16fef0 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/examineCoursePackage_info.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/examineCoursePackage_info.html
@@ -204,14 +204,15 @@
<div class="form-group">
<label class="col-sm-3 control-label">*审核状态：</label>
<div class="col-sm-8" style="margin-top: 6px;">
- <input name="auditStatus" type="radio" value="2"/> 通过
- <input name="auditStatus" type="radio" value="3"/> 拒绝
+ <input name="auditStatus" type="radio" value="2" ${auditStatus == 2 ? 'checked' : ''}/> 通过
+ <input name="auditStatus" type="radio" value="3" ${auditStatus == 3 ? 'checked':''}/> 拒绝
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">*拒绝理由：</label>
<div class="col-sm-8" style="margin-top: 6px;">
- <textarea id="authRemark" style="width: 100%;height: 200px;" placeholder="请输入拒绝理由"></textarea>
+ <textarea id="authRemark" style="width: 100%;height: 200px;" placeholder="请输入拒绝理由" >${authRemark!}</textarea>
+
</div>
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/banckmoney.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/banckmoney.html
index 8e61277..6b29097 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/banckmoney.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/banckmoney.html
@@ -44,20 +44,22 @@
"body": [
{
"type": "form",
- "title": "表单",
- "hidden": true,
+ "id": "u:285d560cf7ab",
+ "title": "表单1",
"body": [
{
"label": "文本",
"type": "input-text",
"name": "id",
- "id": "u:99d3d8869d55"
+ "id": "u:99d3d8869d55",
+ "hidden": true
},
{
"label": "文本",
"type": "input-text",
"name": "ids",
- "id": "u:5b12dc7c90"
+ "id": "u:5b12dc7c90",
+ "hidden": true
}
],
"api": {
@@ -65,10 +67,14 @@
"method": "post",
"requestAdaptor": "",
"adaptor": "",
- "messages": {},
+ "messages": {
+ },
"dataType": "form"
},
- "id": "u:285d560cf7ab"
+ "actions": [
+ ],
+ "wrapWithPanel": false,
+ "visible": true
},
{
"type": "property",
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"
}
}
}
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/examineCoursePackage.js b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/examineCoursePackage.js
index 3e9d1a6..1d0e26b 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/examineCoursePackage.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/examineCoursePackage.js
@@ -99,7 +99,11 @@
Feng.error("请选择审核结果");
return
}
- let authRemark = $('#authRemark').text();
+
+ let authRemark = $('#authRemark').val();
+ console.log("========="+authRemark)
+
+
if(3 == auditStatus && '' == authRemark){
Feng.error("请输入拒绝理由");
return
--
Gitblit v1.7.1