bug修改 全部代码提交

无关风月

2026-01-06 db5ea69bd9bfca00e72c3d8d3a80bb5db991c75d

bug修改 全部代码提交

 cloud-server-account/src/main/java/com/dsh/account/service/impl/EvaluateStudentServiceImpl.java

@@ -14,6 +14,7 @@
import com.dsh.account.service.EvaluateStudentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

import javax.annotation.Resource;
import java.text.SimpleDateFormat;
@@ -63,9 +64,13 @@
                vo.setStuName(user.getName());
                vo.setComTime(format.format(evaluateStudent.getInsertTime()));
                vo.setContents(evaluateStudent.getContent());

                String imgs = evaluateStudent.getImgs();
                String[] split = imgs.split(",");
                vo.setImgs(Arrays.asList(split));
                if (StringUtils.hasLength(imgs)){
                    String[] split = imgs.split(",");
                    vo.setImgs(Arrays.asList(split));
                }

                stuCommentsVos.add(vo);
            }
        }

 cloud-server-account/src/main/resources/sharding-jdbc.properties

@@ -1,7 +1,7 @@
#datasource.names=master0
#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://221.182.45.100:3309/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.maxActive=20
@@ -9,18 +9,27 @@
#datasource.master0.minIdle=5
#datasource.master0.initialSize=2



datasource.names=master0
datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
datasource.master0.url=jdbc:mysql://127.0.0.1/playpai_account?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
datasource.master0.url=jdbc:mysql://127.0.0.1:3306/playpai_account?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
datasource.master0.username=root
datasource.master0.password=playpai2023!
datasource.master0.password=root
datasource.master0.maxActive=20
datasource.master0.maxWait=60000
datasource.master0.minIdle=5
datasource.master0.initialSize=2

#datasource.names=master0
#datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
#datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
#datasource.master0.url=jdbc:mysql://127.0.0.1:3306/playpai_account?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
#datasource.master0.username=root
#datasource.master0.password=playpai2023!
#datasource.master0.maxActive=20
#datasource.master0.maxWait=60000
#datasource.master0.minIdle=5
#datasource.master0.initialSize=2




 cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminRecordController.java

@@ -44,22 +44,23 @@
    private StoreClient storeClient;
    @Resource
    private UserPointsMerchandiseService userPointsMerchandiseService;
//    @GetMapping("/grantTicket")
//    public void grantTicket(Integer userId, Integer id) throws Exception {
//        UserPointsMerchandise userPointsMerchandise = new UserPointsMerchandise();
//        userPointsMerchandise.setPointsMerchandiseId(id);
//        userPointsMerchandise.setUserId(userId);
//        userPointsMerchandise.setStatus(1);
//        userPointsMerchandise.setInsertTime(new Date());
//     947024   userPointsMerchandise.setPayType(1);
//        userPointsMerchandise.setGoodsNumber(1);
//        userPointsMerchandise.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(5));
//        userPointsMerchandise.setPayStatus(2);
//        userPointsMerchandise.setState(1);
//        userPointsMerchandise.setCashPayType(1);
//        userPointsMerchandise.setPaymentTime(new Date());
//        userPointsMerchandiseService.save(userPointsMerchandise);
//    }
    // 补偿接口 赠送门票
    @GetMapping("/grantTicket")
    public void grantTicket(Integer userId, Integer id) throws Exception {
        UserPointsMerchandise userPointsMerchandise = new UserPointsMerchandise();
        userPointsMerchandise.setPointsMerchandiseId(id);
        userPointsMerchandise.setUserId(userId);
        userPointsMerchandise.setStatus(1);
        userPointsMerchandise.setInsertTime(new Date());
        userPointsMerchandise.setPayType(1);
        userPointsMerchandise.setGoodsNumber(1);
        userPointsMerchandise.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(5));
        userPointsMerchandise.setPayStatus(2);
        userPointsMerchandise.setState(1);
        userPointsMerchandise.setCashPayType(1);
        userPointsMerchandise.setPaymentTime(new Date());
        userPointsMerchandiseService.save(userPointsMerchandise);
    }
    /**
     * 硬件开门后回调 存储玩湃惠民卡使用记录
     */

 cloud-server-activity/src/main/resources/sharding-jdbc.properties

