From 045b55722b25ccc77d88671c5d6df309edb8a66d Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Tue, 22 Feb 2022 16:00:34 +0800
Subject: [PATCH] 1. 保安员新增异步推送数据至群访用户表 2. 会员标记接口新增,会员标记成功,则创建会员记录和会员题库记录(包含120道题目) 3. web 端考试开始,查询题目判断用户是否为会员,如果为会员则从会员题库获取当前人员的考试题目(从120道题中随机抽取60道)
---
src/main/java/org/springblade/modules/directive/controller/DirectiveController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java b/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java
index 2cbd28e..03616f8 100644
--- a/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java
+++ b/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java
@@ -4,7 +4,7 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
-import org.springblade.common.constant.FtpConstant;
+import org.springblade.common.config.FtpConfig;
import org.springblade.common.utils.arg;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -83,11 +83,12 @@
String[] directiveUrl = directive.getUrl().split(",");
for (String url : directiveUrl) {
String s = url.substring(26, url.length());
- String urls = FtpConstant.ip + s;
+ //内网url
+ String urls = FtpConfig.ip + s;
DirectiveFile directiveFile = new DirectiveFile();
directiveFile.setType(1);
directiveFile.setDirectiveId(directive.getId());
- directiveFile.setUrl(urls);
+ directiveFile.setUrl(url);
status = directiveService.saveDirectiveFile(directiveFile);
String s2 =
"insert into sys_directive_file(id,type,directive_id,url) " +
@@ -134,7 +135,7 @@
String[] directiveUrl = directive.getUrl().split(",");
for (String url : directiveUrl) {
String s = url.substring(26, url.length());
- String urls = FtpConstant.ip + s;
+ String urls = FtpConfig.ip + s;
DirectiveFile directiveFile = new DirectiveFile();
directiveFile.setType(1);
directiveFile.setDirectiveId(directive.getId());
--
Gitblit v1.9.3