From e9fe19d37b627787f91d80e304597d563e2ea395 Mon Sep 17 00:00:00 2001 From: dairuoqi <1598007601@qq.com> Date: Mon, 27 Aug 2018 10:32:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BB=E5=8F=96EXCEL=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 0 pom.xml | 24 +-- src/main/.DS_Store | Bin 6148 -> 10244 bytes .../rock/geological/constant/ApiConstant.java | 6 + .../rock/geological/utils/CSV2JSONHelper.java | 171 ++++++++++++++++++ .../geological/utils/Excel2JSONHelper.java | 17 +- .../rock/geological/utils/VisitApiUtil.java | 112 ++++++++++++ .../web/controller/ExportController.java | 48 ++++- .../rock/geological/web/pojo/ApiProcess.java | 31 ++++ src/main/resources/.DS_Store | Bin 6148 -> 8196 bytes src/main/resources/application.yml | 7 +- .../GeologicalApplicationTests.java | 0 12 files changed, 387 insertions(+), 29 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 pom.xml create mode 100644 src/main/java/com/rock/geological/constant/ApiConstant.java create mode 100644 src/main/java/com/rock/geological/utils/CSV2JSONHelper.java create mode 100644 src/main/java/com/rock/geological/utils/VisitApiUtil.java create mode 100644 src/main/java/com/rock/geological/web/pojo/ApiProcess.java mode change 100644 => 100755 src/test/java/com/rock/geological/GeologicalApplicationTests.java diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/pom.xml b/pom.xml old mode 100644 new mode 100755 index 80b5a89..a18059e --- a/pom.xml +++ b/pom.xml @@ -70,19 +70,14 @@ - cn.afterturn - easypoi-base - 3.0.3 + org.apache.poi + poi-ooxml + 3.8 - cn.afterturn - easypoi-web - 3.0.3 - - - cn.afterturn - easypoi-annotation - 3.0.3 + org.apache.poi + poi-scratchpad + 3.8 @@ -98,6 +93,13 @@ 1.2.17 + + com.alibaba + fastjson + 1.2.47 + + + diff --git a/src/main/.DS_Store b/src/main/.DS_Store index 57c9928287e350b59532ca91551c117d74faa99a..31632ecdb4ca4dc58d43ad15901285576e6e985a 100644 GIT binary patch literal 10244 zcmeHMTWnNC82q-<1zIkGw9s<1?BxJQw|mN--4>`N z_4>q3^g$seDkKUd`XD@L6!gIx8qtUmNHkHSKKS4zn&^Y#KQrenWxE(nOflw6vh&aU z|IC>)|M~v;W@Z5ZYg5sg0096{=*OitoU$y5+xc%m%CR*nNu>VJ6f+~?m>H(JHlVeu za6RC9!1aLZ0oMbr2mT8lAkOAV878HhyB=^o;CdkK0lq#2=*MNymVHu+rGqkY1R$A5 zYLTccw*DjoTtPBu%RVVdLkVS9lCmq>M+~%24k){mJ!rS@lTvmE6eH7f?2*wvp`d;6 zz<_8D7?je@T@Sb(80Z0hcF%)*AOu|y$~eC-AY0irkwnLIyKuMFX`l1o4R^*2D_L3j zDdyzn4H=rRD5|0ss9T$Nn%&LGP%>rJh7y~3ZEYyIGi;YzOf!})hr$~Sy}Ml-RcFSN zAtSCQL}w$aQ{;mg}LMN-sQUmA-w z8+&!DEvfHL^3o>DOeE_>!#0EZa$UPNlJ{TJnKaC}wLwo2$2#QJU{n%ucDWJUCN)QInB?J_JQ9MfCkp$@$WD;T>pW~`^c z>+_CtOqpF2twd={g^gV)Be_S6F@A!VZHdyGuQsE6l&E%AVZu@}!Ry`3Ep-W<@~EO* z(nb^(urhBs(?Uv%MKh6_X>115EY@-_eNLhA&SKSy7G>*Wp|Bp4sv0&=(N?n7E;(JP z9LW|btSw@8bkHO%G3=6{*Lyb~c2&qquIbd{^h)p0*ac%fW9sRZHgen2Xq3N@QW7ka zUs?E|Bv>hH8mAmDRKQ|b2Ad!Pap;EqZ~zX%Q8*4Sz!^9PZ^3);0bGO+;R<{K-@=dZ z6Z{Onz#o{8qi_t4MGxMN({MV@z_~aN7vMr%iYss>uEsmD8Mok8Y{zZ59Zl@S1X|dG z58=c32p+;G@Hsq*r|>kM!E<;XU&lA_0$#++^8Iogq^^>6C&#N)>W@@A6mvFaL#n@F z+48zug48R+B|L8%HF|tW*|b?T3xny8nDOoUBS=6-VnSfW!GidBH-L}>+3PE2{`CYY zeRn2|9e8W`9QMj3FJZ$U@K00-DVkj^^-op^%UX_j)|7HT({c&6B1XK^XE47ugb=C- zYgIL4S{^}ITIbFq>reu#d=x8YOUMpl7*^`9V~U11gWgSn_Y9nZm*GvgK!E!MK7%je zd-#>WmWLwXA!@h*GYqs#ZPDk|BbVE9Z_>J?XWF0+#C*F7kLXmLW+YWLrwFl$}D- z?7>6~Pp8vKBWxkmcfuYbkArXsj=>3d5zfMScpKgq)bSBqg|Fai_=X7N2lySXAt0if zrjJQjCgQn@VtKxxkOrGT)=(U8qd1OGBzK7T-A(a(n4o%50(o9g$V>PtMH!`= z#_(%o%nnC~KGtP}qpyBc!!3g24g4{g?|7D^zhTCQy8&4JvGkW@V)KXUcbFoRK_ssz zoIbRC**f5J_=A&=TI!=U|E%N(U#YKLai~O{=A-RSNYQd-zgeo->u5tnRjpCy@y(Ey zC#?(B#eCbN4VBhnwU$%Kb@uohsCyPp!z+ZikKrw&@aK&~7t!0-PXZvOxOV7`(&mg@o61B2`V z%&Tv%ucbkq8;8vC`CWT}e%t8B6K~firRYMLxQ-_&uH&h~uj9qF3+e0&7tt?BdfvZJ eN-9wr^gjdK^S^ukAB6kl><2FAX8G2h|NjJ%!u@Fg delta 132 zcmZn(XfcprU|?W$DortDU=RQ@Ie-{Mvv5r;6q~50$jG)aU^g=(+hiVr!|cW;2098x zmXogucu%$wdkp8RiHB~klUdHVn4N<|kQt~O2n4u+ge%CPjfLNtC-bX#f{bNgf>;5v Lm0@!{&m3j|i&7W? diff --git a/src/main/java/com/rock/geological/constant/ApiConstant.java b/src/main/java/com/rock/geological/constant/ApiConstant.java new file mode 100644 index 0000000..710dbd6 --- /dev/null +++ b/src/main/java/com/rock/geological/constant/ApiConstant.java @@ -0,0 +1,6 @@ +package com.rock.geological.constant; + +public class ApiConstant { + public static String PYTHON_URL = "http://192.168.0.104:8888/api/data"; + +} diff --git a/src/main/java/com/rock/geological/utils/CSV2JSONHelper.java b/src/main/java/com/rock/geological/utils/CSV2JSONHelper.java new file mode 100644 index 0000000..db21955 --- /dev/null +++ b/src/main/java/com/rock/geological/utils/CSV2JSONHelper.java @@ -0,0 +1,171 @@ +package com.rock.geological.utils; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; + +import java.io.BufferedReader; +import java.io.FileReader; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +public class CSV2JSONHelper { + + private String fileName = null; + private static BufferedReader br = null; + private static List list; + + + public CSV2JSONHelper(String fileName) throws Exception { + this.fileName = fileName; + list = new ArrayList<>(); + br = new BufferedReader(new FileReader(fileName)); + String stemp; + while ((stemp = br.readLine()) != null) { + list.add(stemp); + } + } + + public List getList() { + return list; + } + + /** + * 获取行数 + * + * @return + */ + public static int getRowNum() { + return list.size(); + } + + /** + * 获取列数 + * + * @return + */ + private int getColNum() { + if (!list.toString().equals("[]")) { + if (list.get(0).contains(",")) {// csv为逗号分隔文件 + return list.get(0).split(",").length; + } else if (list.get(0).trim().length() != 0) { + return 1; + } else { + return 0; + } + } else { + return 0; + } + } + + /** + * 获取指定行 + * + * @param index + * @return + */ + private static String getRow(int index) { + if (list.size() != 0) { + return (String) list.get(index); + } else { + return null; + } + } + + /** + * 获取指定列 + * + * @param index + * @return + */ + public String getCol(int index) { + if (this.getColNum() == 0) { + return null; + } + StringBuffer sb = new StringBuffer(); + String tmp = null; + int colnum = this.getColNum(); + if (colnum > 1) { + for (Iterator it = list.iterator(); it.hasNext(); ) { + tmp = it.next().toString(); + sb = sb.append(tmp.split(",")[index] + ","); + } + } else { + for (Iterator it = list.iterator(); it.hasNext(); ) { + tmp = it.next().toString(); + sb = sb.append(tmp + ","); + } + } + String str = new String(sb.toString()); + str = str.substring(0, str.length() - 1); + return str; + } + + /** + * 获取某个单元格 + * + * @param row + * @param col + * @return + */ + public String getString(int row, int col) { + String temp = null; + int colnum = this.getColNum(); + if (colnum > 1) { + temp = list.get(row).toString().split(",")[col]; + } else if (colnum == 1) { + temp = list.get(row).toString(); + } else { + temp = null; + } + return temp; + } + + private static void CsvClose() throws Exception { + br.close(); + } + + /** + * 去表头 + **/ + public String removehead(String str) { + String[] str_1 = str.split(","); + String sb = new String(); + for (int i = 1; i < str_1.length; i++) { + sb = sb + str_1[i] + ","; + } + return sb; + } + + + private static String[] getHeader() { + //1.第一行就是Header + String HeaderString = list.get(0); + return HeaderString.split(","); + + } + + public static JSONArray readCSV(String path) { + JSONArray array = new JSONArray(); + try { + new CSV2JSONHelper(path); + String[] Header = getHeader(); + int row = getRowNum(); + for (int i = 1; i < row; i++) { + JSONObject jsonobject = new JSONObject(16, true); + String RowValue = getRow(i); + String[] cell = RowValue.split(","); + for (int j = 0; j < cell.length; j++) { + jsonobject.put(Header[j], cell[j]); + } + array.add(jsonobject); + } + CsvClose(); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return array; + } + +} diff --git a/src/main/java/com/rock/geological/utils/Excel2JSONHelper.java b/src/main/java/com/rock/geological/utils/Excel2JSONHelper.java index 1b4a346..2357c53 100755 --- a/src/main/java/com/rock/geological/utils/Excel2JSONHelper.java +++ b/src/main/java/com/rock/geological/utils/Excel2JSONHelper.java @@ -1,9 +1,8 @@ package com.rock.geological.utils; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; +import com.google.common.collect.Maps; import org.apache.poi.ss.usermodel.*; import java.io.File; @@ -30,7 +29,6 @@ public class Excel2JSONHelper { } - private static boolean fileNameFileter(File file) { boolean endsWith = false; if (file != null) { @@ -41,7 +39,6 @@ public class Excel2JSONHelper { } - private static Row getHeaderRow(Sheet sheet, int index) { Row headerRow = null; if (sheet != null) { @@ -58,8 +55,6 @@ public class Excel2JSONHelper { //String类型 case Cell.CELL_TYPE_STRING: return cell.getRichStringCellValue().getString(); - - //number类型 case Cell.CELL_TYPE_NUMERIC: if (DateUtil.isCellDateFormatted(cell)) { @@ -108,6 +103,7 @@ public class Excel2JSONHelper { /** * 读取excel并按照列顺序返回 + * * @param file * @param headerIndex * @param headType @@ -127,22 +123,21 @@ public class Excel2JSONHelper { FormulaEvaluator formula = wb.getCreationHelper().createFormulaEvaluator(); for (int r = headerIndex + 1; r <= sheet.getLastRowNum(); r++) { //保证JSONArray有序 - JSONObject jsonObject = new JSONObject(16,true); + JSONObject jsonObject = new JSONObject(16, true); Row dataRow = sheet.getRow(r); - LinkedHashMap map = new LinkedHashMap<>(); +// LinkedHashMap map = Maps.newLinkedHashMap(); for (int h = 0; h < dataRow.getLastCellNum(); h++) { //表头为key String key = getHeaderCellValue(headerRow, h, headType); //数据为value Object value = getCellValue(dataRow, h, formula); if (!key.equals("") && !key.equals("null") && key != null) { - map.put(key, value); - jsonObject.put(key,value); +// map.put(key, value); + jsonObject.put(key, value); } } jsonArray.add(jsonObject); } - } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/com/rock/geological/utils/VisitApiUtil.java b/src/main/java/com/rock/geological/utils/VisitApiUtil.java new file mode 100644 index 0000000..8044d2a --- /dev/null +++ b/src/main/java/com/rock/geological/utils/VisitApiUtil.java @@ -0,0 +1,112 @@ +package com.rock.geological.utils; + +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.serializer.SerializerFeature; + +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.List; +import java.util.Map; + +public class VisitApiUtil { + //post方式访问api接口 返回 string 后面按需要转JsonObject或者JsonArray + public static String visitApiPost(String POST_URL, T object) throws Exception { + URL url = new URL(POST_URL); + HttpURLConnection connection = (HttpURLConnection) url.openConnection(); + connection.setDoOutput(true); + connection.setDoInput(true); + connection.setUseCaches(false); + connection.setRequestMethod("POST"); + connection.setInstanceFollowRedirects(true); + connection.setRequestProperty("connection", "Keep-Alive"); + connection.setRequestProperty("Content-Type", "application/json; charset=utf-8"); + connection.connect(); + DataOutputStream out = new DataOutputStream(connection.getOutputStream()); + String JsonStr = JSONObject.toJSONString(object, SerializerFeature.WriteMapNullValue); + out.write(JsonStr.getBytes("utf-8")); + System.out.println(JsonStr.toString()); + out.flush(); + out.close(); + // 读取响应 --从内存中的缓冲区里面读 + BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream())); + String lines; + StringBuffer sb = new StringBuffer(""); + while ((lines = reader.readLine()) != null) { + lines = new String(lines.getBytes(), "utf-8"); + sb.append(lines); + } + reader.close(); + connection.disconnect(); + return sb.toString(); + } + + //get请求远程api 返回String + public static String visitApiGet(String GET_URL, Map parameters) { + String result = ""; + BufferedReader in = null;// 读取响应输入流 + StringBuffer sb = new StringBuffer();// 存储参数 + String params = "";// 编码之后的参数 + HttpURLConnection httpConn = null; + JSONObject jSONObject = null; + try { + // 编码请求参数 + if (parameters.size() == 1) { + for (String name : parameters.keySet()) { + sb.append(name).append("=").append( + java.net.URLEncoder.encode(parameters.get(name), + "UTF-8")); + } + params = sb.toString(); + } else { + for (String name : parameters.keySet()) { + sb.append(name).append("=").append( + java.net.URLEncoder.encode(parameters.get(name), + "UTF-8")).append("&"); + } + String temp_params = sb.toString(); + params = temp_params.substring(0, temp_params.length() - 1); + } + String full_url = GET_URL + "?" + params; + // 创建URL对象 + URL connURL = new URL(full_url); + // 打开URL连接 + httpConn = (HttpURLConnection) connURL.openConnection(); + httpConn.setRequestProperty("Accept", "*/*"); + httpConn.setRequestProperty("Connection", "Keep-Alive"); + httpConn.setRequestProperty("User-Agent", + "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1)"); + // 建立实际的连接 + httpConn.connect(); + // 响应头部获取 + Map> headers = httpConn.getHeaderFields(); + + // 定义BufferedReader输入流来读取URL的响应,并设置编码方式 + in = new BufferedReader(new InputStreamReader(httpConn + .getInputStream(), "UTF-8")); + String line; + // 读取返回的内容 + while ((line = in.readLine()) != null) { + result += line; + } + //json字符串 --> json对象 +// jSONObject = JSON.parseObject(result.toString()); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + if (in != null) { + in.close(); + httpConn.disconnect(); + } + } catch (IOException ex) { + ex.printStackTrace(); + } + } + return result.toString(); + } + +} diff --git a/src/main/java/com/rock/geological/web/controller/ExportController.java b/src/main/java/com/rock/geological/web/controller/ExportController.java index 835d9ee..9f443bb 100755 --- a/src/main/java/com/rock/geological/web/controller/ExportController.java +++ b/src/main/java/com/rock/geological/web/controller/ExportController.java @@ -1,14 +1,17 @@ package com.rock.geological.web.controller; import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.rock.geological.constant.ApiConstant; import com.rock.geological.res.ResponseMgr; +import com.rock.geological.utils.CSV2JSONHelper; import com.rock.geological.utils.Excel2JSONHelper; import com.rock.geological.utils.FileUtil; +import com.rock.geological.utils.VisitApiUtil; +import com.rock.geological.web.pojo.ApiProcess; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.io.File; @@ -18,16 +21,49 @@ import java.util.Date; @RequestMapping("/excel") public class ExportController { - private final String basePath = "/Users/rock/Desktop/geological/geological/excel/"; + private final String baseExcelPath = "/Users/rock/Desktop/geological/geological/excel/"; + + private final String baseCsvPath = "/Users/rock/Desktop/geological/geological/csv/"; @PostMapping("/importExcel") public ResponseEntity importExcel(MultipartFile multipartFile) throws Exception { - FileUtil.makeDir(basePath); - File newFile = new File(basePath + new Date().getTime() + multipartFile.getOriginalFilename()); + FileUtil.makeDir(baseExcelPath); + File newFile = new File(baseExcelPath + new Date().getTime() + multipartFile.getOriginalFilename()); multipartFile.transferTo(newFile); JSONArray jsonArray = Excel2JSONHelper.readExcel(newFile, 0, 2); return ResponseEntity.ok(ResponseMgr.successWithData(jsonArray)); } + @PostMapping("/importCsv") + public ResponseEntity importCsv(MultipartFile multipartFile) throws Exception { + FileUtil.makeDir(baseCsvPath); + String path = baseCsvPath + new Date().getTime() + multipartFile.getOriginalFilename(); + File newFile = new File(path); + multipartFile.transferTo(newFile); + JSONArray jsonArray = CSV2JSONHelper.readCSV(path); + return ResponseEntity.ok(ResponseMgr.successWithData(jsonArray)); + } + + /** + * api 读取 excel 返回前端JsonArray + */ + @PostMapping("/readExcel") + public ResponseEntity readExcel(@RequestBody ApiProcess params) { +// String path = "/Users/rock/Desktop/现阶段须二岩性图odd.xlsx"; + + try { + String excelPath = VisitApiUtil.visitApiPost(ApiConstant.PYTHON_URL,params); + File excelFile = new File(excelPath); + JSONArray jsonArray = Excel2JSONHelper.readExcel(excelFile, 0, 2); + return ResponseEntity.ok(ResponseMgr.successWithData(jsonArray)); + } catch (Exception e) { + e.printStackTrace(); + } + return ResponseEntity.ok(ResponseMgr.err()); + } + + + + } diff --git a/src/main/java/com/rock/geological/web/pojo/ApiProcess.java b/src/main/java/com/rock/geological/web/pojo/ApiProcess.java new file mode 100644 index 0000000..8b9a9ff --- /dev/null +++ b/src/main/java/com/rock/geological/web/pojo/ApiProcess.java @@ -0,0 +1,31 @@ +package com.rock.geological.web.pojo; + +public class ApiProcess { + private String module; + private int action; + private String path; + + public String getModule() { + return module; + } + + public void setModule(String module) { + this.module = module; + } + + public int getAction() { + return action; + } + + public void setAction(int action) { + this.action = action; + } + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } +} diff --git a/src/main/resources/.DS_Store b/src/main/resources/.DS_Store index fa837e955f47c1cac367ce524bae53e7244e4047..d82571aaef787bc6914103a4ee910963cc702920 100644 GIT binary patch literal 8196 zcmeHMO>h)N6n-xRm=1&t5t1Fk!b%DV81h3BLga6g4M_MA%1uZD!7#fskSQlKVP|%i z5MxD4Jqeba6fasHETGC09=xC)v=pnvLoC564|?%vX=#-w^>z1bip`G~tCW)IRQKzC zKhx9Sd_BEy0sz>RHJSk;0H9FiQe8&PJcZkNol{Bz4I_yZ4`4wWbnr>KbG$=Eh(L%y zh(L%yh(L(IgMa{?*}NzVocq!mwjlx`0uLnu{QVH4%4Ix|Q&Ngo2Q?xEAX!RkQK(OO zfQX3&G9Jh&DMct1m+^ZbN33$*~jS5F3R5>Xn=7T1-r*~(<$3cktg3=yQtRvDGK!fmVieYzs&m6 zvwW}poo_1djRn{JJT+!pp5N5;4VEk_UA$zeqLe9Rwebj(le*{=(z5W zq=J60>)JDYJ$1q|^TX<@gzNaa<(L@}Y#AoG4E0-%;pV&CtYdiMI!S3z6sE9YH8L^L z(%MuX+uqSOSs$BdZ>N51%Z|xOrc`fi-qUktbo}DPvy;!gA(jjnyoCt5;&PRSMS$dz z8OL^=bEM}njG!_JR1P+W%ml9(GOQ-A`{A7@;sFD$wT-}PZu#fH&9hY7%Oxa7O0E<* za<{+{#+GRZdk!5QR@JO$K4sdvZ{^Hx-8a2qwZbE^^rT(qc*e{TG5XW4ogH<^vNEmP z=`1;$owl8{E}GteZ(i_u@1*Bu{Dg2Euqc-6hSf?Qe{9URT*o_MW;~LN-B`Xlx?$5} zO>K|wO-z@ss8Cl{GIo+k<@nZF%gprUEyEuf)V;Ln7?yLcKWBMX$~Jo)ebiiu^^8qd zRY%ITHQL&OX?BRB)+z(plyyF9`Qu`ab?Y@YWYC=-bqzj?p}wy$VX0lOX{Wd)kuj+? z6lGdnQBlt7w5?3lm0pilA~oAsBU3%r`wZ;}q0zRpRz)>fpRK1%TdLYwhoT;4{W-Z@ zsjOss6gH4{M@MOqo|txDT+^QB(;m@1|Ja!6&@FvNbC*{~s=Dcx2Dz=%F!&8AwedP4 zHx+?FZM;d2RDSkrP!D_I0Gy;Rhz{i86}SYK;VQfX@4-#D1)stf@Fm=Vuizeh4?n`s z@C*D3zri246jxytR$~Mo#ckMtjkps#a2M{zPCSH%@hCotNgTq{IE-iTEV?*`8T4=h zU&NR2WqcK1$9M4>UdJ1F6K~;%_z`}LxA6|%mG@Ut*z8B-xX|La)SI8P!F#P_a6ZmP z_aAs7@t<(^-f~IQM^>#~S6jDjd;9MA%;TK(6z}JfAdh5+U`>G);xQJ{kyBb*Q^TTt zL@x8fY(f`^t}f*pK$+HvCDB-PgF>89gW<;LW`$U-mWXR@*&1c)A|kNZEm}h(i>ix> ztBSC;v@)ia5}BoSX9roA5N+k9SPk1pb`aCBjnM>CR9uLJ3sUfHxDFq{Cvcmn_ceS6 zKfq7$JJGHbR}k$YSc7XZikomVZo#csk8QXkAYeBhz=POBBuru-_TvB!VhRnS;5i(@ z^F+Zc<}i;__&mNqWW0oziHxt|6?_xlk|dj<-oXOtq(pwO&O^Ofr%iFtoY5kwiSYb? z|H9w@=fs7I5P=YZ{|^FK+MVp~qV*IGy4g$Pxps`|8LGT+zbPq22sI)dCn?f#k~9A> kq<)NCc}zTzQ&N(K%D?_0AUyvo!}FhrSNtRNp*#Qo0&Tv{2><{9 delta 116 zcmZp1XfcprU|?W$DortDU=RQ@Ie-{Mvv5r;6q~50$jH7iU^g=(`(_>iC#K1wf}WG7 z3kgrYDXzD%L7#CkI|qj#Gf*`U2yg=lSCGbyh2NPc^UHXGjA3Ac7zwh4VRJms9A*Hq C@DrZ^ diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f1bf104..c66ed6a 100755 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,8 @@ spring: + servlet: + multipart: + max-file-size: 10Mb + max-request-size: 100Mb datasource: url: jdbc:mysql://127.0.0.1:3306/geological username: root @@ -22,7 +26,6 @@ spring: #设置静态资源路径，多个以逗号分隔 static-locations: classpath:static/,file:static/ - jpa: hibernate: # 实体类有更新时，数据库表更新 @@ -31,3 +34,5 @@ spring: format_sql: true database-platform: org.hibernate.dialect.MySQL5InnoDBDialect + + diff --git a/src/test/java/com/rock/geological/GeologicalApplicationTests.java b/src/test/java/com/rock/geological/GeologicalApplicationTests.java old mode 100644 new mode 100755