@@ -1,7 +1,7 @@
#datasource.names=master0
#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://221.182.45.100:3309/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.maxActive=20
@@ -9,19 +9,28 @@
#datasource.master0.minIdle=5
#datasource.master0.initialSize=2



datasource.names=master0
datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
datasource.master0.url=jdbc:mysql://127.0.0.1/playpai_activity?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
datasource.master0.url=jdbc:mysql://127.0.0.1:3306/playpai_activity?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
datasource.master0.username=root
datasource.master0.password=playpai2023!
datasource.master0.password=root
datasource.master0.maxActive=20
datasource.master0.maxWait=60000
datasource.master0.minIdle=5
datasource.master0.initialSize=2

#datasource.names=master0
#datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
#datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
#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=playpai2023!
#datasource.master0.maxActive=20
#datasource.master0.maxWait=60000
#datasource.master0.minIdle=5
#datasource.master0.initialSize=2





 cloud-server-communityWorldCup/src/main/resources/sharding-jdbc.properties

@@ -10,14 +10,25 @@
#datasource.master0.minIdle=5
#datasource.master0.initialSize=2


datasource.names=master0
datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
datasource.master0.url=jdbc:mysql://127.0.0.1:3306/playpai_community_world_cup?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
datasource.master0.username=root
datasource.master0.password=playpai2023!
datasource.master0.password=root
datasource.master0.maxActive=20
datasource.master0.maxWait=60000
datasource.master0.minIdle=5
datasource.master0.initialSize=2


#datasource.names=master0
#datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
#datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
#datasource.master0.url=jdbc:mysql://127.0.0.1:3306/playpai_community_world_cup?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
#datasource.master0.username=root
#datasource.master0.password=playpai2023!
#datasource.master0.maxActive=20
#datasource.master0.maxWait=60000
#datasource.master0.minIdle=5
#datasource.master0.initialSize=2

 cloud-server-competition/src/main/resources/sharding-jdbc.properties

@@ -1,7 +1,7 @@
#datasource.names=master0
#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://221.182.45.100:3309/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.maxActive=20
@@ -9,18 +9,27 @@
#datasource.master0.minIdle=5
#datasource.master0.initialSize=2



datasource.names=master0
datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
datasource.master0.url=jdbc:mysql://127.0.0.1:3306/playpai_competition?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
datasource.master0.username=root
datasource.master0.password=playpai2023!
datasource.master0.password=root
datasource.master0.maxActive=20
datasource.master0.maxWait=60000
datasource.master0.minIdle=5
datasource.master0.initialSize=2

#datasource.names=master0
#datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
#datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
#datasource.master0.url=jdbc:mysql://127.0.0.1:3306/playpai_competition?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
#datasource.master0.username=root
#datasource.master0.password=playpai2023!
#datasource.master0.maxActive=20
#datasource.master0.maxWait=60000
#datasource.master0.minIdle=5
#datasource.master0.initialSize=2




 cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java

@@ -1343,7 +1343,7 @@
            }

            TAppUser appUser = appuClient.queryAppUser1(appUserId);
            map.put("userName", null != appUser ? appUser.getName() : "");
            map.put("userName", null != appUser ? (appUser.getName()==null?"":appUser.getName()) : "");
            map.put("phone", null != appUser ? appUser.getPhone() : "");
            Student student = studentClient.queryStudentById(studentId);
            map.put("studentName", null != student ? student.getName() : "");

 cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java

@@ -1358,12 +1358,12 @@
                    boolean b = true;
                    if(null == student.getValidity()){
                        student.setValidity(calendar.getTime());
                        addOldPackageStudent(student);
                        b = false;
//                        addOldPackageStudent(student);
//                        b = false;
                    }else if(calendar.getTimeInMillis() > student.getValidity().getTime()){
                        student.setValidity(calendar.getTime());
                        addOldPackageStudent(student);
                        b = false;
//                        addOldPackageStudent(student);
//                        b = false;
                    }
                    studentClient.frozen(student);

@@ -1407,12 +1407,12 @@
                    boolean b = true;
                    if(null == student.getValidity()){
                        student.setValidity(calendar.getTime());
                        addOldPackageStudent(student);
                        b = false;
//                        addOldPackageStudent(student);
//                        b = false;
                    }else if(calendar.getTimeInMillis() > student.getValidity().getTime()){
                        student.setValidity(calendar.getTime());
                        addOldPackageStudent(student);
                        b = false;
//                        addOldPackageStudent(student);
//                        b = false;
                    }
                    studentClient.frozen(student);

