Skip to content

C
cloud-web
Commit b54eea1d by 阳浪
Options

配置信息

parent 4b0106f5
Showing with 131 additions and 150 deletions
cloud-web-manage/src/main/java/com/yizhi/application/WebManageApplication.java
......@@ -4,6 +4,7 @@ import feign.RequestInterceptor;
import feign.RequestTemplate;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
......@@ -19,7 +20,7 @@ import java.util.Enumeration;
* @Author: shengchenglong
* @Date: 2018/3/12 11:50
*/
@SpringBootApplication(exclude = DataSourceAutoConfiguration.class)
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, RabbitAutoConfiguration.class})
@EnableDiscoveryClient
@EnableFeignClients(basePackages = {"com.yizhi"})
@ComponentScan(basePackages = {"com.yizhi"})
......
cloud-web-manage/src/main/java/com/yizhi/application/assignment/controller/ManageAssignmentController.java
......@@ -5,11 +5,9 @@ import javax.servlet.http.HttpServletRequest;
import com.alibaba.fastjson.JSON;
import com.yizhi.application.accountUtil.AuthorizeQueryAccount;
import com.yizhi.assignment.application.vo.entity.Assignment;
import com.yizhi.core.application.enums.InternationalEnums;
import com.yizhi.application.util.TaskSendMessage;
import com.yizhi.assignment.application.feign.AssignmentClient;
//import com.yizhi.assignment.application.vo.*;
import com.yizhi.assignment.application.vo.*;
import com.yizhi.assignment.application.vo.apivo.ApiAssignmentAnswerCheckVO;
import com.yizhi.assignment.application.vo.entity.AssignmentAnswerFile;
......@@ -23,16 +21,13 @@ import com.yizhi.system.application.vo.AccountPageVO;
import com.yizhi.system.application.vo.AccountVO;
import com.yizhi.system.application.vo.OrgVO;
import com.yizhi.training.application.feign.TpPlanActivityClient;
import com.yizhi.training.application.vo.domain.TpPlanActivityVo;
import com.yizhi.util.application.constant.ReturnCode;
import com.yizhi.util.application.domain.Response;
import com.yizhi.util.application.page.PageInfo;
import net.bytebuddy.implementation.bind.annotation.AllArguments;
import org.apache.commons.lang3.tuple.MutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
......@@ -67,8 +62,8 @@ public class ManageAssignmentController {
private AssignmentUnsubmittedExport assignmentExport;
@Autowired
private AssignmentReadResultExport assignmentReadResultExport;
@Autowired
private AmqpTemplate amqpTemplate;
/* @Autowired
private AmqpTemplate amqpTemplate;*/
@Autowired
private PointRedisFeignClients pointRedisFeignClients;
@Autowired
......@@ -426,11 +421,11 @@ public class ManageAssignmentController {
BeanUtils.copyProperties(pointParamVO,vo);
String sitePointId = pointRedisFeignClients.addPointRedis(vo); //调用积分接口添加积分
if (null != sitePointId) {
amqpTemplate.convertAndSend(MQqueuesEnum.ASSIGNMENT.getKey(), sitePointId); //发送积分获取消息
//amqpTemplate.convertAndSend(MQqueuesEnum.ASSIGNMENT.getKey(), sitePointId); //发送积分获取消息
}
String sitePointId1 = pointRedisFeignClients.addPointRedis(vo);
if (null!=sitePointId1) {
amqpTemplate.convertAndSend(MQqueuesEnum.EXPERIENCASSIGNMENT.getKey(),sitePointId); //发送经验获取消息
//amqpTemplate.convertAndSend(MQqueuesEnum.EXPERIENCASSIGNMENT.getKey(),sitePointId); //发送经验获取消息
}
}
} catch (Exception e) {
......
cloud-web-manage/src/main/java/com/yizhi/application/certificate/controller/CertificateController.java
......@@ -21,7 +21,6 @@ import com.yizhi.util.application.enums.i18n.Constants;
import io.swagger.annotations.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
......@@ -298,8 +297,8 @@ public class CertificateController {
}
@Autowired
AmqpTemplate amqpTemplate;
/*@Autowired
AmqpTemplate amqpTemplate;*/
@ApiOperation(value = "测试消息")
@GetMapping("/message")
......@@ -309,7 +308,7 @@ public class CertificateController {
map.put("accountId", 000l);
map.put("projectId", 000l);
map.put("projectName", "123");
amqpTemplate.convertAndSend("myCertificate", new EventWrapper<Map<String, Object>>(0l, map));
// amqpTemplate.convertAndSend("myCertificate", new EventWrapper<Map<String, Object>>(0l, map));
return Response.ok();
}
......
cloud-web-manage/src/main/java/com/yizhi/application/course/controller/MaterialController.java
......@@ -53,7 +53,7 @@ public class MaterialController {
ScormXMLImporter scormXMLImporter;
@Autowired
UpConvert upConvert;
WebUpConvert webUpConvert;
@Autowired
DocPagesAsynchronizationDeal docPagesAsynchronizationDeal;
@Autowired
......
cloud-web-manage/src/main/java/com/yizhi/application/course/util/DocPagesAsynchronizationDeal.java
......@@ -45,7 +45,7 @@ public class DocPagesAsynchronizationDeal extends AbstractDefaultTask<String, Ma
ScormXMLImporter scormXMLImporter;
@Autowired
UpConvert upConvert;
WebUpConvert webUpConvert;
@Autowired
private MaterialClient materialClient;
......@@ -61,7 +61,7 @@ public class DocPagesAsynchronizationDeal extends AbstractDefaultTask<String, Ma
taskContext = new TaskContext(System.currentTimeMillis(), materialVo.getName(), materialVo.getCreateById(), new Date(),
materialVo.getSiteId(), materialVo.getCompanyId());
working(taskContext);
String imageDir = upConvert.convert(materialVo.getOriginalFileUrl(), materialVo.getOriginalFile(), UtilConstants.DOC_PATH, 200, 0, UtilConstants.OPENOFFICE_PATH);
String imageDir = webUpConvert.convert(materialVo.getOriginalFileUrl(), materialVo.getOriginalFile(), UtilConstants.DOC_PATH, 200, 0, UtilConstants.OPENOFFICE_PATH);
File dir = new File(imageDir);
File[] files = dir.listFiles();
......
cloud-web-manage/src/main/java/com/yizhi/application/course/util/UpConvert.java → cloud-web-manage/src/main/java/com/yizhi/application/course/util/WebUpConvert.java
......@@ -15,9 +15,9 @@ import java.util.Date;
*
*/
@Component
public class UpConvert {
public class WebUpConvert {
private final Logger logger = LoggerFactory.getLogger(UpConvert.class);
private final Logger logger = LoggerFactory.getLogger(WebUpConvert.class);
/** 测试函数
* inputFilePathName 网络流的url
* fileName 生成的文件名字
......
cloud-web-manage/src/main/java/com/yizhi/application/document/DocumentComtroller.java → cloud-web-manage/src/main/java/com/yizhi/application/document/WebDocumentComtroller.java
......@@ -4,7 +4,7 @@ package com.yizhi.application.document;
import com.baomidou.mybatisplus.plugins.Page;
import com.yizhi.application.course.constant.UtilConstants;
import com.yizhi.application.course.util.OssUpload;
import com.yizhi.application.course.util.UpConvert;
import com.yizhi.application.course.util.WebUpConvert;
import com.yizhi.core.application.enums.InternationalEnums;
import com.yizhi.application.research.controller.manage.ExportResearch2;
import com.yizhi.documents.application.feign.DocumentClient;
......@@ -25,12 +25,13 @@ import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* <p>
* 前端控制器
......@@ -42,13 +43,13 @@ import org.springframework.web.bind.annotation.*;
@Api(tags = "资料库管理端接口", description = "资料库管理端接口")
@RestController
@RequestMapping("/manage/document")
public class DocumentComtroller {
public class WebDocumentComtroller {
@Autowired
@Resource
private DocumentClient documentClient;
@Autowired
private UpConvert upConvert;
@Resource
private WebUpConvert webUpConvert;
@Value("${ACTIVE}")
public String active;
private static final Logger LOGGER = LoggerFactory.getLogger(ExportResearch2.class);
......@@ -106,7 +107,7 @@ public class DocumentComtroller {
if (uploadVo.getSuffixName().equalsIgnoreCase("pdf")) {
String imageDir = null;
try {
imageDir = upConvert.convert(uploadVo.getUrl(), uploadVo.getFileName(), UtilConstants.DOC_PATH, 200, 0, UtilConstants.OPENOFFICE_PATH);
imageDir = webUpConvert.convert(uploadVo.getUrl(), uploadVo.getFileName(), UtilConstants.DOC_PATH, 200, 0, UtilConstants.OPENOFFICE_PATH);
} catch (IOException e) {
LOGGER.error("将上传的pdf转换成图片拼接富文本，错误：", e);
}
......
cloud-web-manage/src/main/java/com/yizhi/application/drools/DroolsManagerController.java
......@@ -33,6 +33,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -63,7 +64,7 @@ public class DroolsManagerController {
private StudentCaseClient studentCaseClient;
@Autowired
private AlbumClient albumClient;
@Autowired
@Resource
private BizKeywordClient bizKeywordClient;
@PostMapping("task/page")
......
cloud-web-manage/src/main/java/com/yizhi/application/exam/controller/ExamOnlineReadOverController.java
......@@ -45,7 +45,6 @@ import org.apache.commons.lang3.tuple.MutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
......@@ -86,9 +85,9 @@ public class ExamOnlineReadOverController {
@Autowired
PointRedisFeignClients pointRedisFeignClients;
/*
@Autowired
AmqpTemplate amqpTemplate;
AmqpTemplate amqpTemplate;*/
@Autowired
private TaskExecutor taskExecutor;
......@@ -333,10 +332,10 @@ public class ExamOnlineReadOverController {
String sitePointId1 = pointRedisFeignClients.addPointRedis(pointParamVO);
if (null != sitePointId) {
amqpTemplate.convertAndSend(MQqueuesEnum.EXAM.getKey(), sitePointId);
//amqpTemplate.convertAndSend(MQqueuesEnum.EXAM.getKey(), sitePointId);
}
if (null != sitePointId1) {
amqpTemplate.convertAndSend(MQqueuesEnum.EXPERIENCEEXAM.getKey(), sitePointId1);
//amqpTemplate.convertAndSend(MQqueuesEnum.EXPERIENCEEXAM.getKey(), sitePointId1);
}
LOGGER.info("阅卷完毕发放积分，成功");
} catch (Exception ep) {
......
cloud-web-manage/src/main/java/com/yizhi/application/exam/controller/ExamStatisticalController.java
......@@ -36,7 +36,6 @@ import com.yizhi.util.application.domain.Response;
import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -78,8 +77,8 @@ public class ExamStatisticalController {
SiteClient siteClient;
@Autowired
LogEventPublisher publisher;
@Autowired
RabbitTemplate rabbitTemplate;
//@Autowired
//RabbitTemplate rabbitTemplate;
@Autowired
ExamStatisticalExport examStatisticalExport;
......
cloud-web-manage/src/main/java/com/yizhi/application/portal/controller/PortalController.java
......@@ -63,6 +63,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
......@@ -135,7 +136,7 @@ public class PortalController {
private RemotePostsClient postClient;
@Autowired
private SiteClient remoteSiteClient;
@Autowired
@Resource
PracticeConfigStudentClient practiceConfigStudentClient;
@Autowired
private InformationManageFeignClients informationManageFeignClients;
......
cloud-web-manage/src/main/java/com/yizhi/application/portal/controller/SiteInformationManageController.java
......@@ -3,7 +3,7 @@ package com.yizhi.application.portal.controller;
import com.baomidou.mybatisplus.plugins.Page;
import com.yizhi.application.course.constant.UtilConstants;
import com.yizhi.application.course.util.OssUpload;
import com.yizhi.application.course.util.UpConvert;
import com.yizhi.application.course.util.WebUpConvert;
import com.yizhi.core.application.enums.InternationalEnums;
import com.yizhi.core.application.context.ContextHolder;
import com.yizhi.core.application.context.RequestContext;
......@@ -54,7 +54,7 @@ public class SiteInformationManageController {
@Autowired
private InformationManageFeignClients informationManageFeignClients;
@Autowired
private UpConvert upConvert;
private WebUpConvert webUpConvert;
@Value("${ACTIVE}")
public String active;
......@@ -270,7 +270,7 @@ public class SiteInformationManageController {
String imageDir = null;
try {
imageDir = upConvert.convert(pdfOssUrl, pdfFileName, UtilConstants.DOC_PATH, 200, 0, UtilConstants.OPENOFFICE_PATH);
imageDir = webUpConvert.convert(pdfOssUrl, pdfFileName, UtilConstants.DOC_PATH, 200, 0, UtilConstants.OPENOFFICE_PATH);
} catch (IOException e) {
LOGGER.error("将上传的pdf转换成图片拼接富文本，错误：", e);
}
......
cloud-web-manage/src/main/java/com/yizhi/application/util/PdfPagesAsynchronizationDeal.java
package com.yizhi.application.util;
import com.yizhi.application.course.constant.UtilConstants;
import com.yizhi.application.course.util.UpConvert;
import com.yizhi.application.course.util.WebUpConvert;
import com.yizhi.comment.application.feign.PdfPagesClient;
import com.yizhi.comment.application.vo.PdfVO;
import com.yizhi.comment.application.vo.domain.PdfPagesVo;
......@@ -21,7 +21,7 @@ import java.util.Map;
public class PdfPagesAsynchronizationDeal extends AbstractDefaultTask<String, Map<String, Object>> {
@Autowired
UpConvert upConvert;
WebUpConvert webUpConvert;
@Autowired
PdfPagesClient pdfPagesClient;
......@@ -38,7 +38,7 @@ public class PdfPagesAsynchronizationDeal extends AbstractDefaultTask<String, Ma
taskContext = new TaskContext(System.currentTimeMillis(), name, pdfVO.getCreateById(), new Date(),
pdfVO.getSiteId(), pdfVO.getCompanyId());
working(taskContext);
String imageDir = upConvert.convert(pdfVO.getOriginalFileUrl(), pdfVO.getOriginalFile(), UtilConstants.DOC_PATH, 200, 0, UtilConstants.OPENOFFICE_PATH);
String imageDir = webUpConvert.convert(pdfVO.getOriginalFileUrl(), pdfVO.getOriginalFile(), UtilConstants.DOC_PATH, 200, 0, UtilConstants.OPENOFFICE_PATH);
File dir = new File(imageDir);
File[] files = dir.listFiles();
......
cloud-web-manage/src/main/java/com/yizhi/application/util/PdfToPngListener.java
......@@ -22,7 +22,7 @@ public class PdfToPngListener {
private PdfPagesAsynchronizationDeal pdfPagesAsynchronizationDeal;
@Autowired
private WorkUtil workUtil;
private WebWorkUtil webWorkUtil;
@RabbitHandler
public void processBizEvent(EventWrapper<List<PdfVO>> eventWrapper) {
......@@ -30,7 +30,7 @@ public class PdfToPngListener {
if (CollectionUtils.isNotEmpty(eventWrapper.getData())) {
for(PdfVO vo:eventWrapper.getData()) {
Map<String,Object> map = new HashMap<String, Object>();
if (workUtil.fileType(vo.getOriginalFile().substring(vo.getOriginalFile().lastIndexOf(".")+1))== DocumentType.DOCUMENT.getType()) {
if (webWorkUtil.fileType(vo.getOriginalFile().substring(vo.getOriginalFile().lastIndexOf(".")+1))== DocumentType.DOCUMENT.getType()) {
map.put("pdf",vo );
pdfPagesAsynchronizationDeal.execute(map);
}
......
cloud-web-manage/src/main/java/com/yizhi/application/util/WorkUtil.java → cloud-web-manage/src/main/java/com/yizhi/application/util/WebWorkUtil.java
......@@ -5,7 +5,7 @@ import org.springframework.stereotype.Component;
@Component
public class WorkUtil {
public class WebWorkUtil {
public Integer fileType(String suffixName) {
......
cloud-web-manage/src/main/resources/bootstrap.properties
server.port=35000
spring.application.name=web-manage
ACTIVE=${spring.profiles.active}
spring.profiles.active=dev
spring.profiles.active=prod
# nacos
spring.cloud.nacos.config.shared-dataids=common-${spring.profiles.active}.properties
spring.cloud.nacos.config.namespace=${spring.profiles.active}
spring.cloud.nacos.config.prefix=${spring.application.name}
spring.cloud.nacos.config.file-extension=properties
spring.cloud.nacos.config.server-addr=192.168.1.22:3333,192.168.1.22:4444,192.168.1.22:5555
\ No newline at end of file
spring.cloud.nacos.config.server-addr=10.23.1.183:8848
spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
cloud-web-student/src/main/java/com/yizhi/application/WebStudentApplication.java
......@@ -4,6 +4,7 @@ import feign.RequestInterceptor;
import feign.RequestTemplate;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
......@@ -19,7 +20,7 @@ import java.util.Enumeration;
* @Author: shengchenglong
* @Date: 2018/3/12 11:50
*/
@SpringBootApplication(exclude = DataSourceAutoConfiguration.class)
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, RabbitAutoConfiguration.class})
@EnableDiscoveryClient
@EnableFeignClients(basePackages = {"com.yizhi"})
@ComponentScan(basePackages = {"com.yizhi"})
......
cloud-web-student/src/main/java/com/yizhi/application/assignment/controller/ApiAssignmentExerciseBookController.java
......@@ -2,7 +2,7 @@ package com.yizhi.application.assignment.controller;
import com.baomidou.mybatisplus.plugins.Page;
import com.yizhi.application.course.utils.WorkUtil;
import com.yizhi.application.course.utils.StuWorkUtil;
import com.yizhi.assignment.application.feign.ApiAssignmentExerciseBookClient;
import com.yizhi.assignment.application.vo.AssignmentStudentExerciseBookListVO;
import com.yizhi.assignment.application.vo.apivo.ApiAssignmentCommentVO;
......@@ -44,7 +44,7 @@ public class ApiAssignmentExerciseBookController {
@Autowired
private ApiAssignmentExerciseBookClient apiAssignmentExerciseBookClient;
@Autowired
private WorkUtil workUtil;
private StuWorkUtil stuWorkUtil;
@Autowired
private RedisCache redisCache;
......@@ -106,7 +106,7 @@ public class ApiAssignmentExerciseBookController {
System.out.println(sensitiveWordList.iterator().next());
}
for (ApiAssignmentCommentVO record : records) {
String word = workUtil.filterWord(record.getContent(), sensitiveWordList);
String word = stuWorkUtil.filterWord(record.getContent(), sensitiveWordList);
record.setContent(word);
}
}
......
cloud-web-student/src/main/java/com/yizhi/application/calendar/StudentCalendarController.java
......@@ -20,7 +20,6 @@ import com.yizhi.util.application.constant.ReturnCode;
import com.yizhi.util.application.domain.Response;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -44,8 +43,8 @@ public class StudentCalendarController {
@Autowired
private PointRedisFeignClients pointRedisFeignClients;
@Autowired
private AmqpTemplate amqpTemplate;
/*@Autowired
private AmqpTemplate amqpTemplate;*/
@ApiOperation(value = "签到打卡")
@GetMapping(value = "/sign")
......@@ -82,7 +81,7 @@ public class StudentCalendarController {
sitePointId = pointRedisFeignClients.addPointRedis(pointParamVO); //调用积分接口添加积分
}
if (null != sitePointId) {
amqpTemplate.convertAndSend(MQqueuesEnum.SIGN.getKey(), sitePointId); //发送积分获取消息
//amqpTemplate.convertAndSend(MQqueuesEnum.SIGN.getKey(), sitePointId); //发送积分获取消息
}
} catch (Exception e) {
logger.error("签到打卡积分发放失败：", e);
......
cloud-web-student/src/main/java/com/yizhi/application/caseLibrary/controller/StudentLibraryController.java
......@@ -2,7 +2,7 @@ package com.yizhi.application.caseLibrary.controller;
import com.baomidou.mybatisplus.plugins.Page;
import com.yizhi.application.caseLibrary.util.CommonUtils;
import com.yizhi.application.caseLibrary.util.StuCommonUtils;
import com.yizhi.core.application.enums.InternationalEnums;
import com.yizhi.library.application.feign.CaseLibraryClassifyClient;
......@@ -46,7 +46,7 @@ public class StudentLibraryController {
private StudentCaseClient studentCaseClient;
@Autowired
private CommonUtils commonUtils;
private StuCommonUtils stuCommonUtils;
@Autowired
private StudentCaseManageClient studentCaseManageClient;
......@@ -120,7 +120,7 @@ public class StudentLibraryController {
if (null != studentCaseParam.getContentFileName()) {
studentCaseParam.setPdfFileName(studentCaseParam.getContentFileName());
}
String content = commonUtils.translatePdfToPhoto(studentCaseParam.getPdfOssUrl(), studentCaseParam.getPdfFileName());
String content = stuCommonUtils.translatePdfToPhoto(studentCaseParam.getPdfOssUrl(), studentCaseParam.getPdfFileName());
if (StringUtils.isNotBlank(content)) {
studentCaseParam.setContent(content);
}
......
cloud-web-student/src/main/java/com/yizhi/application/caseLibrary/util/CommonUtils.java → cloud-web-student/src/main/java/com/yizhi/application/caseLibrary/util/StuCommonUtils.java
......@@ -33,13 +33,13 @@ import java.util.List;
* @return
*/
@Component
public class CommonUtils {
public class StuCommonUtils {
private static final Logger LOGGER = LoggerFactory.getLogger(CommonUtils.class);
private static final Logger LOGGER = LoggerFactory.getLogger(StuCommonUtils.class);
@Autowired
private UpConvert upConvert;
private StuUpConvert stuUpConvert;
@Value("${ACTIVE}")
......@@ -58,7 +58,7 @@ public class CommonUtils {
String imageDir = null;
try {
imageDir = upConvert.convert(pdfOssUrl, pdfFileName, CaseLibraryConstants.DOC_PATH, 200, 0, CaseLibraryConstants.OPENOFFICE_PATH);
imageDir = stuUpConvert.convert(pdfOssUrl, pdfFileName, CaseLibraryConstants.DOC_PATH, 200, 0, CaseLibraryConstants.OPENOFFICE_PATH);
} catch (IOException e) {
LOGGER.error("将上传的pdf转换成图片拼接富文本，错误：", e);
}
......
cloud-web-student/src/main/java/com/yizhi/application/caseLibrary/util/UpConvert.java → cloud-web-student/src/main/java/com/yizhi/application/caseLibrary/util/StuUpConvert.java
......@@ -16,12 +16,12 @@ import java.util.Date;
* @author wangfeida
*/
@Component
public class UpConvert {
public class StuUpConvert {
private final Logger logger = LoggerFactory.getLogger(UpConvert.class);
private final Logger logger = LoggerFactory.getLogger(StuUpConvert.class);
@Autowired
private CommonUtils commonUtils;
private StuCommonUtils stuCommonUtils;
/** 测试函数
......@@ -63,7 +63,7 @@ public class UpConvert {
//inputFilePathName 流名字
public String convert(String url, String fileName, String outputFilePath, int dpi, int flag, String getofficeHome) throws IOException {
OfficeToPdf otp = new OfficeToPdf();
String filePath = commonUtils.downLoadFromUrl(url, fileName, outputFilePath); //网络流地址 需要保存的文件名字 保存的路径 filePath是文件的下载地址
String filePath = stuCommonUtils.downLoadFromUrl(url, fileName, outputFilePath); //网络流地址 需要保存的文件名字 保存的路径 filePath是文件的下载地址
//判断是否是指定的几种类型
String suffix = fileName.substring(fileName.lastIndexOf(".") + 1);
if (isAppoint(suffix)) {
......@@ -74,7 +74,7 @@ public class UpConvert {
SimpleDateFormat df = new SimpleDateFormat("yyyyMMddHHmmss");//设置日期格式
outputFilePath = outputFilePath + File.separator + imagePDFName + df.format(new Date()); //此目录下创建一个以传入文件名字的文件夹
if (suffix.equals("pdf")) { //如果后缀是pdf直接进行转换
String result = commonUtils.pdfToPng(filePath, outputFilePath, dpi, flag);
String result = stuCommonUtils.pdfToPng(filePath, outputFilePath, dpi, flag);
file1.delete();
return result;
} else { //如果是指定格式的其他类型 先转换为pdf
......@@ -82,7 +82,7 @@ public class UpConvert {
File file2 = new File(filePath);
file2.delete();
String pdfPath = file.getParent() + File.separator + file.getName(); //pdf路径
String result = commonUtils.pdfToPng(pdfPath, file.getParent(), dpi, flag); //pdf转png
String result = stuCommonUtils.pdfToPng(pdfPath, file.getParent(), dpi, flag); //pdf转png
file.delete();
return result;
}
......
cloud-web-student/src/main/java/com/yizhi/application/course/controller/CommentStuController.java
package com.yizhi.application.course.controller;
import com.yizhi.application.course.utils.WorkUtil;
import com.yizhi.application.course.utils.StuWorkUtil;
import com.yizhi.application.tools.PageTools;
import com.yizhi.assignment.application.vo.entity.Comment;
import com.yizhi.core.application.cache.CacheNamespace;
......@@ -61,7 +61,7 @@ public class CommentStuController {
private RedisCache redisCache;
@Autowired
private WorkUtil workUtil;
private StuWorkUtil stuWorkUtil;
@ApiOperation(value = "添加评论")
......@@ -121,7 +121,7 @@ public class CommentStuController {
sensitiveWordList = JsonUtil.json2Ojbect(sensitiveValues, Set.class);
System.out.println(sensitiveWordList.iterator().next());
}
String word = workUtil.filterWord(comment.getContent(), sensitiveWordList);
String word = stuWorkUtil.filterWord(comment.getContent(), sensitiveWordList);
comment.setContent(word);
}
......@@ -162,7 +162,7 @@ public class CommentStuController {
Map<Long, String> map = new HashMap<>();
Map<Long, String> headPhotoMap = new HashMap<>();
//组装map
workUtil.getMap(map,headPhotoMap,accountVOs);
stuWorkUtil.getMap(map,headPhotoMap,accountVOs);
Long companyId = ContextHolder.get().getCompanyId();
Set<String> sensitiveWordList = new HashSet<>();
......@@ -174,11 +174,11 @@ public class CommentStuController {
for (ListCommentVo commentVo2 : commentVos) {
commentVo2.setCommentator(map.get(commentVo2.getAccountId()));
commentVo2.setUserAvatar(headPhotoMap.get(commentVo2.getAccountId()));
String word = workUtil.filterWord(commentVo2.getContent(), sensitiveWordList);
String word = stuWorkUtil.filterWord(commentVo2.getContent(), sensitiveWordList);
commentVo2.setContent(word);
List<ReplyEntityVo> replyVos = commentVo2.getReplies();
//组装回复
workUtil.fillReply(replyVos,map,sensitiveWordList);
stuWorkUtil.fillReply(replyVos,map,sensitiveWordList);
}
}
}
......
cloud-web-student/src/main/java/com/yizhi/application/course/controller/CourseApiController.java
......@@ -3,7 +3,7 @@ package com.yizhi.application.course.controller;
import com.baomidou.mybatisplus.plugins.Page;
import com.yizhi.application.Certificate.CertificateUtills.PushCertificateUtil;
import com.yizhi.application.course.utils.WorkUtil;
import com.yizhi.application.course.utils.StuWorkUtil;
import com.yizhi.application.tools.PageTools;
import com.yizhi.application.util.HtmlTagUtil;
import com.yizhi.core.application.context.ContextHolder;
......@@ -57,7 +57,7 @@ public class CourseApiController {
private FunctionDisplayConfigApiClients configApiClients;
@Autowired
private WorkUtil workUtil;
private StuWorkUtil stuWorkUtil;
@Autowired
private CoursePcClient coursePcClient;
......@@ -271,7 +271,7 @@ public class CourseApiController {
RequestContext requestContext = ContextHolder.get();
Page<ApiCommnentVo> page = commClient.apiList(id, requestContext.getAccountId(), pageNo, pageSize);
page = workUtil.fillData(page,requestContext);
page = stuWorkUtil.fillData(page,requestContext);
return Response.ok(page);
}
......
cloud-web-student/src/main/java/com/yizhi/application/course/controller/PolyVideoController.java
......@@ -45,7 +45,7 @@ public class PolyVideoController {
@GetMapping(value = "/token")
public Response<String> getPolyToken(@ApiParam(name = "vid",value = "保利威视vid") @RequestParam(value = "vid",required = true) String vid,
@ApiParam(name = "viewerIp",value = "用户IP") @RequestParam(value="viewerIp",defaultValue = "127.0.0.1",required = false) String viewerIP){
@ApiParam(name = "viewerIp",value = "用户IP") @RequestParam(value="viewerIp",defaultValue = "10.23.1.183",required = false) String viewerIP){
return getPolyResponse(vid);
}
......@@ -76,7 +76,7 @@ public class PolyVideoController {
// 时间戳
Long ts = System.currentTimeMillis();
// 用户 ip
String viewerIp = "127.0.0.1";
String viewerIp = "10.23.1.183";
// 自定义用户 id
// String viewerId = viewerId;
// 用户昵称
......
cloud-web-student/src/main/java/com/yizhi/application/course/controller/RecordeStuController.java
......@@ -25,7 +25,6 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
......@@ -44,9 +43,9 @@ public class RecordeStuController {
@Autowired
PointRedisFeignClients pointRedisFeignClients;
/*
@Autowired
AmqpTemplate amqpTemplate;
AmqpTemplate amqpTemplate;*/
@Autowired
CourseClient courseClient;
@Autowired
......@@ -179,7 +178,7 @@ public class RecordeStuController {
String sitePointId = pointRedisFeignClients.addPointRedis(pointParamVO);
if (null != sitePointId) {
//发送积分获取消息
amqpTemplate.convertAndSend("course", sitePointId);
//amqpTemplate.convertAndSend("course", sitePointId);
}
}
......
cloud-web-student/src/main/java/com/yizhi/application/course/controller/ReplyController.java
......@@ -2,7 +2,7 @@ package com.yizhi.application.course.controller;
import com.baomidou.mybatisplus.plugins.Page;
import com.yizhi.application.course.utils.WorkUtil;
import com.yizhi.application.course.utils.StuWorkUtil;
import com.yizhi.core.application.cache.CacheNamespace;
import com.yizhi.core.application.cache.RedisCache;
import com.yizhi.core.application.context.ContextHolder;
......@@ -41,7 +41,7 @@ public class ReplyController {
@Autowired
AccountClient accountClient;
@Autowired
private WorkUtil workUtil;
private StuWorkUtil stuWorkUtil;
@Autowired
private RedisCache redisCache;
......@@ -69,7 +69,7 @@ public class ReplyController {
Map<Long, String> nameMap = new HashMap<>();
Map<Long,String> headPhotoMap = new HashMap<>();
//组装Map
workUtil.getMap(nameMap,headPhotoMap,accountVOs);
stuWorkUtil.getMap(nameMap,headPhotoMap,accountVOs);
//过滤敏感词
Long companyId = context.getCompanyId();
......@@ -78,7 +78,7 @@ public class ReplyController {
if (sensitiveValues != null) {
sensitiveWordList = JsonUtil.json2Ojbect(sensitiveValues, Set.class);
}
workUtil.fillReply2(replys,nameMap,headPhotoMap,sensitiveWordList);
stuWorkUtil.fillReply2(replys,nameMap,headPhotoMap,sensitiveWordList);
}
return Response.ok(page);
......@@ -171,7 +171,7 @@ public class ReplyController {
Map<Long, String> nameMap = new HashMap<>();
Map<Long,String> headPhotoMap = new HashMap<>();
//组装Map
workUtil.getMap(nameMap,headPhotoMap,accountVOs);
stuWorkUtil.getMap(nameMap,headPhotoMap,accountVOs);
//过滤敏感词
Long companyId = context.getCompanyId();
......@@ -180,7 +180,7 @@ public class ReplyController {
if (sensitiveValues != null) {
sensitiveWordList = JsonUtil.json2Ojbect(sensitiveValues, Set.class);
}
workUtil.fillReply(replys,nameMap,sensitiveWordList);
stuWorkUtil.fillReply(replys,nameMap,sensitiveWordList);
}
Map<String, Integer> pageMap = new HashMap<>();
......
cloud-web-student/src/main/java/com/yizhi/application/course/utils/WorkUtil.java → cloud-web-student/src/main/java/com/yizhi/application/course/utils/StuWorkUtil.java
......@@ -20,7 +20,7 @@ import org.springframework.util.CollectionUtils;
import java.util.*;
@Component
public class WorkUtil {
public class StuWorkUtil {
@Autowired
private AccountClient accountClient;
@Autowired
......
cloud-web-student/src/main/java/com/yizhi/application/documents/DocumentComtroller.java → cloud-web-student/src/main/java/com/yizhi/application/documents/StuDocumentComtroller.java
......@@ -2,8 +2,8 @@ package com.yizhi.application.documents;
import com.baomidou.mybatisplus.plugins.Page;
import com.yizhi.application.caseLibrary.util.CommonUtils;
import com.yizhi.application.caseLibrary.util.UpConvert;
import com.yizhi.application.caseLibrary.util.StuCommonUtils;
import com.yizhi.application.caseLibrary.util.StuUpConvert;
import com.yizhi.application.documents.vo.CanDownload;
import com.yizhi.documents.application.feign.DocumentClient;
import com.yizhi.documents.application.vo.documents.DocumentVo;
......@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.File;
import java.util.Date;
......@@ -34,18 +35,18 @@ import java.util.Date;
@Api(tags = "资料表学员端接口", description = "资料表学员端接口")
@RestController
@RequestMapping("/student/document")
public class DocumentComtroller {
public class StuDocumentComtroller {
private static final Logger LOGGER = LoggerFactory.getLogger(DocumentComtroller.class);
private static final Logger LOGGER = LoggerFactory.getLogger(StuDocumentComtroller.class);
@Autowired
private DocumentClient documentClient;
@Autowired
private CommonUtils commonUtils;
private StuCommonUtils stuCommonUtils;
@Autowired
private UpConvert upConvert;
@Resource
private StuUpConvert stuUpConvert;
@Value("${ACTIVE}")
......
cloud-web-student/src/main/java/com/yizhi/application/exam/controller/ExamApiController.java
......@@ -23,7 +23,6 @@ import com.yizhi.util.application.domain.Response;
import com.yizhi.util.application.enums.i18n.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -57,8 +56,8 @@ public class ExamApiController {
@Autowired
private PointRedisFeignClients pointRedisClient;
@Autowired
private RabbitTemplate rabbitTemplate;
/*@Autowired
private RabbitTemplate rabbitTemplate;*/
@ApiOperation(value = "查询考试结果（答卷列表）", notes = "查询考试结果（答卷列表）", response = ExamAnswerApiListVO.class)
......@@ -228,8 +227,8 @@ public class ExamApiController {
/**
* 学员考试结果页查看（考试结束后）
*
* @param accountId
* @param answerId
* @param
* @param
* @return
*/
@ApiOperation(value = "学员考试结果页查看（考试结束后）", notes = "学员考试结果页查看（考试结束后））", response = ExamResultVO.class)
......
cloud-web-student/src/main/java/com/yizhi/application/exam/controller/ExamQuestionApiController.java
......@@ -33,7 +33,6 @@ import com.yizhi.util.application.event.TrainingProjectEvent;
import io.swagger.annotations.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
......@@ -62,9 +61,9 @@ public class ExamQuestionApiController {
@Autowired
PointRedisFeignClients pointRedisFeignClients;
/*
@Autowired
AmqpTemplate amqpTemplate;
AmqpTemplate amqpTemplate;*/
@Autowired
private TaskExecutor taskExecutor;
......@@ -366,10 +365,10 @@ public class ExamQuestionApiController {
}
String sitePointId1 = pointRedisFeignClients.addPointRedis(pointParamVO);//调用积分接口添加经验
if (null != sitePointId) {
amqpTemplate.convertAndSend(MQqueuesEnum.EXAM.getKey(), sitePointId); //发送积分获取消息
// amqpTemplate.convertAndSend(MQqueuesEnum.EXAM.getKey(), sitePointId); //发送积分获取消息
}
if (null != sitePointId1) {
amqpTemplate.convertAndSend(MQqueuesEnum.EXPERIENCEEXAM.getKey(), sitePointId1); //发送经验获取消息
//amqpTemplate.convertAndSend(MQqueuesEnum.EXPERIENCEEXAM.getKey(), sitePointId1); //发送经验获取消息
}
}
} catch (Exception e) {
......@@ -505,10 +504,10 @@ public class ExamQuestionApiController {
}
String sitePointId1 = pointRedisFeignClients.addPointRedis(pointParamVO); //调用积分接口添加积分
if (null != sitePointId) {
amqpTemplate.convertAndSend(MQqueuesEnum.EXAM.getKey(), sitePointId); //发送积分获取消息
//amqpTemplate.convertAndSend(MQqueuesEnum.EXAM.getKey(), sitePointId); //发送积分获取消息
}
if (null != sitePointId1) {
amqpTemplate.convertAndSend(MQqueuesEnum.EXPERIENCEEXAM.getKey(), sitePointId1); //发送积分获取消息
//amqpTemplate.convertAndSend(MQqueuesEnum.EXPERIENCEEXAM.getKey(), sitePointId1); //发送积分获取消息
}
}
} catch (Exception e) {
......@@ -604,10 +603,10 @@ public class ExamQuestionApiController {
}
String sitePointId1 = pointRedisFeignClients.addPointRedis(pointParamVO); //调用积分接口添加积分
if (null != sitePointId) {
amqpTemplate.convertAndSend(MQqueuesEnum.EXAM.getKey(), sitePointId); //发送积分获取消息
//amqpTemplate.convertAndSend(MQqueuesEnum.EXAM.getKey(), sitePointId); //发送积分获取消息
}
if (null != sitePointId1) {
amqpTemplate.convertAndSend(MQqueuesEnum.EXPERIENCEEXAM.getKey(), sitePointId1); //发送积分获取消息
//amqpTemplate.convertAndSend(MQqueuesEnum.EXPERIENCEEXAM.getKey(), sitePointId1); //发送积分获取消息
}
}
} catch (Exception e) {
......@@ -753,10 +752,10 @@ public class ExamQuestionApiController {
}
String sitePointId1 = pointRedisFeignClients.addPointRedis(pointParamVO); //调用积分接口添加积分
if (null != sitePointId) {
amqpTemplate.convertAndSend(MQqueuesEnum.EXAM.getKey(), sitePointId); //发送积分获取消息
//amqpTemplate.convertAndSend(MQqueuesEnum.EXAM.getKey(), sitePointId); //发送积分获取消息
}
if (null != sitePointId1) {
amqpTemplate.convertAndSend(MQqueuesEnum.EXPERIENCEEXAM.getKey(), sitePointId1); //发送积分获取消息
//amqpTemplate.convertAndSend(MQqueuesEnum.EXPERIENCEEXAM.getKey(), sitePointId1); //发送积分获取消息
}
}
} catch (Exception e) {
......
cloud-web-student/src/main/java/com/yizhi/application/point/controller/TestController.java
......@@ -8,7 +8,6 @@ import com.yizhi.point.application.feign.PointRedisFeignClients;
import com.yizhi.point.application.vo.PointParamVO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
......@@ -21,8 +20,8 @@ public class TestController {
@Autowired
private PointRedisFeignClients pointRedisClient;
@Autowired
private RabbitTemplate rabbitTemplate;
/*@Autowired
private RabbitTemplate rabbitTemplate;*/
@PostMapping("/test2")
public void test2(){
......@@ -44,7 +43,7 @@ public class TestController {
vo.setCompanyId(10000L);
String examPointId = pointRedisClient.addPointRedis(vo);
System.out.println("examPointId=" + examPointId);
rabbitTemplate.convertAndSend(MQqueuesEnum.EXAM.getKey(), examPointId);
//rabbitTemplate.convertAndSend(MQqueuesEnum.EXAM.getKey(), examPointId);
}
@PostMapping("/test")
......@@ -68,7 +67,7 @@ public class TestController {
vo.setCompanyId(1314L);
String examPointId = pointRedisClient.addPointRedis(vo);
System.out.println("examPointId=" + examPointId);
rabbitTemplate.convertAndSend(MQqueuesEnum.EXAM.getKey(), examPointId);
//rabbitTemplate.convertAndSend(MQqueuesEnum.EXAM.getKey(), examPointId);
LOG.info("开始产生积分-结束");
// PointParamVO vo = new PointParamVO();
......@@ -112,6 +111,6 @@ public class TestController {
vo.setCompanyId(10000L);
String votePointId = pointRedisClient.addPointRedis(vo);
System.out.println("votePointId=" + votePointId);
rabbitTemplate.convertAndSend(MQqueuesEnum.VOTE.getKey(), votePointId);
//rabbitTemplate.convertAndSend(MQqueuesEnum.VOTE.getKey(), votePointId);
}
}
cloud-web-student/src/main/java/com/yizhi/application/research/controller/ResearchAnswerController.java
......@@ -19,7 +19,6 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
......@@ -43,8 +42,8 @@ public class ResearchAnswerController {
private ResearchClient researchClient;
@Autowired
private PointRedisFeignClients pointRedisFeignClients;
@Autowired
private AmqpTemplate amqpTemplate;
/*@Autowired
private AmqpTemplate amqpTemplate;*/
@PostMapping("/submit")
@ApiOperation(value = "学员提交调研答案")
......@@ -88,10 +87,10 @@ public class ResearchAnswerController {
}
String sitePointId1 = pointRedisFeignClients.addPointRedis(pointParamVO);
if (null != sitePointId) {
amqpTemplate.convertAndSend(MQqueuesEnum.RESEARCH.getKey(), sitePointId); //发送积分获取消息
//amqpTemplate.convertAndSend(MQqueuesEnum.RESEARCH.getKey(), sitePointId); //发送积分获取消息
}
if (null != sitePointId1) {
amqpTemplate.convertAndSend(MQqueuesEnum.EXPERIENCERESERCH.getKey(), sitePointId1); //发送积分获取消息
// amqpTemplate.convertAndSend(MQqueuesEnum.EXPERIENCERESERCH.getKey(), sitePointId1); //发送积分获取消息
}
} catch (Exception e) {
LOGGER.error("调研积分发放失败：", e);
......
cloud-web-student/src/main/java/com/yizhi/application/research/controller/ResearchQuestionsController.java
......@@ -24,7 +24,6 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
......@@ -57,8 +56,8 @@ public class ResearchQuestionsController {
@Autowired
private PointRedisFeignClients pointRedisFeignClients;
@Autowired
private AmqpTemplate amqpTemplate;
/*@Autowired
private AmqpTemplate amqpTemplate;*/
/**
* 调研问题列表
......@@ -219,10 +218,10 @@ public class ResearchQuestionsController {
}
String sitePointId1 = pointRedisFeignClients.addPointRedis(pointParamVO);
if (null != sitePointId) {
amqpTemplate.convertAndSend(MQqueuesEnum.RESEARCH.getKey(), sitePointId); //发送积分获取消息
//amqpTemplate.convertAndSend(MQqueuesEnum.RESEARCH.getKey(), sitePointId); //发送积分获取消息
}
if (null != sitePointId1) {
amqpTemplate.convertAndSend(MQqueuesEnum.EXPERIENCERESERCH.getKey(), sitePointId1); //发送积分获取消息
// amqpTemplate.convertAndSend(MQqueuesEnum.EXPERIENCERESERCH.getKey(), sitePointId1); //发送积分获取消息
}
} catch (Exception e) {
......
cloud-web-student/src/main/java/com/yizhi/application/testInfo/controller/TestInfoController.java
......@@ -14,7 +14,6 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
......@@ -47,9 +46,9 @@ public class TestInfoController {
@Autowired
PointRedisFeignClients pointRedisFeignClients;
/*
@Autowired
AmqpTemplate amqpTemplate;
AmqpTemplate amqpTemplate;*/
@Autowired
RecordeClient recordeClient;
......@@ -250,7 +249,7 @@ public class TestInfoController {
String sitePointId = pointRedisFeignClients.addPointRedis(pointParamVO);
if (null != sitePointId) {
//发送积分获取消息
amqpTemplate.convertAndSend("course", sitePointId);
//amqpTemplate.convertAndSend("course", sitePointId);
}
}
......
cloud-web-student/src/main/resources/bootstrap.properties
server.port=34009
spring.application.name=web-student
ACTIVE=${spring.profiles.active}
spring.profiles.active=dev
spring.profiles.active=prod
# nacos
spring.cloud.nacos.config.shared-dataids=common-${spring.profiles.active}.properties
spring.cloud.nacos.config.namespace=${spring.profiles.active}
spring.cloud.nacos.config.prefix=${spring.application.name}
spring.cloud.nacos.config.file-extension=properties
spring.cloud.nacos.config.server-addr=127.0.0.1:8848
spring.cloud.nacos.config.server-addr=10.23.1.183:8848
spring.main.allow-bean-definition-overriding=true
logging.level.io.swagger.models.parameters.AbstractSerializableParameter= error
pom.xml
......@@ -230,7 +230,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>19.0</version>
<version>29.0-android</version>
</dependency>
<dependency>
<groupId>com.github.livesense</groupId>
......@@ -251,12 +251,6 @@
</dependency>
<dependency>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>com.sun.jna</groupId>
<artifactId>jna</artifactId>
<version>3.0.9</version>
......@@ -267,17 +261,12 @@
<artifactId>jaudiotagger</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
</dependencies>
<repositories>
<repository>
<id>learning-data-group</id>
<url>http://192.168.0.15:8081/repository/learning-data-group/</url>
<id>hqzhdj-data-group</id>
<url>http://192.168.0.15:8081/repository/hqzhdj-data-group/</url>
<releases>
<enabled>true</enabled>
</releases>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment