diff --git a/servers/boe-server-all/src/main/java/com/xboe/UrlSecurityFilterImpl.java b/servers/boe-server-all/src/main/java/com/xboe/UrlSecurityFilterImpl.java index 67e6ab63..d61157ae 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/UrlSecurityFilterImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/UrlSecurityFilterImpl.java @@ -48,7 +48,7 @@ public class UrlSecurityFilterImpl implements IUrlSecurityFilter{ return false; } - return true; + return false; } } diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java index a4be7832..2d8a4073 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java @@ -330,7 +330,6 @@ public class StudyCourseApi extends ApiBaseController{ } //追加学习时长 studyService.appendStudyDuration(sci.getStudyId(),item.getId(),sci.getContentId(),sci.getDuration()); - //System.out.println("在线课学习记录"+allUserList); return success(item.getId()); } @@ -399,11 +398,11 @@ public class StudyCourseApi extends ApiBaseController{ } // LocalDateTime now=LocalDateTime.now(); CurrentUser cuser=getCurrent(); - //检查是否已存在 String token = request.getHeader("Xboe-Access-Token"); if (StringUtils.isEmpty(token)) { token = request.getHeader("token"); } + //检查是否已存在 StudyCourseItem item = studyService.checkHas(sci.getStudyId(),sci.getContentId()); if(item!=null) { //如果记录存在，但是进度不到100，未完成情况，就更新进度，一期不会有这种情况 @@ -509,8 +508,6 @@ public class StudyCourseApi extends ApiBaseController{ } try { studyService.finishVideoStudyItem(itemId, studyId,courseId,cnum,token); - List allUserList = thirdApi.getStudyCourseList(studyId, courseId, token); - log.info("在线课学习记录"+allUserList); return success(true); }catch(Exception e) { log.error("记录内容学习完成错误",e); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java index 5491db69..d0985202 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java @@ -65,7 +65,7 @@ public class StudyCourseDao extends BaseDao { UpdateBuilder.create("status",StudyCourse.STATUS_STUDYING)); } - List allUserList = thirdApi.getStudyCourseList(studyId,courseId, token); + List allUserList = thirdApi.getStudyCourseList(studyId ,courseId, token); log.info("在线课学习记录"+allUserList); } diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyAssessServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyAssessServiceImpl.java index 4d952a8f..0058c8be 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyAssessServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyAssessServiceImpl.java @@ -4,10 +4,8 @@ import java.time.LocalDateTime; import java.util.List; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; import javax.transaction.Transactional; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -38,6 +36,7 @@ public class StudyAssessServiceImpl implements IStudyAssessService{ @Override @Transactional public void save(StudyAssess assess,String token) { + //完成处理，判断是否已存在 Object obj=scItemDao.findField("id", FieldFilters.eq("studyId", assess.getStudyId()), FieldFilters.eq("contentId", assess.getContentId())); if(obj==null) { diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyHomeWorkServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyHomeWorkServiceImpl.java index e02f488d..4a609e96 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyHomeWorkServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyHomeWorkServiceImpl.java @@ -37,7 +37,7 @@ public class StudyHomeWorkServiceImpl implements IStudyHomeWorkService{ @Override @Transactional public void save(StudyHomeWork homework,String token) { - + //完成处理，判断是否已存在 Object obj=scItemDao.findField("id", FieldFilters.eq("studyId", homework.getStudyId()), FieldFilters.eq("contentId", homework.getContentId())); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java index c0067e60..d6cc2110 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java @@ -5,8 +5,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.annotation.Resource; import javax.transaction.Transactional; +import com.xboe.api.ThirdApi; import com.xboe.school.study.entity.StudyCourse; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/servers/boe-server-all/src/main/resources/application-dev.properties b/servers/boe-server-all/src/main/resources/application-dev.properties index 470efc2b..cedf2932 100644 --- a/servers/boe-server-all/src/main/resources/application-dev.properties +++ b/servers/boe-server-all/src/main/resources/application-dev.properties @@ -1,11 +1,11 @@ ## redis -spring.redis.database=4 -spring.redis.host=127.0.0.1 -spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+) -spring.redis.port=6379 -#spring.redis.host=124.70.92.162 -#spring.redis.password=qwert!W577 +spring.redis.database=1 +#spring.redis.host=127.0.0.1 +#spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+) #spring.redis.port=6379 +spring.redis.host=124.70.92.162 +spring.redis.password=qwert!W577 +spring.redis.port=6379 # cloud nacos config spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 @@ -15,12 +15,12 @@ spring.jpa.show-sql = true spring.jpa.hibernate.ddl-auto=update spring.datasource.driverClassName=com.mysql.jdbc.Driver # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/boeu_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull -spring.datasource.username=root -spring.datasource.password=ENC(lAoFOYuc8CAypPtigTNLYg==) -#spring.datasource.url=jdbc:mysql://124.70.92.162:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull -#spring.datasource.username=boe_base -#spring.datasource.password=k3DbtrcCkKAcFYzd +#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull +#spring.datasource.username=root +#spring.datasource.password=ENC(lAoFOYuc8CAypPtigTNLYg==) +spring.datasource.url=jdbc:mysql://10.251.160.40:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull +spring.datasource.username=admin +spring.datasource.password=boeRds01 logging.level.org.hibernate.SQL=DEBUG logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE diff --git a/servers/boe-server-all/src/main/resources/application.properties b/servers/boe-server-all/src/main/resources/application.properties index 7f8192bc..9dd37d3d 100644 --- a/servers/boe-server-all/src/main/resources/application.properties +++ b/servers/boe-server-all/src/main/resources/application.properties @@ -1,4 +1,4 @@ -spring.profiles.active=@profileActive@ +spring.profiles.active=dev spring.application.name=boe-server-all server.port=9090 server.servlet.session.timeout=30m