From d485902ae91b906ce542e51936bd460f0a3a5b08 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Tue, 01 Sep 2020 16:46:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java | 37 ++++++++++++++++++
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_form.html | 40 ++++++++++++++++++++
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java | 17 ++++++++
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 6 +-
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/fallback/FileServiceFallbackFactory.java | 5 ++
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/IFileService.java | 4 +
kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js | 4 +-
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/FileService.java | 3 +
8 files changed, 110 insertions(+), 6 deletions(-)
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/FileService.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/FileService.java
index 668e668..19f9c37 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/FileService.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/FileService.java
@@ -55,4 +55,7 @@
@PostMapping(value = "/baseDownLoad",produces = {MediaType.APPLICATION_JSON_UTF8_VALUE},consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
ResultBody baseDownLoad(@RequestBody Map<String,Object> map) throws Exception;
+ @PostMapping(value="byteUplaod")
+ FileInfo byteUplaod(@RequestParam("fileName") String fileName,@RequestBody byte[] bytes);
+
}
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/fallback/FileServiceFallbackFactory.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/fallback/FileServiceFallbackFactory.java
index 0874c21..18f5142 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/fallback/FileServiceFallbackFactory.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/fallback/FileServiceFallbackFactory.java
@@ -46,6 +46,11 @@
public ResultBody baseDownLoad(Map<String, Object> map) throws Exception {
return null;
}
+
+ @Override
+ public FileInfo byteUplaod(String fileName, byte[] bytes) {
+ return null;
+ }
};
}
}
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/IFileService.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/IFileService.java
index ace2cbe..2467925 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/IFileService.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/IFileService.java
@@ -4,9 +4,9 @@
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.filecenter.model.FileInfo;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.multipart.MultipartFile;
+import java.io.InputStream;
import java.util.Map;
/**
@@ -42,4 +42,6 @@
* base64图片下载
*/
ResultBody baseDownLoad(Map<String, Object> map) throws Exception;
+
+ FileInfo byteUplaod(String fileName, InputStream inputStream,int size);
}
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java
index 3029f24..b6c6dbb 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java
@@ -317,5 +317,22 @@
}
+ @Override
+ public FileInfo byteUplaod(String fileName, InputStream inputStream,int size) {
+ String houzhui=fileName.substring(fileName.lastIndexOf(".")+1);
+ String newFileName= RandomValueUtils.uuid()+"."+houzhui;
+ FileInfo newfileInfo=new FileInfo();
+ newfileInfo.setName(newFileName);
+ newfileInfo.setId(IdUtil.fastSimpleUUID());
+ newfileInfo.setSize(size);
+ newfileInfo.setIsImg(false);
+ newfileInfo.setContentType("byte[]");
+ newfileInfo.setSource("aliyun");
+ newfileInfo.setImgType(houzhui);
+ newfileInfo.setCreateTime(new Date());
+ this.fileUpLoadOss(newfileInfo,"pdf/"+newFileName,inputStream);
+ baseMapper.insert(newfileInfo);
+ return newfileInfo;
+ }
}
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java
index 3d67a91..b70149c 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java
@@ -12,6 +12,10 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.Map;
/**
@@ -83,6 +87,39 @@
}
return fileService.baseDownLoad(map);
}
+ /**
+ * byte[]上传
+ */
+ @PostMapping(value="byteUplaod")
+ public FileInfo byteUplaod(@RequestParam("fileName") String fileName,@RequestBody byte[] bytes){
+ if(bytes.length == 0){
+ return null;
+ }
+ if (com.kidgrow.common.utils.StringUtils.isBlank(fileName)) {
+ return null;
+ }
+ InputStream inputStream = new ByteArrayInputStream(bytes);
+ return fileService.byteUplaod(fileName,inputStream,bytes.length);
+ }
+ /**
+ * byte[]上传
+ */
+ @PostMapping(value="byteUplaodTest",produces = {MediaType.APPLICATION_JSON_UTF8_VALUE},consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ public FileInfo byteUplaodTest(@RequestParam("fileName") String fileName,@RequestPart("file") MultipartFile file)throws IOException {
+ InputStream inputStream = file.getInputStream();
+ ByteArrayOutputStream bytestream = new ByteArrayOutputStream();
+ byte[] buffer=new byte[1024];
+ int ch;
+ /**
+ *
+ * */
+ while ((ch = inputStream.read(buffer)) != -1) {
+ bytestream.write(buffer,0,ch);
+ }
+ byte[] data = bytestream.toByteArray();
+ InputStream inputStream1 = new ByteArrayInputStream(data);
+ return fileService.byteUplaod(fileName,inputStream,data.length);
+ }
/**
* 文件删除
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
index c1722f2..8a1dd0e 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -272,7 +272,7 @@
String oldTel = MapUtils.getString(params, "oldTel");
String newTel = AesUtils.desEncrypt(MapUtils.getString(params, "newTel")).trim();
String authCode = AesUtils.desEncrypt(MapUtils.getString(params, "authCode")).trim();
- String userPassword = AesUtils.desEncrypt(MapUtils.getString(params, "userPassword")).trim();
+ String userPassword =MapUtils.getString(params, "userPassword");
if (id > 0 && StringUtils.isNotBlank(oldTel) && StringUtils.isNotBlank(newTel) && StringUtils.isNotBlank(authCode) && StringUtils.isNotBlank(userPassword)) {
//检查验证码
@@ -298,8 +298,8 @@
com.kidgrow.usercenter.model.SysDoctor newsysDoctorModel = new com.kidgrow.usercenter.model.SysDoctor();
if (sysDoctorModel != null) {
//理论上只有一个，如果有多个 只取第一个
- newsysDoctorModel.setId(sysDoctorModel.getId());
- newsysDoctorModel.setDoctorTel(newTel);
+ sysDoctorModel.setId(sysDoctorModel.getId());
+ sysDoctorModel.setDoctorTel(newTel);
sysDoctorMapper.updateById(newsysDoctorModel);
}
if (baseMapper.updateById(user) > 0) {
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
index aa81bd3..c7c9be5 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
@@ -1,8 +1,8 @@
// var my_api_server_url = 'http://zuul.kidgrow.com/';
// var my_api_server_url = 'http://192.168.2.240:8888/';
-// var my_api_server_url = 'http://127.0.0.1:8888/';
+var my_api_server_url = 'http://127.0.0.1:8888/';
// var my_api_server_url = 'http://192.168.2.240:8888/';
-var my_api_server_url = 'http://open.zuul.kidgrow.cloud/';
+// var my_api_server_url = 'http://open.zuul.kidgrow.cloud/';
// var my_api_server_url = 'http://uat.zuul.kidgrow.cloud/';
// var my_api_server_url = 'https://zuul.kidgrow.cloud/';
//var my_api_server_url = 'http://123.57.164.62:8888/';
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_form.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_form.html
index 252f1fe..83b3eba 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_form.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_form.html
@@ -100,5 +100,45 @@
}, "POST");
return false;
});
+ //判断用户名是否被使用
+ var username_is_usered = function (username_id) {
+ var username = $("#" + username_id).val()
+ admin.req('api-user/users/findCountByMap', JSON.stringify({
+ username: username
+ }), function (data) {
+ if (data.code == 0) {
+ if (data.data > 0) {
+ $("#" + username_id).val("")
+ layer.msg("该手机号已经使用", {
+ icon: 2,
+ time: 2000
+ })
+ }
+ } else {
+ layer.msg(data.msg, {
+ icon: 2,
+ time: 2000
+ });
+ }
+ }, 'post');
+ }
+ /*
+ * 验证手机号码
+ */
+ function validatorTel(content) {
+ // 正则验证格式
+ eval("var reg = /^1[34578]\\d{9}$/;");
+ var flag = RegExp(reg).test(content)
+ return flag;
+ }
+ //验证手机号是否被使用
+ $("#mobile").blur(function () {
+ let mobile=$("#mobile").val()
+ if (!validatorTel(mobile)) {
+ layer.msg("请输入正确的手机号");
+ } else {
+ username_is_usered("mobile");
+ }
+ })
});
</script>
\ No newline at end of file
--
Gitblit v1.8.0