From b39cc2beacc1ec2e37cff349cae42e420105c8a6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 05 Nov 2021 14:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/animalheat/controller/AnimalHeatController.java | 21 ---------------------
1 files changed, 0 insertions(+), 21 deletions(-)
diff --git a/src/main/java/org/springblade/modules/animalheat/controller/AnimalHeatController.java b/src/main/java/org/springblade/modules/animalheat/controller/AnimalHeatController.java
index b029c80..ddf33de 100644
--- a/src/main/java/org/springblade/modules/animalheat/controller/AnimalHeatController.java
+++ b/src/main/java/org/springblade/modules/animalheat/controller/AnimalHeatController.java
@@ -3,10 +3,8 @@
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.pinecone.utils.EncryptionUtils;
import lombok.AllArgsConstructor;
import org.apache.commons.codec.Charsets;
import org.jfree.chart.ChartFactory;
@@ -18,7 +16,6 @@
import org.springblade.common.entity.AnimalHeatExcel;
import org.springblade.common.entity.ReportReturnData;
import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.core.http.util.HttpUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -56,25 +53,7 @@
private final AnimalHeatService animalHeatService;
- static BASE64Encoder encoder = new BASE64Encoder();
- @PostMapping("/upload")
- public String upload(MultipartFile file){
- try {
- String encode = encoder.encode(file.getBytes());
- String sm4Key = "bf679652628841dc8f35f84989abf350"; // 系统分配的密钥
- JSONObject source = new JSONObject();
- source.put("nameText","钟日健");
- source.put("numberText","360728199205280059");
- source.put("idPhoto",encode);
- // 加密数据,请先引入外部jar到工程中
- String encryptString = EncryptionUtils.encryptSM4(sm4Key,source.toString());
- System.out.println("encryptString = " + encryptString);
- } catch (IOException e) {
- e.printStackTrace();
- }
- return "encryptString";
- }
/**
* 获取体温数据统计
--
Gitblit v1.9.3