@@ -1527,7 +1527,7 @@
                    day = day - 1 == 0 ? 7 : day - 1;
                    if (!week.contains(day)) {
                        calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + 1);
                        schedulingNum--;
                        schedulingNum++;
                        continue;
                    }

@@ -1548,7 +1548,7 @@
                    //有体验购课，不进行排课
                    if(count != 0){
                        calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + 1);
                        schedulingNum--;
                        schedulingNum++;

                        continue;
                    }

 cloud-server-course/src/main/java/com/dsh/course/util/PayMoneyUtil.java

@@ -63,8 +63,8 @@

    private String key = "6f5e0c2dcabfa9c27b5da5836a362fef";//微信商户号

    private String callbackPath = "https://online.daowepark.com:443/course";//支付回调网关地址
//private String callbackPath = "http://221.182.45.100:1234/course";//支付回调网关地址
//    private String callbackPath = "https://online.daowepark.com:443/course";//支付回调网关地址
private String callbackPath = "http://221.182.45.100:56666/course";//支付回调网关地址

    private String app_cert_path = "C:/cert/alipay/user/app_cert_path.crt";//应用公钥证书路径


 cloud-server-course/src/main/resources/logback-spring.xml

@@ -24,7 +24,7 @@
    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
            <level>debug</level>
            <level>info</level>
        </filter>
        <encoder>
            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
@@ -223,7 +223,7 @@
            <appender-ref ref="ERROR_FILE"/>
            <appender-ref ref="ALL_FILE"/>
        </root>
        <logger name="com.dsh.course.mapper" level="error"/>
        <logger name="com.dsh.course.mapper" level="debug"/>
        <logger name="business-log" level="warn"/>
    </springProfile>


 cloud-server-course/src/main/resources/sharding-jdbc.properties

@@ -1,7 +1,7 @@
#datasource.names=master0
#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://221.182.45.100:3309/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.maxActive=20
@@ -9,18 +9,27 @@
#datasource.master0.minIdle=5
#datasource.master0.initialSize=2



datasource.names=master0
datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
datasource.master0.url=jdbc:mysql://127.0.0.1:3306/playpai_course?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
datasource.master0.username=root
datasource.master0.password=playpai2023!
datasource.master0.password=root
datasource.master0.maxActive=20
datasource.master0.maxWait=60000
datasource.master0.minIdle=5
datasource.master0.initialSize=2

#datasource.names=master0
#datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
#datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
#datasource.master0.url=jdbc:mysql://127.0.0.1:3306/playpai_course?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
#datasource.master0.username=root
#datasource.master0.password=playpai2023!
#datasource.master0.maxActive=20
#datasource.master0.maxWait=60000
#datasource.master0.minIdle=5
#datasource.master0.initialSize=2




 cloud-server-management/src/main/resources/bootstrap.properties

@@ -16,6 +16,13 @@
spring.cloud.nacos.discovery.namespace=@profiles.nacos-namespace@
spring.cloud.nacos.discovery.register-enabled=true
spring.cloud.nacos.discovery.group=@profiles.group@
# Nacos连接超时配置（解决时间戳过期问题）
spring.cloud.nacos.discovery.heart-beat-interval=5000
spring.cloud.nacos.discovery.heart-beat-timeout=15000
spring.cloud.nacos.discovery.ip-delete-timeout=30000
spring.cloud.nacos.config.timeout=30000
# 如果时间戳问题持续，可以临时禁用自动注册，手动注册服务
# spring.cloud.nacos.discovery.register-enabled=false
spring.main.allow-bean-definition-overriding=true
spring.flyway.enabled=false
spring.mvc.static-path-pattern=/static/**,/WEB-INF/**

 cloud-server-management/src/main/webapp/static/modular/system/coursePackage/registrationRecord.js

@@ -14,7 +14,7 @@
RegistrationRecord.initColumn = function () {
    let columns = [
        {field: 'selectItem', checkbox: true},
        {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle',
        {title: '序号', field: 'id', visible: false, align: 'center', valign: 'middle',
            formatter: function (value, row) {
              if (row.status ==7){
                    return '<div style="color: blue;">' + value + '</div>';