parent
3db4b4d000
commit
7cf4de3530
|
@ -180,6 +180,7 @@ mqtt:
|
||||||
|
|
||||||
#用户头像与背景
|
#用户头像与背景
|
||||||
mcwl:
|
mcwl:
|
||||||
|
encryptUrl: http://113.45.190.154:9090/encrypt_and_upload
|
||||||
user:
|
user:
|
||||||
avatar: https://ybl2112.oss-cn-beijing.aliyuncs.com/2025/MARCH/10/7/53/3f5cc1d7-b062-4a22-9f7e-d442bc6dcf42.png
|
avatar: https://ybl2112.oss-cn-beijing.aliyuncs.com/2025/MARCH/10/7/53/3f5cc1d7-b062-4a22-9f7e-d442bc6dcf42.png
|
||||||
backgroundImg: https://ybl2112.oss-cn-beijing.aliyuncs.com/2025/MARCH/10/8/2/c8387681-8138-4a29-a1c9-4a143da34c5a.png
|
backgroundImg: https://ybl2112.oss-cn-beijing.aliyuncs.com/2025/MARCH/10/8/2/c8387681-8138-4a29-a1c9-4a143da34c5a.png
|
||||||
|
|
|
@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.github.pagehelper.PageHelper;
|
import com.github.pagehelper.PageHelper;
|
||||||
import com.github.pagehelper.PageInfo;
|
import com.github.pagehelper.PageInfo;
|
||||||
|
import com.mcwl.common.constant.Constants;
|
||||||
import com.mcwl.common.constant.DictConstants;
|
import com.mcwl.common.constant.DictConstants;
|
||||||
import com.mcwl.common.constant.HttpStatus;
|
import com.mcwl.common.constant.HttpStatus;
|
||||||
import com.mcwl.common.core.domain.R;
|
import com.mcwl.common.core.domain.R;
|
||||||
|
@ -18,6 +19,7 @@ import com.mcwl.common.core.page.TableDataInfo;
|
||||||
import com.mcwl.common.utils.SecurityUtils;
|
import com.mcwl.common.utils.SecurityUtils;
|
||||||
import com.mcwl.common.utils.StringUtils;
|
import com.mcwl.common.utils.StringUtils;
|
||||||
import com.mcwl.common.utils.baidu.BaiduCensor;
|
import com.mcwl.common.utils.baidu.BaiduCensor;
|
||||||
|
import com.mcwl.common.utils.http.HttpUtils;
|
||||||
import com.mcwl.resource.domain.*;
|
import com.mcwl.resource.domain.*;
|
||||||
import com.mcwl.resource.domain.dto.ModelImagePageRes;
|
import com.mcwl.resource.domain.dto.ModelImagePageRes;
|
||||||
import com.mcwl.resource.domain.request.RequestModel;
|
import com.mcwl.resource.domain.request.RequestModel;
|
||||||
|
@ -35,13 +37,11 @@ import com.mcwl.system.init.DictInit;
|
||||||
import com.mcwl.system.service.ISysUserService;
|
import com.mcwl.system.service.ISysUserService;
|
||||||
import lombok.extern.log4j.Log4j2;
|
import lombok.extern.log4j.Log4j2;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
|
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.*;
|
||||||
import java.util.Date;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
|
|
||||||
/**模型 业务实现层
|
/**模型 业务实现层
|
||||||
|
@ -78,6 +78,9 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
|
||||||
@Autowired
|
@Autowired
|
||||||
private CollectServiceImpl collectService;
|
private CollectServiceImpl collectService;
|
||||||
|
|
||||||
|
@Value("${mcwl.encryptUrl}")
|
||||||
|
private String encryptUrl;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 设置模型置顶状态
|
* 设置模型置顶状态
|
||||||
|
@ -499,16 +502,18 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
|
||||||
String key = modelVersion.getObjectKey();
|
String key = modelVersion.getObjectKey();
|
||||||
|
|
||||||
//审核成功,查看时候加密,拉取文件到ui
|
//审核成功,查看时候加密,拉取文件到ui
|
||||||
// if (modelVersion.getIsEncrypt() == 1){
|
if (modelVersion.getIsEncrypt() == 1){
|
||||||
//
|
|
||||||
// //调用加密/创建参数
|
//调用加密/创建参数
|
||||||
// HashMap<String, String> param = new HashMap<>();
|
HashMap<String, String> param = new HashMap<>();
|
||||||
// param.put("object_key",modelVersion.getObjectKey());
|
param.put("objectKey",modelVersion.getObjectKey());
|
||||||
// param.put("model_id",modelVersion.getId()+"");
|
param.put("id",modelVersion.getId()+"");
|
||||||
// param.put("file_type", Constants.MODEL);
|
param.put("fileType", Constants.MODEL);
|
||||||
//
|
|
||||||
// String s = HttpUtils.pythonPost("http://1.13.246.108:9090/encrypt_and_upload", param);
|
String s = HttpUtils.pythonPost(encryptUrl, param);
|
||||||
//
|
|
||||||
|
log.info("调用加密服务结果:{}",s);
|
||||||
|
|
||||||
// JSONObject jsonObject = JSONObject.parseObject(s);
|
// JSONObject jsonObject = JSONObject.parseObject(s);
|
||||||
// JSONObject data = JSONObject.parseObject(jsonObject.getString("data"));
|
// JSONObject data = JSONObject.parseObject(jsonObject.getString("data"));
|
||||||
// String objectKey = data.getString("objectKey");
|
// String objectKey = data.getString("objectKey");
|
||||||
|
@ -523,7 +528,7 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
|
||||||
// .keyRate(secretKey).build();
|
// .keyRate(secretKey).build();
|
||||||
// //更新加密后数据
|
// //更新加密后数据
|
||||||
// modelVersionMapper.updateById(modelVersion1);
|
// modelVersionMapper.updateById(modelVersion1);
|
||||||
// }
|
}
|
||||||
|
|
||||||
// //调用ui拉取文件接口
|
// //调用ui拉取文件接口
|
||||||
// log.info("开始拉取文件...");
|
// log.info("开始拉取文件...");
|
||||||
|
|
Loading…
Reference in New Issue