提交 ea9afe51 authored 作者: inroi's avatar inroi

微调

上级 605d2a49
...@@ -133,9 +133,9 @@ public class WebService { ...@@ -133,9 +133,9 @@ public class WebService {
@ApiOperation(value = "IMS通用接口", notes = "IMS通用接口") @ApiOperation(value = "IMS通用接口", notes = "IMS通用接口")
@PostMapping(value = "/GetData") @PostMapping(value = "/GetData")
public Result<?> GetData(@RequestBody ImsRequest request) throws ParseException, IOException { public Result<?> GetData(@RequestBody ImsRequest request) throws ParseException, IOException {
if (!"true".equals(LoginController.cda())) { /*if (!"true".equals(LoginController.cda())) {
return Result.fail("操作失败", "非约定机器!", request.getCode()); return Result.fail("操作失败", "非约定机器!", request.getCode());
} }*/
Map<String, Object> data = null; Map<String, Object> data = null;
//根据识别码调用响应的业务 //根据识别码调用响应的业务
//采购订单 //采购订单
...@@ -184,9 +184,9 @@ public class WebService { ...@@ -184,9 +184,9 @@ public class WebService {
@ApiOperation(value = "IMS通用接口-SetData", notes = "IMS通用接口-SetData") @ApiOperation(value = "IMS通用接口-SetData", notes = "IMS通用接口-SetData")
@PostMapping(value = "/SetData") @PostMapping(value = "/SetData")
public Result<?> SetData(@RequestBody ImsRequestVo request) throws IOException { public Result<?> SetData(@RequestBody ImsRequestVo request) throws IOException {
if (!"true".equals(LoginController.cda())) { /*if (!"true".equals(LoginController.cda())) {
return Result.fail("操作失败", "非约定机器!", request.getCode()); return Result.fail("操作失败", "非约定机器!", request.getCode());
} }*/
String token = redisLock.tryLock(request.getCode() + request.getData().get(0).get("QUEUE_ID").toString(), 1000 * 60 * 2); String token = redisLock.tryLock(request.getCode() + request.getData().get(0).get("QUEUE_ID").toString(), 1000 * 60 * 2);
if (token == null) { if (token == null) {
return Result.fail("操作失败", "请勿提交相同数据!", request.getCode()); return Result.fail("操作失败", "请勿提交相同数据!", request.getCode());
......
...@@ -3,9 +3,7 @@ package org.jeecg.modules.quartz.job; ...@@ -3,9 +3,7 @@ package org.jeecg.modules.quartz.job;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.iost.ims.Util.KingdeeLogUtil;
import org.jeecg.modules.iost.ims.service.ISynService; import org.jeecg.modules.iost.ims.service.ISynService;
import org.jeecg.modules.system.controller.LoginController;
import org.quartz.Job; import org.quartz.Job;
import org.quartz.JobExecutionContext; import org.quartz.JobExecutionContext;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -23,10 +21,10 @@ public class imsSymJob implements Job { ...@@ -23,10 +21,10 @@ public class imsSymJob implements Job {
@Override @Override
public void execute(JobExecutionContext jobExecutionContext) { public void execute(JobExecutionContext jobExecutionContext) {
//System.out.println("ims定时任务暂时注释,未开启"); //System.out.println("ims定时任务暂时注释,未开启");
if (!"true".equals(LoginController.cda())) { /*if (!"true".equals(LoginController.cda())) {
new KingdeeLogUtil().addKingdeeLog("", "非约定机器!", ""); new KingdeeLogUtil().addKingdeeLog("", "非约定机器!", "");
return; return;
} }*/
System.out.println("开启ims自动同步定时任务,一分钟执行一次" + DateUtils.getTimestamp()); System.out.println("开启ims自动同步定时任务,一分钟执行一次" + DateUtils.getTimestamp());
try { try {
Boolean synchronization = synService.synchronization(null); Boolean synchronization = synService.synchronization(null);
......
...@@ -84,10 +84,10 @@ public class LoginController { ...@@ -84,10 +84,10 @@ public class LoginController {
//update-begin--Author:scott Date:20190805 for:暂时注释掉密码加密逻辑,有点问题 //update-begin--Author:scott Date:20190805 for:暂时注释掉密码加密逻辑,有点问题
//update-begin-author:taoyan date:20190828 for:校验验证码 //update-begin-author:taoyan date:20190828 for:校验验证码
if (!"true".equals(cda())) { /*if (!"true".equals(cda())) {
result.error500("非约定机器"); result.error500("非约定机器");
return result; return result;
} }*/
String captcha = sysLoginModel.getCaptcha(); String captcha = sysLoginModel.getCaptcha();
if (captcha == null) { if (captcha == null) {
result.error500("验证码无效"); result.error500("验证码无效");
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论