mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-11 03:46:50 +08:00
Compare commits
1 Commits
250331-bug
...
master-202
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d3e84feb48 |
@@ -2,16 +2,11 @@ package com.xboe.data.service.impl;
|
|||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
|
||||||
import javax.transaction.Transactional;
|
import javax.transaction.Transactional;
|
||||||
|
|
||||||
import com.boe.feign.api.serverall.entity.UserData;
|
import com.boe.feign.api.serverall.entity.UserData;
|
||||||
import com.xboe.constants.CacheName;
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.cache.Cache;
|
|
||||||
import org.springframework.cache.CacheManager;
|
|
||||||
import org.springframework.cache.annotation.Cacheable;
|
|
||||||
import org.springframework.retry.annotation.Recover;
|
import org.springframework.retry.annotation.Recover;
|
||||||
import org.springframework.retry.annotation.Retryable;
|
import org.springframework.retry.annotation.Retryable;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@@ -44,9 +39,6 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
|
|||||||
@Autowired
|
@Autowired
|
||||||
TeacherDao teacherDao;
|
TeacherDao teacherDao;
|
||||||
|
|
||||||
@Resource
|
|
||||||
private CacheManager cacheManager;
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional
|
@Transactional
|
||||||
@@ -67,8 +59,6 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
|
|||||||
a.setDeleted(user.getDeleted());
|
a.setDeleted(user.getDeleted());
|
||||||
}
|
}
|
||||||
a.setLoginName(user.getCode());
|
a.setLoginName(user.getCode());
|
||||||
a.setMobile(user.getMobile());
|
|
||||||
a.setEmail(user.getEmail());
|
|
||||||
log.info("更新账号code");
|
log.info("更新账号code");
|
||||||
accountDao.update(a);
|
accountDao.update(a);
|
||||||
} else {
|
} else {
|
||||||
@@ -81,18 +71,14 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
|
|||||||
a.setRegTime(LocalDateTime.now());
|
a.setRegTime(LocalDateTime.now());
|
||||||
a.setSysId(user.getKid());
|
a.setSysId(user.getKid());
|
||||||
a.setStatus(1);
|
a.setStatus(1);
|
||||||
a.setMobile(user.getMobile());
|
|
||||||
a.setEmail(user.getEmail());
|
|
||||||
accountDao.save(a);
|
accountDao.save(a);
|
||||||
log.info("账号不存在,新添加账号【" + user.getId() + "】");
|
log.info("账号不存在,新添加账号【" + user.getId() + "】");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (u != null) {
|
if (u != null) {
|
||||||
//更新部分用户字段
|
//更新部分用户字段
|
||||||
u.setDepartId(user.getDepartId());
|
u.setDepartId(user.getDepartId());
|
||||||
u.setDepartName(user.getDepartName());
|
u.setDepartName(user.getDepartName());
|
||||||
u.setName(user.getName());
|
u.setName(user.getName());
|
||||||
u.setMobileNo(user.getMobile());
|
|
||||||
//2022-12-8 去掉用户类型的更新,因为返回的数据都是学员,
|
//2022-12-8 去掉用户类型的更新,因为返回的数据都是学员,
|
||||||
//u.setUserType(user.getUserType());
|
//u.setUserType(user.getUserType());
|
||||||
if (user.getLearningDuration() > 0) { //不大于0才会更新
|
if (user.getLearningDuration() > 0) { //不大于0才会更新
|
||||||
@@ -120,17 +106,9 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
|
|||||||
} else {
|
} else {
|
||||||
u.setShowHome(true);//band16以下,及其它无bandLevel的信息
|
u.setShowHome(true);//band16以下,及其它无bandLevel的信息
|
||||||
}
|
}
|
||||||
u.setMobileNo(user.getMobile());
|
|
||||||
userDao.save(u);
|
userDao.save(u);
|
||||||
log.info("添加新用户");
|
log.info("添加新用户");
|
||||||
}
|
}
|
||||||
|
|
||||||
Cache cache = cacheManager.getCache(CacheName.NAME_USER);
|
|
||||||
if(cache != null) {
|
|
||||||
cache.evict(CacheName.KEY_ACCOUNT + user.getId());
|
|
||||||
cache.evict(CacheName.KEY_USER + user.getId());
|
|
||||||
}
|
|
||||||
|
|
||||||
//对机构的判断,不为空时才会处理,为空时不处理
|
//对机构的判断,不为空时才会处理,为空时不处理
|
||||||
if (StringUtils.isNotBlank(user.getDepartId())) {
|
if (StringUtils.isNotBlank(user.getDepartId())) {
|
||||||
org = orgDao.get(user.getDepartId());
|
org = orgDao.get(user.getDepartId());
|
||||||
|
|||||||
@@ -314,10 +314,8 @@ public class CoursePortalApi extends ApiBaseController{
|
|||||||
User user = userService.get(ct.getTeacherId());
|
User user = userService.get(ct.getTeacherId());
|
||||||
if(t!=null) {
|
if(t!=null) {
|
||||||
ct.setRemark(t.getDescription());
|
ct.setRemark(t.getDescription());
|
||||||
ct.setSupplier(t.getSupplier());
|
|
||||||
ct.setTeacherType(t.getTeacherType());
|
|
||||||
if(redisTemplate.opsForValue().get(ct.getTeacherId())!=null){
|
if(redisTemplate.opsForValue().get(ct.getTeacherId())!=null){
|
||||||
if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && ( t==null || t.getTeacherType() == 1)){
|
if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
|
||||||
ct.setTeacherName("BOE教师");
|
ct.setTeacherName("BOE教师");
|
||||||
}
|
}
|
||||||
teacherCourseDto.setCourseId(ct.getCourseId());
|
teacherCourseDto.setCourseId(ct.getCourseId());
|
||||||
@@ -329,15 +327,13 @@ public class CoursePortalApi extends ApiBaseController{
|
|||||||
teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
|
teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
|
||||||
teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
|
teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
|
||||||
teacherCourseDto.setId(ct.getId());
|
teacherCourseDto.setId(ct.getId());
|
||||||
if(user!=null){
|
teacherCourseDto.setUserNo(user.getUserNo());
|
||||||
teacherCourseDto.setUserNo(user.getUserNo());
|
|
||||||
}
|
|
||||||
teacherCourseDtos.add(teacherCourseDto);
|
teacherCourseDtos.add(teacherCourseDto);
|
||||||
}else if (redisTemplate.opsForValue().get(ct.getTeacherId())==null){
|
}else if (redisTemplate.opsForValue().get(ct.getTeacherId())==null){
|
||||||
List<String> list=new ArrayList<>();
|
List<String> list=new ArrayList<>();
|
||||||
list.add(ct.getTeacherId());
|
list.add(ct.getTeacherId());
|
||||||
getTeacherInfo(request.getHeader("Xboe-Access-Token"),list);
|
getTeacherInfo(request.getHeader("Xboe-Access-Token"),list);
|
||||||
if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && ( t==null || t.getTeacherType() == 1)){
|
if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
|
||||||
ct.setTeacherName("BOE教师");
|
ct.setTeacherName("BOE教师");
|
||||||
}
|
}
|
||||||
teacherCourseDto.setCourseId(ct.getCourseId());
|
teacherCourseDto.setCourseId(ct.getCourseId());
|
||||||
@@ -349,9 +345,7 @@ public class CoursePortalApi extends ApiBaseController{
|
|||||||
teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
|
teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
|
||||||
teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
|
teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
|
||||||
teacherCourseDto.setId(ct.getId());
|
teacherCourseDto.setId(ct.getId());
|
||||||
if(user!=null){
|
teacherCourseDto.setUserNo(user.getUserNo());
|
||||||
teacherCourseDto.setUserNo(user.getUserNo());
|
|
||||||
}
|
|
||||||
teacherCourseDtos.add(teacherCourseDto);
|
teacherCourseDtos.add(teacherCourseDto);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -341,5 +341,8 @@ public interface ICourseService {
|
|||||||
List<Course> mobiledelList(Integer num,CourseQueryDto courseQueryDto);
|
List<Course> mobiledelList(Integer num,CourseQueryDto courseQueryDto);
|
||||||
|
|
||||||
|
|
||||||
List<Course> findByIds(List<String> courseIds);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ import java.util.stream.Stream;
|
|||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import javax.management.Query;
|
import javax.management.Query;
|
||||||
|
|
||||||
import cn.hutool.core.collection.CollectionUtil;
|
|
||||||
import com.xboe.api.ThirdApi;
|
import com.xboe.api.ThirdApi;
|
||||||
import com.xboe.core.orm.*;
|
import com.xboe.core.orm.*;
|
||||||
import com.xboe.school.study.dao.StudyCourseDao;
|
import com.xboe.school.study.dao.StudyCourseDao;
|
||||||
@@ -449,7 +448,6 @@ public class CourseServiceImpl implements ICourseService {
|
|||||||
List<Course> paginate = paginate(listByFilters2, pageIndex, pageSize);
|
List<Course> paginate = paginate(listByFilters2, pageIndex, pageSize);
|
||||||
PageList<Course> rs = new PageList<>();
|
PageList<Course> rs = new PageList<>();
|
||||||
rs.setCount(listByFilters2.size());
|
rs.setCount(listByFilters2.size());
|
||||||
rs.setPageSize(pageSize);
|
|
||||||
rs.setList(paginate);
|
rs.setList(paginate);
|
||||||
return rs;
|
return rs;
|
||||||
}
|
}
|
||||||
@@ -1569,13 +1567,6 @@ public class CourseServiceImpl implements ICourseService {
|
|||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<Course> findByIds(List<String> courseIds) {
|
|
||||||
QueryBuilder query = QueryBuilder.from(Course.class);
|
|
||||||
query.addFilter(FieldFilters.in("id", courseIds));
|
|
||||||
return courseDao.findList(query.builder());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int countWaitAudit(String aid) {
|
public int countWaitAudit(String aid) {
|
||||||
|
|||||||
@@ -214,11 +214,11 @@ public class StudyCourseApi extends ApiBaseController{
|
|||||||
redisTemplate.opsForValue().set(teacherVo.get(0).getTeacherId(), teacherVo.get(0).getStatus());
|
redisTemplate.opsForValue().set(teacherVo.get(0).getTeacherId(), teacherVo.get(0).getStatus());
|
||||||
//设置过期时间为1天
|
//设置过期时间为1天
|
||||||
redisTemplate.expire(teacherVo.get(0).getTeacherId(), 24 * 60 * 60, TimeUnit.SECONDS);
|
redisTemplate.expire(teacherVo.get(0).getTeacherId(), 24 * 60 * 60, TimeUnit.SECONDS);
|
||||||
if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && ( t==null || t.getTeacherType() == 1)){
|
if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && t.getTeacherType() == 1 ){
|
||||||
ct.setTeacherName("BOE教师");
|
ct.setTeacherName("BOE教师");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && ( t==null || t.getTeacherType() == 1)){
|
if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && t.getTeacherType() == 1 ){
|
||||||
ct.setTeacherName("BOE教师");
|
ct.setTeacherName("BOE教师");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,16 +3,9 @@ package com.xboe.school.study.api;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.time.ZoneOffset;
|
import java.time.ZoneOffset;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import cn.hutool.core.collection.CollectionUtil;
|
|
||||||
import com.xboe.module.course.entity.Course;
|
|
||||||
import com.xboe.module.course.service.ICourseService;
|
|
||||||
import org.apache.commons.compress.utils.Lists;
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
@@ -49,15 +42,6 @@ public class StudyCourseESApi extends ApiBaseController{
|
|||||||
@Autowired
|
@Autowired
|
||||||
IStudyCourseService service;
|
IStudyCourseService service;
|
||||||
|
|
||||||
@Autowired
|
|
||||||
ICourseService courseService;
|
|
||||||
|
|
||||||
@Value("${xboe.upload.file.http_path}")
|
|
||||||
private String httpPath;
|
|
||||||
|
|
||||||
@Value("${xboe.image.course.default}")
|
|
||||||
private String defaultCourseImage;
|
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private PhpOnlineStudyRecordScheduledTasks phpOnlineStudyRecordScheduledTasks;
|
private PhpOnlineStudyRecordScheduledTasks phpOnlineStudyRecordScheduledTasks;
|
||||||
|
|
||||||
@@ -70,9 +54,6 @@ public class StudyCourseESApi extends ApiBaseController{
|
|||||||
try {
|
try {
|
||||||
dto.setAccountId(getCurrent().getAccountId());
|
dto.setAccountId(getCurrent().getAccountId());
|
||||||
PageList<CourseStudyDto> rs=search.search(page.getStartRow(),page.getPageSize(), dto);
|
PageList<CourseStudyDto> rs=search.search(page.getStartRow(),page.getPageSize(), dto);
|
||||||
|
|
||||||
handleCourseImage(rs);
|
|
||||||
|
|
||||||
return success(rs);
|
return success(rs);
|
||||||
}catch(Exception e) {
|
}catch(Exception e) {
|
||||||
log.error("查询报名学习ES失败",e);
|
log.error("查询报名学习ES失败",e);
|
||||||
@@ -80,51 +61,6 @@ public class StudyCourseESApi extends ApiBaseController{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void handleCourseImage(PageList<CourseStudyDto> rs) {
|
|
||||||
if (rs == null || CollectionUtil.isEmpty(rs.getList())) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
List<String> emptyImageCourseIds = Lists.newArrayList();
|
|
||||||
for(CourseStudyDto courseStudyDto : rs.getList()) {
|
|
||||||
if(StringUtils.isBlank(courseStudyDto.getCourseImage())) {
|
|
||||||
// 过滤课程类型
|
|
||||||
if(courseStudyDto.getCourseType()==10
|
|
||||||
|| courseStudyDto.getCourseType()==20){
|
|
||||||
emptyImageCourseIds.add(courseStudyDto.getCourseId());
|
|
||||||
}else{
|
|
||||||
log.warn("课程图片为空,课程id为:{},课程类型:{}",courseStudyDto.getCourseId(),courseStudyDto.getCourseType());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(CollectionUtil.isEmpty(emptyImageCourseIds)){
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
List<Course> courseList = courseService.findByIds(emptyImageCourseIds);
|
|
||||||
if(CollectionUtil.isNotEmpty(courseList)){
|
|
||||||
// courseList转换成map
|
|
||||||
Map<String, Course> courseMap = courseList.stream().collect(Collectors.toMap(Course::getId, course -> course));
|
|
||||||
|
|
||||||
// 赋值ES图片
|
|
||||||
for(CourseStudyDto courseStudyDto : rs.getList()) {
|
|
||||||
if(emptyImageCourseIds.contains(courseStudyDto.getCourseId())) {
|
|
||||||
Course currentCourse = courseMap.get(courseStudyDto.getCourseId());
|
|
||||||
if(null!=currentCourse){
|
|
||||||
if(StringUtils.isNotBlank(currentCourse.getCoverImg())){
|
|
||||||
// 拼接域名
|
|
||||||
courseStudyDto.setCourseImage(httpPath + currentCourse.getCoverImg());
|
|
||||||
}else{
|
|
||||||
// 赋值默认图片
|
|
||||||
courseStudyDto.setCourseImage(defaultCourseImage);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequestMapping(value="/list-by-ids",method = {RequestMethod.POST})
|
@RequestMapping(value="/list-by-ids",method = {RequestMethod.POST})
|
||||||
public JsonResponse<List<StudyCourse>> search(@RequestBody List<String> ids){
|
public JsonResponse<List<StudyCourse>> search(@RequestBody List<String> ids){
|
||||||
if(ids.isEmpty()) {
|
if(ids.isEmpty()) {
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ public class StudyCourseTask {
|
|||||||
* */
|
* */
|
||||||
@XxlJob("saveStudyCourseItemLastTime")
|
@XxlJob("saveStudyCourseItemLastTime")
|
||||||
public void saveStudyCourseItemLastTime() {
|
public void saveStudyCourseItemLastTime() {
|
||||||
|
log.info("------定时任务-获取redis 中学习结束的数据更新入库------" );
|
||||||
// 1. 定义匹配模式(匹配所有目标key)
|
// 1. 定义匹配模式(匹配所有目标key)
|
||||||
final String KEY_PATTERN = "studyContentId:*:last_active";
|
final String KEY_PATTERN = "studyContentId:*:last_active";
|
||||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
|
||||||
@@ -47,9 +48,10 @@ public class StudyCourseTask {
|
|||||||
// 3. 遍历处理符合条件的key
|
// 3. 遍历处理符合条件的key
|
||||||
while (cursor.hasNext()) {
|
while (cursor.hasNext()) {
|
||||||
String redisKey = new String(cursor.next());
|
String redisKey = new String(cursor.next());
|
||||||
|
log.info("------定时任务-获取redis 中学习结束的数据更新入库------redisKey = " + redisKey );
|
||||||
// 4. 获取剩余TTL(秒)
|
// 4. 获取剩余TTL(秒)
|
||||||
Long ttl = redisTemplate.getExpire(redisKey, TimeUnit.SECONDS);
|
Long ttl = redisTemplate.getExpire(redisKey, TimeUnit.SECONDS);
|
||||||
|
log.info("------定时任务-获取redis 中学习结束的数据更新入库------ttl = " + ttl );
|
||||||
// 5. 过滤条件:剩余时间 >= 29天23小时30分钟(转换为秒)
|
// 5. 过滤条件:剩余时间 >= 29天23小时30分钟(转换为秒)
|
||||||
// 总需时间 = (30天 - 30分钟) = 29天23小时30分钟 = 2590200秒
|
// 总需时间 = (30天 - 30分钟) = 29天23小时30分钟 = 2590200秒
|
||||||
// 5分钟 300秒 || 2592000 - 300 = 2591700
|
// 5分钟 300秒 || 2592000 - 300 = 2591700
|
||||||
@@ -69,7 +71,7 @@ public class StudyCourseTask {
|
|||||||
if (partValues.length >= 2){
|
if (partValues.length >= 2){
|
||||||
timestamp = LocalDateTime.parse(partValues[1], formatter);
|
timestamp = LocalDateTime.parse(partValues[1], formatter);
|
||||||
}
|
}
|
||||||
|
log.info("-定时任务-获取redis 中学习结束的数据更新入库---studyContentId = " + studyContentId + ",lastStudyTime = " + lastStudyTime + ", timestamp = " + timestamp);
|
||||||
// 8. 更新数据库(调用已有服务方法)
|
// 8. 更新数据库(调用已有服务方法)
|
||||||
studyService.updateStudyCourseItemLastTime(studyContentId, lastStudyTime, timestamp);
|
studyService.updateStudyCourseItemLastTime(studyContentId, lastStudyTime, timestamp);
|
||||||
|
|
||||||
|
|||||||
@@ -1,105 +1,159 @@
|
|||||||
boe:
|
|
||||||
domain: http://192.168.0.253
|
|
||||||
spring:
|
spring:
|
||||||
|
# application.yml
|
||||||
servlet:
|
servlet:
|
||||||
multipart:
|
multipart:
|
||||||
max-file-size: 1000MB
|
max-file-size: 500MB
|
||||||
max-request-size: 1000MB
|
max-request-size: 500MB
|
||||||
web:
|
|
||||||
resources:
|
|
||||||
static-locations: file:E:/Projects/BOE/java/static
|
|
||||||
cloud:
|
|
||||||
nacos:
|
|
||||||
discovery:
|
|
||||||
server-addr: 192.168.0.253:8848
|
|
||||||
config:
|
|
||||||
server-addr: 192.168.0.253:8848
|
|
||||||
redis:
|
redis:
|
||||||
database: 1
|
database: 1
|
||||||
host: 192.168.0.253
|
host: 192.168.0.101
|
||||||
password: boe@123
|
password: boe@123
|
||||||
port: 6379
|
port: 6379
|
||||||
|
lettuce:
|
||||||
|
pool:
|
||||||
|
max-active: 8
|
||||||
|
min-idle: 0
|
||||||
|
max-idle: 30
|
||||||
|
max-wait: 10000ms
|
||||||
|
shutdown-timeout: 100ms
|
||||||
jpa:
|
jpa:
|
||||||
|
database: MYSQL
|
||||||
|
properties:
|
||||||
|
hibernate:
|
||||||
|
naming_strategy: org.hibernate.cfg.EJB3NamingStrategy
|
||||||
|
dialect: org.hibernate.dialect.MySQL5InnoDBDialect
|
||||||
|
current_session_context_class: org.springframework.orm.hibernate5.SpringSessionContext
|
||||||
|
show-sql: true
|
||||||
hibernate:
|
hibernate:
|
||||||
ddl-auto: none
|
ddl-auto: update
|
||||||
datasource:
|
datasource:
|
||||||
driverClassName: com.mysql.jdbc.Driver
|
driverClassName: com.mysql.cj.jdbc.Driver
|
||||||
url: jdbc:mysql://192.168.0.253:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
|
url: jdbc:mysql://192.168.0.101:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
|
||||||
username: root
|
username: root
|
||||||
password: boe#1234A
|
password: boe#1234A
|
||||||
type: com.zaxxer.hikari.HikariDataSource
|
web:
|
||||||
hikari:
|
resources:
|
||||||
auto-commit: true
|
static-locations: file:E:/Projects/BOE/10/static
|
||||||
minimum-idle: 5
|
server:
|
||||||
idle-timeout: 60000
|
port: 9090
|
||||||
connection-timeout: 30000
|
servlet:
|
||||||
max-lifetime: 1800000
|
multipart:
|
||||||
maximum-pool-size: 20
|
max-file-size: 500MB
|
||||||
logging:
|
max-request-size: 500MB
|
||||||
level:
|
session:
|
||||||
org:
|
timeout: 30m
|
||||||
hibernate:
|
encoding:
|
||||||
SQL: ERROR
|
charset: UTF-8
|
||||||
config: classpath:log/logback-@profileActive@.xml
|
enabled: true
|
||||||
|
force: true
|
||||||
|
tomcat:
|
||||||
|
uri-encoding: UTF-8
|
||||||
|
servlet:
|
||||||
|
multipart:
|
||||||
|
maxFileSize: 1024MB
|
||||||
|
maxRequestSize: 1024MB
|
||||||
|
mvc:
|
||||||
|
static-path-pattern: /cdn/**
|
||||||
|
|
||||||
|
#logging.level.org.hibernate.SQL=DEBUG
|
||||||
|
#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
|
||||||
|
#logging.config=classpath:log/logback-@profileActive@.xml
|
||||||
|
|
||||||
|
# logging:
|
||||||
|
# config: classpath:log/logback-${spring.profiles.active}.xml
|
||||||
|
# level:
|
||||||
|
# org:
|
||||||
|
# hibernate:
|
||||||
|
# SQL: DEBUG
|
||||||
|
# type:
|
||||||
|
# descriptor:
|
||||||
|
# sql:
|
||||||
|
# BasicBinder: TRACE
|
||||||
|
|
||||||
|
xcaching:
|
||||||
|
specs:
|
||||||
|
favorites:
|
||||||
|
timeout: 10s
|
||||||
|
praises:
|
||||||
|
timeout: 10s
|
||||||
|
shares:
|
||||||
|
timeout: 10s
|
||||||
|
|
||||||
xboe:
|
xboe:
|
||||||
api:
|
api:
|
||||||
cross_filter: true
|
cross_filter: true
|
||||||
|
local:
|
||||||
|
dev: true
|
||||||
upload:
|
upload:
|
||||||
file:
|
file:
|
||||||
temp_path: /tmp
|
temp_path: D:/Projects/BOE/10/static/temp
|
||||||
save_path: /home/www/elearning/upload
|
save_path: /home/www/elearning/upload
|
||||||
http_path: http://192.168.0.253/upload
|
http_path: http://127.0.0.1/upload
|
||||||
externalinterface:
|
externalinterface:
|
||||||
url:
|
url:
|
||||||
system: http://127.0.0.1:9091
|
system: http://localhost:9091
|
||||||
old:
|
old:
|
||||||
base:
|
base:
|
||||||
url: http://192.168.0.253
|
url: http://192.168.0.101
|
||||||
|
server:
|
||||||
|
userbasic:
|
||||||
|
url: http://192.168.0.101/userbasic
|
||||||
stat:
|
stat:
|
||||||
base:
|
base:
|
||||||
url: http://127.0.0.1:9080
|
url: http://127.0.0.1:9080
|
||||||
server:
|
|
||||||
userbasic:
|
|
||||||
url: http://192.168.0.253/userbasic
|
|
||||||
elasticsearch:
|
elasticsearch:
|
||||||
server:
|
server:
|
||||||
ip: 192.168.0.253
|
ip: 192.168.0.101
|
||||||
port: 9200
|
port: 9200
|
||||||
user:
|
user:
|
||||||
password:
|
password:
|
||||||
email:
|
email:
|
||||||
url: http://192.168.0.253/api/b1/email/send
|
url: http://192.168.0.101/api/b1/email/send
|
||||||
from: boeu_learning@boe.com.cn
|
from: boeu_learning@boe.com.cn
|
||||||
user:
|
user:
|
||||||
security:
|
security:
|
||||||
jasypt:
|
|
||||||
encryptor:
|
jasypt:
|
||||||
algorithm: PBEWithMD5AndDES
|
encryptor:
|
||||||
iv-generator-classname: org.jasypt.iv.NoIvGenerator
|
algorithm: PBEWithMD5AndDES
|
||||||
image:
|
iv-generator-classname: org.jasypt.iv.NoIvGenerator
|
||||||
course:
|
|
||||||
default: http://192.168.0.253/pc/images/bgimg/course.png
|
boe:
|
||||||
xxl:
|
domain: http://127.0.0.1
|
||||||
job:
|
|
||||||
accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0
|
ok:
|
||||||
admin:
|
http:
|
||||||
addresses: http://192.168.0.253/jobAdmin
|
connect-timeout: 30
|
||||||
executor:
|
read-timeout: 30
|
||||||
appname: java-servers-job-api
|
write-timeout: 30
|
||||||
port: 9995
|
max-idle-connections: 200
|
||||||
address:
|
keep-alive-duration: 300
|
||||||
ip:
|
|
||||||
logpath: /var/log/xxl-job/dw/
|
|
||||||
logretentiondays: 30
|
|
||||||
aop-log-record:
|
orgTree:
|
||||||
#是否开启日志记录
|
orgTreeList: ${boe.domain}/userbasic/org/list
|
||||||
enabled: true
|
orgChildTreeList: ${boe.domain}/userbasic/org/childOrgs
|
||||||
#不进行拦截的包或者类
|
|
||||||
excludeClassNames:
|
userBasic:
|
||||||
activemq:
|
searchUserList: ${boe.domain}/userbasic/user/list
|
||||||
broker-url: tcp://192.168.0.253:61616
|
getUserBasicInfo: ${boe.domain}/userbasic/user/getUserBasicInfo
|
||||||
user: admin
|
getTeacherIds: ${boe.domain}/userbasic/user/getTeacherInfo
|
||||||
password: admin
|
|
||||||
elasticsearch:
|
audience:
|
||||||
host: 192.168.0.253
|
usersByAudienceList: ${boe.domain}/userbasic/audience/memberList
|
||||||
port: 9200
|
getOrgUsers: ${boe.domain}/userbasic/user/getOrgUsers
|
||||||
|
|
||||||
|
statApi:
|
||||||
|
userdynamicList: ${boe.domain}/statApi/xboe/m/stat/userdynamic/list
|
||||||
|
|
||||||
|
infrasApi:
|
||||||
|
dict: ${boe.domain}/infrasApi/dict/list
|
||||||
|
|
||||||
|
manageApi:
|
||||||
|
stu:
|
||||||
|
offcourse: ${boe.domain}/manageApi/stu/offcourse/getOffCourseId
|
||||||
|
editExam: ${boe.domain}/manageApi/admin/project/editExam
|
||||||
|
getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
|
||||||
|
coursesuilt:
|
||||||
|
getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
|
||||||
@@ -108,9 +108,7 @@ xboe:
|
|||||||
from: boeu_learning@boe.com.cn
|
from: boeu_learning@boe.com.cn
|
||||||
user:
|
user:
|
||||||
security:
|
security:
|
||||||
image:
|
|
||||||
course:
|
|
||||||
default: http://10.251.132.75/pc/images/bgimg/course.png
|
|
||||||
jasypt:
|
jasypt:
|
||||||
encryptor:
|
encryptor:
|
||||||
algorithm: PBEWithMD5AndDES
|
algorithm: PBEWithMD5AndDES
|
||||||
|
|||||||
@@ -74,9 +74,6 @@ xboe:
|
|||||||
encryptor:
|
encryptor:
|
||||||
algorithm: PBEWithMD5AndDES
|
algorithm: PBEWithMD5AndDES
|
||||||
iv-generator-classname: org.jasypt.iv.NoIvGenerator
|
iv-generator-classname: org.jasypt.iv.NoIvGenerator
|
||||||
image:
|
|
||||||
course:
|
|
||||||
default: https://u.boe.com/pc/images/bgimg/course.png
|
|
||||||
xxl:
|
xxl:
|
||||||
job:
|
job:
|
||||||
accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0
|
accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ xboe:
|
|||||||
file:
|
file:
|
||||||
temp_path: /tmp
|
temp_path: /tmp
|
||||||
save_path: /home/www/elearning/upload
|
save_path: /home/www/elearning/upload
|
||||||
http_path: https://u-pre.boe.com/upload
|
http_path: http://10.251.186.27/upload
|
||||||
externalinterface:
|
externalinterface:
|
||||||
url:
|
url:
|
||||||
system: http://localhost:9091
|
system: http://localhost:9091
|
||||||
@@ -108,9 +108,7 @@ xboe:
|
|||||||
from: boeu_learning@boe.com.cn
|
from: boeu_learning@boe.com.cn
|
||||||
user:
|
user:
|
||||||
security:
|
security:
|
||||||
image:
|
|
||||||
course:
|
|
||||||
default: https://u-pre.boe.com/pc/images/bgimg/course.png
|
|
||||||
jasypt:
|
jasypt:
|
||||||
encryptor:
|
encryptor:
|
||||||
algorithm: PBEWithMD5AndDES
|
algorithm: PBEWithMD5AndDES
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
# application-pro.yml
|
# application-dev.yml
|
||||||
spring:
|
spring:
|
||||||
redis:
|
redis:
|
||||||
database: 1
|
database: 2
|
||||||
host: 192.168.0.253
|
|
||||||
password: boe@123
|
|
||||||
port: 6379
|
port: 6379
|
||||||
|
host: 192.168.0.101
|
||||||
|
password: boe@123
|
||||||
jpa:
|
jpa:
|
||||||
hibernate:
|
hibernate:
|
||||||
ddl-auto: update
|
ddl-auto: none
|
||||||
open-in-view: false
|
open-in-view: false
|
||||||
properties:
|
properties:
|
||||||
hibernate:
|
hibernate:
|
||||||
@@ -16,44 +16,39 @@ spring:
|
|||||||
driverClassName: com.mysql.jdbc.Driver
|
driverClassName: com.mysql.jdbc.Driver
|
||||||
db1:
|
db1:
|
||||||
driverClassName: com.mysql.jdbc.Driver
|
driverClassName: com.mysql.jdbc.Driver
|
||||||
jdbc-url: jdbc:mysql://192.168.0.253:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
|
jdbc-url: jdbc:mysql://192.168.0.101:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
|
||||||
username: root
|
username: root
|
||||||
password: boe#1234A
|
password: boe#1234A
|
||||||
db2:
|
db2:
|
||||||
driverClassName: com.mysql.jdbc.Driver
|
driverClassName: com.mysql.jdbc.Driver
|
||||||
jdbc-url: jdbc:mysql://192.168.0.253:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
|
jdbc-url: jdbc:mysql://192.168.0.101:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
|
||||||
username: root
|
username: root
|
||||||
password: boe#1234A
|
password: boe#1234A
|
||||||
|
web:
|
||||||
web:
|
resources:
|
||||||
resources:
|
static-locations: file:E:/Projects/BOE/java/static
|
||||||
static-locations: file:E:/Projects/BOE/java/static
|
|
||||||
|
|
||||||
logging:
|
logging:
|
||||||
level:
|
level:
|
||||||
org:
|
org:
|
||||||
hibernate:
|
hibernate:
|
||||||
SQL: ERROR
|
SQL: DEBUG
|
||||||
# type:
|
type:
|
||||||
# descriptor:
|
descriptor:
|
||||||
# sql:
|
sql:
|
||||||
# BasicBinder: TRACE
|
BasicBinder: TRACE
|
||||||
config: classpath:log/logback-dev.xml
|
config: classpath:log/logback-dev.xml
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
xboe:
|
xboe:
|
||||||
api:
|
|
||||||
cross_filter: true
|
|
||||||
upload:
|
upload:
|
||||||
file:
|
file:
|
||||||
temp_path: /tmp
|
temp_path: E:/Projects/BOE/java/static/temp
|
||||||
save_path: /home/www/elearning/upload
|
save_path: E:/Projects/BOE/java/static/upload
|
||||||
http_path: http://192.168.0.253/upload
|
http_path: http://localhost:9090/upload
|
||||||
inner:
|
inner:
|
||||||
data:
|
data:
|
||||||
sync:
|
sync:
|
||||||
baseurl: http://127.0.0.1:9090
|
baseurl: http://localhost:9090
|
||||||
|
|
||||||
jasypt:
|
jasypt:
|
||||||
encryptor:
|
encryptor:
|
||||||
|
|||||||
Reference in New Issue
Block a user