From 0ad75f90e6464b95bef06c88227f521c5c03d41d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 06 五月 2023 16:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/huawei/OBSUtil.java | 43 +++++++
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UediterController.java | 12 +
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java | 10 +
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/huawei/SMSUtil.java | 250 +++++++++++++++++++++++++++++++++++++++++
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java | 9 +
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java | 21 ++
6 files changed, 336 insertions(+), 9 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java
index d55fa2b..59e128e 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java
@@ -7,7 +7,9 @@
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.controller.util.UUIDUtil;
import com.stylefeng.guns.modular.system.util.OssUploadUtil;
+import com.stylefeng.guns.modular.system.util.huawei.OBSUtil;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import org.springframework.ui.Model;
@@ -20,6 +22,7 @@
import javax.servlet.http.HttpServletRequest;
import java.io.File;
+import java.io.InputStream;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -131,8 +134,11 @@
try {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
MultipartFile file = (MultipartFile) myfile;
-
- String pictureName = OssUploadUtil.ossUpload(request, file);
+ InputStream inputStream = file.getInputStream();
+ String name = file.getOriginalFilename();
+ name = UUIDUtil.getRandomCode() + name.substring(name.lastIndexOf("."));
+ String pictureName = OBSUtil.putObjectToBucket(inputStream, name);
+// String pictureName = OssUploadUtil.ossUpload(request, file);
m.put("imgUrl", pictureName);
}catch (Exception e){
e.printStackTrace();
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UediterController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UediterController.java
index ea492a3..ea61e95 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UediterController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UediterController.java
@@ -3,7 +3,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.stylefeng.guns.modular.system.controller.util.UUIDUtil;
import com.stylefeng.guns.modular.system.util.OssUploadUtil ;
+import com.stylefeng.guns.modular.system.util.huawei.OBSUtil;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -11,7 +13,9 @@
import org.springframework.web.multipart.MultipartHttpServletRequest;
import com.alibaba.fastjson.JSON;
-
+
+import java.io.InputStream;
+
@Controller
public class UediterController {
/*@RequestMapping("/config")
@@ -103,7 +107,11 @@
String pictureName = "";
try {
//文件上传，具体根据实际替换
- pictureName = OssUploadUtil.ossUpload(request, picture);
+ InputStream inputStream = picture.getInputStream();
+ String name = picture.getOriginalFilename();
+ name = UUIDUtil.getRandomCode() + name.substring(name.lastIndexOf("."));
+ pictureName = OBSUtil.putObjectToBucket(inputStream, name);
+// pictureName = OssUploadUtil.ossUpload(request, picture);
String result = "{'original': '" + picture.getOriginalFilename() + "', 'state': 'SUCCESS', 'url': '" + pictureName + "'}";
if (callback == null) {
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java
index 8c9c6c5..959b34b 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java
@@ -22,6 +22,7 @@
import com.stylefeng.guns.core.util.ObsUploadUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.controller.util.UUIDUtil;
import com.stylefeng.guns.modular.system.dao.UserMapper;
import com.stylefeng.guns.modular.system.factory.UserFactory;
import com.stylefeng.guns.modular.system.model.TCompany;
@@ -31,6 +32,7 @@
import com.stylefeng.guns.modular.system.service.IUserService;
import com.stylefeng.guns.modular.system.transfer.UserDto;
import com.stylefeng.guns.modular.system.util.OssUploadUtil;
+import com.stylefeng.guns.modular.system.util.huawei.OBSUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -42,6 +44,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.io.File;
+import java.io.InputStream;
import java.util.*;
/**
@@ -439,7 +442,11 @@
String pictureName = UUID.randomUUID().toString() + "." + ToolUtil.getFileSuffix(file.getOriginalFilename());
try {
String fileSavePath = gunsProperties.getFileUploadPath()+"apk\\";
- String s = OssUploadUtil.ossUpload(request, file);
+ InputStream inputStream = file.getInputStream();
+ String name1 = file.getOriginalFilename();
+ name1 = UUIDUtil.getRandomCode() + name1.substring(name1.lastIndexOf("."));
+ String s = OBSUtil.putObjectToBucket(inputStream, name1);
+// String s = OssUploadUtil.ossUpload(request, file);
// file.transferTo(new File(fileSavePath + pictureName));
return s;
} catch (Exception e) {
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java
index 467992f..4003131 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java
@@ -6,6 +6,7 @@
import com.stylefeng.guns.core.exception.GunsException;
import com.stylefeng.guns.core.util.ObsUploadUtil;
import com.stylefeng.guns.modular.system.util.OssUploadUtil;
+import com.stylefeng.guns.modular.system.util.huawei.OBSUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +20,7 @@
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
@@ -66,7 +68,11 @@
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
MultipartFile file = (MultipartFile) multipartRequest.getFile("myfile");
if (file.getSize() != 0) {
- ossUpload = OssUploadUtil.ossUpload(request, file);
+ InputStream inputStream = file.getInputStream();
+ String name = file.getOriginalFilename();
+ name = UUIDUtil.getRandomCode() + name.substring(name.lastIndexOf("."));
+ ossUpload = OBSUtil.putObjectToBucket(inputStream, name);
+// ossUpload = OssUploadUtil.ossUpload(request, file);
// ossUpload = ObsUploadUtil.obsUpload(super.getHttpServletRequest(), file);
m.put("imgUrl", ossUpload);
}
@@ -91,7 +97,11 @@
if(size > 524288000L){//500M限制
return "请上传500M以内的文件";
}
- String pictureName = OssUploadUtil.ossUpload(request, file);
+ InputStream inputStream = file.getInputStream();
+ String name1 = file.getOriginalFilename();
+ name1 = UUIDUtil.getRandomCode() + name1.substring(name1.lastIndexOf("."));
+ String pictureName = OBSUtil.putObjectToBucket(inputStream, name1);
+// String pictureName = OssUploadUtil.ossUpload(request, file);
// String pictureName = ObsUploadUtil.obsUpload(super.getHttpServletRequest(), picture);
return pictureName;
} catch (IOException e1) {
@@ -147,8 +157,11 @@
if(!s.equals("jpg") && !s.equals("png") && !s.equals("jpeg")){
return null;
}
-
- pictureName = OssUploadUtil.ossUpload(super.getHttpServletRequest(), picture);
+ InputStream inputStream = picture.getInputStream();
+ String name1 = picture.getOriginalFilename();
+ name1 = UUIDUtil.getRandomCode() + name1.substring(name1.lastIndexOf("."));
+ pictureName = OBSUtil.putObjectToBucket(inputStream, name1);
+// pictureName = OssUploadUtil.ossUpload(super.getHttpServletRequest(), picture);
String result = "{'original': '" + picture.getOriginalFilename() + "', 'state': 'SUCCESS', 'url': '" + pictureName + "'}";
if (callback == null) {
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/huawei/OBSUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/huawei/OBSUtil.java
new file mode 100644
index 0000000..6ff9137
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/huawei/OBSUtil.java
@@ -0,0 +1,43 @@
+package com.stylefeng.guns.modular.system.util.huawei;
+
+import com.obs.services.ObsClient;
+import com.obs.services.model.PutObjectRequest;
+import com.obs.services.model.PutObjectResult;
+
+import java.io.InputStream;
+
+/**
+ * 对象存储上传
+ * @author zhibing.pu
+ * @date 2023/3/15 11:32
+ */
+public class OBSUtil {
+
+ public static String endPoint = "https://obs.cn-south-1.myhuaweicloud.com";
+ public static String ak = "N52IGR6DHOC3JAZFHZIW";
+ public static String sk = "jq7Q7jnFS4Gxamwh3naN2sbNKwQQ7cZISPVumGBS";
+ public static String bucketname = "csxdj";
+
+ /**
+ * 上传文件
+ * @param inputStream
+ * @param objectKey
+ * @return
+ */
+ public static String putObjectToBucket(InputStream inputStream, String objectKey) {
+ try {
+ // 创建ObsClient实例
+ ObsClient obsClient = new ObsClient(ak, sk, endPoint);
+ // 待上传的本地文件路径，需要指定到具体的文件名
+ PutObjectRequest request = new PutObjectRequest();
+ request.setBucketName(bucketname);
+ request.setObjectKey(objectKey);
+ request.setInput(inputStream);
+ PutObjectResult putObjectResult = obsClient.putObject(request);
+ return putObjectResult.getObjectUrl();
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return null;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/huawei/SMSUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/huawei/SMSUtil.java
new file mode 100644
index 0000000..acd57eb
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/huawei/SMSUtil.java
@@ -0,0 +1,250 @@
+package com.stylefeng.guns.modular.system.util.huawei;
+
+import javax.net.ssl.*;
+import java.io.*;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 短信工具类
+ * @author zhibing.pu
+ * @date 2023/3/15 11:23
+ */
+public class SMSUtil {
+ //无需修改,用于格式化鉴权头域,给"X-WSSE"参数赋值
+ private static final String WSSE_HEADER_FORMAT = "UsernameToken Username=\"%s\",PasswordDigest=\"%s\",Nonce=\"%s\",Created=\"%s\"";
+ //无需修改,用于格式化鉴权头域,给"Authorization"参数赋值
+ private static final String AUTH_HEADER_VALUE = "WSSE realm=\"SDP\",profile=\"UsernameToken\",type=\"Appkey\"";
+
+ /**
+ * 发送短信
+ * @param phones //必填,全局号码格式(包含国家码),示例:+8615123456789,多个号码之间用英文逗号分隔
+ * @param templateId //模板ID
+ * @param templateParas //模板变量，此处以单变量验证码短信为例，请客户自行生成6位验证码，并定义为字符串类型，以杜绝首位0丢失的问题（例如：002569变成了2569）。
+ * @throws Exception
+ */
+ public static void send(String phones, String templateId, String templateParas) throws Exception {
+ //必填,请参考"开发准备"获取如下数据,替换为实际值
+ String url = "https://smsapi.cn-south-1.myhuaweicloud.com:443/sms/batchSendSms/v1"; //APP接入地址(在控制台"应用管理"页面获取)+接口访问URI
+ String appKey = "9I0xrhdGXthf1fv9nn8G3glZ6Zng"; //APP_Key
+ String appSecret = "U7WxwX2LVk2YD6KAHxjc9tdnXoM9"; //APP_Secret
+ String sender = "8823031523874"; //国内短信签名通道号或国际/港澳台短信通道号
+// String templateId = "8ff55eac1d0b478ab3c06c3c6a492300"; //模板ID
+
+ //条件必填,国内短信关注,当templateId指定的模板类型为通用模板时生效且必填,必须是已审核通过的,与模板类型一致的签名名称
+ //国际/港澳台短信不用关注该参数
+ String signature = "超省新代驾"; //签名名称
+
+ //必填,全局号码格式(包含国家码),示例:+8615123456789,多个号码之间用英文逗号分隔
+// String receiver = "+86151****6789,+86152****7890"; //短信接收人号码
+
+ //选填,短信状态报告接收地址,推荐使用域名,为空或者不填表示不接收状态报告
+ String statusCallBack = "";
+
+ /**
+ * 选填,使用无变量模板时请赋空值 String templateParas = "";
+ * 单变量模板示例:模板内容为"您的验证码是${1}"时,templateParas可填写为"[\"369751\"]"
+ * 双变量模板示例:模板内容为"您有${1}件快递请到${2}领取"时,templateParas可填写为"[\"3\",\"人民公园正门\"]"
+ * 模板中的每个变量都必须赋值，且取值不能为空
+ * 查看更多模板和变量规范:产品介绍>模板和变量规范
+ */
+// String templateParas = "[\"369751\"]"; //模板变量，此处以单变量验证码短信为例，请客户自行生成6位验证码，并定义为字符串类型，以杜绝首位0丢失的问题（例如：002569变成了2569）。
+
+ //请求Body,不携带签名名称时,signature请填null
+ String body = buildRequestBody(sender, phones, templateId, templateParas, statusCallBack, signature);
+ if (null == body || body.isEmpty()) {
+ System.out.println("body is null.");
+ return;
+ }
+
+ //请求Headers中的X-WSSE参数值
+ String wsseHeader = buildWsseHeader(appKey, appSecret);
+ if (null == wsseHeader || wsseHeader.isEmpty()) {
+ System.out.println("wsse header is null.");
+ return;
+ }
+
+ Writer out = null;
+ BufferedReader in = null;
+ StringBuffer result = new StringBuffer();
+ HttpsURLConnection connection = null;
+ InputStream is = null;
+
+ HostnameVerifier hv = new HostnameVerifier() {
+ @Override
+ public boolean verify(String hostname, SSLSession session) {
+ return true;
+ }
+ };
+ trustAllHttpsCertificates();
+
+ try {
+ URL realUrl = new URL(url);
+ connection = (HttpsURLConnection) realUrl.openConnection();
+
+ connection.setHostnameVerifier(hv);
+ connection.setDoOutput(true);
+ connection.setDoInput(true);
+ connection.setUseCaches(true);
+ //请求方法
+ connection.setRequestMethod("POST");
+ //请求Headers参数
+ connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+ connection.setRequestProperty("Authorization", AUTH_HEADER_VALUE);
+ connection.setRequestProperty("X-WSSE", wsseHeader);
+
+ connection.connect();
+ out = new OutputStreamWriter(connection.getOutputStream());
+ out.write(body); //发送请求Body参数
+ out.flush();
+ out.close();
+
+ int status = connection.getResponseCode();
+ if (200 == status) { //200
+ is = connection.getInputStream();
+ } else { //400/401
+ is = connection.getErrorStream();
+ }
+ in = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+ String line = "";
+ while ((line = in.readLine()) != null) {
+ result.append(line);
+ }
+ System.out.println(result.toString()); //打印响应消息实体
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ if (null != out) {
+ out.close();
+ }
+ if (null != is) {
+ is.close();
+ }
+ if (null != in) {
+ in.close();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ /**
+ * 构造请求Body体
+ * @param sender
+ * @param receiver
+ * @param templateId
+ * @param templateParas
+ * @param statusCallBack
+ * @param signature | 签名名称,使用国内短信通用模板时填写
+ * @return
+ */
+ static String buildRequestBody(String sender, String receiver, String templateId, String templateParas,
+ String statusCallBack, String signature) {
+ if (null == sender || null == receiver || null == templateId || sender.isEmpty() || receiver.isEmpty()
+ || templateId.isEmpty()) {
+ System.out.println("buildRequestBody(): sender, receiver or templateId is null.");
+ return null;
+ }
+ Map<String, String> map = new HashMap<String, String>();
+
+ map.put("from", sender);
+ map.put("to", receiver);
+ map.put("templateId", templateId);
+ if (null != templateParas && !templateParas.isEmpty()) {
+ map.put("templateParas", templateParas);
+ }
+ if (null != statusCallBack && !statusCallBack.isEmpty()) {
+ map.put("statusCallback", statusCallBack);
+ }
+ if (null != signature && !signature.isEmpty()) {
+ map.put("signature", signature);
+ }
+
+ StringBuilder sb = new StringBuilder();
+ String temp = "";
+
+ for (String s : map.keySet()) {
+ try {
+ temp = URLEncoder.encode(map.get(s), "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ sb.append(s).append("=").append(temp).append("&");
+ }
+
+ return sb.deleteCharAt(sb.length()-1).toString();
+ }
+
+ /**
+ * 构造X-WSSE参数值
+ * @param appKey
+ * @param appSecret
+ * @return
+ */
+ static String buildWsseHeader(String appKey, String appSecret) {
+ if (null == appKey || null == appSecret || appKey.isEmpty() || appSecret.isEmpty()) {
+ System.out.println("buildWsseHeader(): appKey or appSecret is null.");
+ return null;
+ }
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+ String time = sdf.format(new Date()); //Created
+ String nonce = UUID.randomUUID().toString().replace("-", ""); //Nonce
+
+ MessageDigest md;
+ byte[] passwordDigest = null;
+
+ try {
+ md = MessageDigest.getInstance("SHA-256");
+ md.update((nonce + time + appSecret).getBytes());
+ passwordDigest = md.digest();
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ }
+
+ //如果JDK版本是1.8,请加载原生Base64类,并使用如下代码
+ String passwordDigestBase64Str = Base64.getEncoder().encodeToString(passwordDigest); //PasswordDigest
+ //如果JDK版本低于1.8,请加载三方库提供Base64类,并使用如下代码
+ //String passwordDigestBase64Str = Base64.encodeBase64String(passwordDigest); //PasswordDigest
+ //若passwordDigestBase64Str中包含换行符,请执行如下代码进行修正
+ //passwordDigestBase64Str = passwordDigestBase64Str.replaceAll("[\\s*\t\n\r]", "");
+ return String.format(WSSE_HEADER_FORMAT, appKey, passwordDigestBase64Str, nonce, time);
+ }
+
+ /*** @throws Exception
+ */
+ static void trustAllHttpsCertificates() throws Exception {
+ TrustManager[] trustAllCerts = new TrustManager[] {
+ new X509TrustManager() {
+ public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+ return;
+ }
+ public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+ return;
+ }
+ public X509Certificate[] getAcceptedIssuers() {
+ return null;
+ }
+ }
+ };
+ SSLContext sc = SSLContext.getInstance("SSL");
+ sc.init(null, trustAllCerts, null);
+ HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
+ }
+
+
+ public static void main(String[] ages){
+ try {
+ SMSUtil.send("15828353127", "1d0f0cbe5b214b0d8efa891730eb532a", "[\"" + 123456 + "\"]");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+}
--
Gitblit v1.7.1