java/ZhaoYangChuXing.git

parent: 2a5e8e62 | 补丁 | 提交 | ignore whitespace

xuhy

7 天以前 9bca6d23b4452065624aeb95b5cad2fc37a2d100

修改

4个文件已修改

	ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/core/util/ObsUploadUtil.java	148 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/core/util/OssUploadUtil.java	118 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZuulZYTravel/src/main/java/com/sinata/zuul/ZuulApplication.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZuulZYTravel/src/main/java/com/sinata/zuul/util/echo/NettyServer.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/core/util/ObsUploadUtil.java

@@ -1,76 +1,76 @@
package com.stylefeng.guns.core.util;

import com.obs.services.ObsClient;
import com.obs.services.model.ObjectMetadata;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.io.InputStream;
import java.util.UUID;

public class ObsUploadUtil {
    //OBS图片访问域名
    public static String endPoint = "obs.cn-east-3.myhuaweicloud.com";
    public static String accessKeyId = "HB7DOVELEVWYYUS7QHYX";
    public static String accessKeySecret = "nEwDoSdLRkA1BRfW17pMZL9RlnrVywuTeHSkMn7y";
    public static String bucketName = "mian-ju-mi-liao";
    public static String oss_domain = "https://mian-ju-mi-liao.obs.cn-east-3.myhuaweicloud.com/";


    // 创建ObsClient实例
    public static ObsClient obsClient = new ObsClient(accessKeyId, accessKeySecret, endPoint);

    public static String obsUpload(HttpServletRequest request,  MultipartFile file) throws IOException{
        //CommonsMultipartFile file = (CommonsMultipartFile)multipartFile;
        String fileName = "";
        if(file!=null && !"".equals(file.getOriginalFilename()) && file.getOriginalFilename()!=null){
            InputStream content = file.getInputStream();//获得指定文件的输入流
            ObjectMetadata meta = new ObjectMetadata();// 创建上传Object的Metadata
            meta.setContentLength(file.getSize());  // 必须设置ContentLength
            String originalFilename = file.getOriginalFilename();
            fileName =  UUID.randomUUID().toString().replaceAll("-","") + originalFilename.subSequence(originalFilename.lastIndexOf("."), originalFilename.length());
            obsClient.putObject(bucketName,"admin/"+fileName,content,meta);// 上传Object.
            if(fileName != null && !"".equals(fileName)){
                System.out.println(fileName);
                fileName = oss_domain+"admin/"+fileName;
            }
        }
        return fileName;
    }

    /**
     * 删除某个Object
     *
     * @param bucketUrl
     * @return
     */
    public static boolean deleteObject(String bucketUrl) {
        try {
            bucketUrl=bucketUrl.replace(oss_domain+"web","");
            // 删除Object.
            obsClient.deleteObject(bucketName, bucketUrl);
        } catch (Exception e) {
            e.printStackTrace();
            return false;
        } finally {
            //ossClient.shutdown();
        }
        return true;
    }
	
//     public static void createBucket(String bucketName)
//     {
//         //初始化 OSSClient
////          ossClient = new OssClient(endPoint, accessKeyId, accessKeySecret);
//package com.stylefeng.guns.core.util;
//
//         // 新建一个Bucket
//         Bucket bucket = ossClient.createBucket(bucketName);
//         System.out.println(bucket.getName());
//         System.out.println(bucket.getCreationDate());
//     }
//	 
//     public static void main(String[] args) {
//         OssUploadUtil.createBucket("ssfdfsd");
//import com.obs.services.ObsClient;
//import com.obs.services.model.ObjectMetadata;
//import org.springframework.web.multipart.MultipartFile;
//
//import javax.servlet.http.HttpServletRequest;
//import java.io.IOException;
//import java.io.InputStream;
//import java.util.UUID;
//
//public class ObsUploadUtil {
//    //OBS图片访问域名
//    public static String endPoint = "obs.cn-east-3.myhuaweicloud.com";
//    public static String accessKeyId = "HB7DOVELEVWYYUS7QHYX";
//    public static String accessKeySecret = "nEwDoSdLRkA1BRfW17pMZL9RlnrVywuTeHSkMn7y";
//    public static String bucketName = "mian-ju-mi-liao";
//    public static String oss_domain = "https://mian-ju-mi-liao.obs.cn-east-3.myhuaweicloud.com/";
//
//
//    // 创建ObsClient实例
//    public static ObsClient obsClient = new ObsClient(accessKeyId, accessKeySecret, endPoint);
//
//    public static String obsUpload(HttpServletRequest request,  MultipartFile file) throws IOException{
//        //CommonsMultipartFile file = (CommonsMultipartFile)multipartFile;
//        String fileName = "";
//        if(file!=null && !"".equals(file.getOriginalFilename()) && file.getOriginalFilename()!=null){
//            InputStream content = file.getInputStream();//获得指定文件的输入流
//            ObjectMetadata meta = new ObjectMetadata();// 创建上传Object的Metadata
//            meta.setContentLength(file.getSize());  // 必须设置ContentLength
//            String originalFilename = file.getOriginalFilename();
//            fileName =  UUID.randomUUID().toString().replaceAll("-","") + originalFilename.subSequence(originalFilename.lastIndexOf("."), originalFilename.length());
//            obsClient.putObject(bucketName,"admin/"+fileName,content,meta);// 上传Object.
//            if(fileName != null && !"".equals(fileName)){
//                System.out.println(fileName);
//                fileName = oss_domain+"admin/"+fileName;
//            }
//        }
//        return fileName;
//    }
}
//
//    /**
//     * 删除某个Object
//     *
//     * @param bucketUrl
//     * @return
//     */
//    public static boolean deleteObject(String bucketUrl) {
//        try {
//            bucketUrl=bucketUrl.replace(oss_domain+"web","");
//            // 删除Object.
//            obsClient.deleteObject(bucketName, bucketUrl);
//        } catch (Exception e) {
//            e.printStackTrace();
//            return false;
//        } finally {
//            //ossClient.shutdown();
//        }
//        return true;
//    }
//
////     public static void createBucket(String bucketName)
////     {
////         //初始化 OSSClient
//////          ossClient = new OssClient(endPoint, accessKeyId, accessKeySecret);
////
////         // 新建一个Bucket
////         Bucket bucket = ossClient.createBucket(bucketName);
////         System.out.println(bucket.getName());
////         System.out.println(bucket.getCreationDate());
////     }
////
////     public static void main(String[] args) {
////         OssUploadUtil.createBucket("ssfdfsd");
////    }
//}

 ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/core/util/OssUploadUtil.java

@@ -1,59 +1,59 @@
package com.stylefeng.guns.core.util;

import com.obs.services.ObsClient;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.io.InputStream;
import java.util.UUID;

public class OssUploadUtil {
    public static String endPoint = "obs.cn-south-1.myhuaweicloud.com";
    public static String accessKeyId = "MLJEFPYY0LJKAVA5C4YI";
    public static String accessKeySecret = "C8PmdLHAW7OOKR1fbEGYrqIiTh4yaLrRzA0uVZ89";
    public static String bucketName = "qinqinzhuanche";
    public static String oss_domain = "https://qinqinzhuanche.obs.cn-south-1.myhuaweicloud.com/";
    // 创建ObsClient实例
    public static ObsClient obsClient = new ObsClient(accessKeyId, accessKeySecret, endPoint);

    public static String ossUpload(HttpServletRequest request,MultipartFile file) throws IOException{
        //CommonsMultipartFile file = (CommonsMultipartFile)multipartFile;
        String fileName = "";
        if(file!=null && !"".equals(file.getOriginalFilename()) && file.getOriginalFilename()!=null){
            InputStream content = file.getInputStream();//获得指定文件的输入流
            com.obs.services.model.ObjectMetadata meta = new com.obs.services.model.ObjectMetadata();// 创建上传Object的Metadata
            meta.setContentLength(file.getSize());  // 必须设置ContentLength
            String originalFilename = file.getOriginalFilename();
            fileName =  UUID.randomUUID().toString().replaceAll("-","") + originalFilename.subSequence(originalFilename.lastIndexOf("."), originalFilename.length());
            obsClient.putObject(bucketName,fileName,content,meta);// 上传Object.
            if(fileName != null && !"".equals(fileName)){
                System.out.println(fileName);
                fileName = oss_domain+fileName;
            }
        }
        return fileName;
    }

    /**
     * 删除某个Object
     *
     * @param bucketUrl
     * @return
     */
    public static boolean deleteObject(String bucketUrl) {
        try {
            bucketUrl=bucketUrl.replace(oss_domain+"web","");
            // 删除Object.
            obsClient.deleteObject(bucketName, bucketUrl);
        } catch (Exception e) {
            e.printStackTrace();
            return false;
        } finally {
            //ossClient.shutdown();
        }
        return true;
    }


}
//package com.stylefeng.guns.core.util;
//
//import com.obs.services.ObsClient;
//import org.springframework.web.multipart.MultipartFile;
//
//import javax.servlet.http.HttpServletRequest;
//import java.io.IOException;
//import java.io.InputStream;
//import java.util.UUID;
//
//public class OssUploadUtil {
//    public static String endPoint = "obs.cn-south-1.myhuaweicloud.com";
//    public static String accessKeyId = "MLJEFPYY0LJKAVA5C4YI";
//    public static String accessKeySecret = "C8PmdLHAW7OOKR1fbEGYrqIiTh4yaLrRzA0uVZ89";
//    public static String bucketName = "qinqinzhuanche";
//    public static String oss_domain = "https://qinqinzhuanche.obs.cn-south-1.myhuaweicloud.com/";
//    // 创建ObsClient实例
//    public static ObsClient obsClient = new ObsClient(accessKeyId, accessKeySecret, endPoint);
//
//    public static String ossUpload(HttpServletRequest request,MultipartFile file) throws IOException{
//        //CommonsMultipartFile file = (CommonsMultipartFile)multipartFile;
//        String fileName = "";
//        if(file!=null && !"".equals(file.getOriginalFilename()) && file.getOriginalFilename()!=null){
//            InputStream content = file.getInputStream();//获得指定文件的输入流
//            com.obs.services.model.ObjectMetadata meta = new com.obs.services.model.ObjectMetadata();// 创建上传Object的Metadata
//            meta.setContentLength(file.getSize());  // 必须设置ContentLength
//            String originalFilename = file.getOriginalFilename();
//            fileName =  UUID.randomUUID().toString().replaceAll("-","") + originalFilename.subSequence(originalFilename.lastIndexOf("."), originalFilename.length());
//            obsClient.putObject(bucketName,fileName,content,meta);// 上传Object.
//            if(fileName != null && !"".equals(fileName)){
//                System.out.println(fileName);
//                fileName = oss_domain+fileName;
//            }
//        }
//        return fileName;
//    }
//
//    /**
//     * 删除某个Object
//     *
//     * @param bucketUrl
//     * @return
//     */
//    public static boolean deleteObject(String bucketUrl) {
//        try {
//            bucketUrl=bucketUrl.replace(oss_domain+"web","");
//            // 删除Object.
//            obsClient.deleteObject(bucketName, bucketUrl);
//        } catch (Exception e) {
//            e.printStackTrace();
//            return false;
//        } finally {
//            //ossClient.shutdown();
//        }
//        return true;
//    }
//
//
//}

 ZuulZYTravel/src/main/java/com/sinata/zuul/ZuulApplication.java

@@ -39,10 +39,10 @@

    public static void main(String[] args) {
        SpringApplication.run(ZuulApplication.class, args);
        NettyServer nettyServer = new NettyServer();
        nettyServer.bind();
        NettyServer0 nettyServer0 = new NettyServer0();
        nettyServer0.bind();
//        NettyServer nettyServer = new NettyServer();
//        nettyServer.bind();
//        NettyServer0 nettyServer0 = new NettyServer0();
//        nettyServer0.bind();
    }



 ZuulZYTravel/src/main/java/com/sinata/zuul/util/echo/NettyServer.java

@@ -50,7 +50,7 @@
        /**
         * 获取即时通讯启动端口 
         */
        private Integer nettyPort = 8889;
        private Integer nettyPort = 8888;
        @Override
        public void run() {
            EventLoopGroup bossGroup = new NioEventLoopGroup();

			@@ -1,76 +1,76 @@
			package com.stylefeng.guns.core.util;

			import com.obs.services.ObsClient;
			import com.obs.services.model.ObjectMetadata;
			import org.springframework.web.multipart.MultipartFile;

			import javax.servlet.http.HttpServletRequest;
			import java.io.IOException;
			import java.io.InputStream;
			import java.util.UUID;

			public class ObsUploadUtil {
			//OBS图片访问域名
			public static String endPoint = "obs.cn-east-3.myhuaweicloud.com";
			public static String accessKeyId = "HB7DOVELEVWYYUS7QHYX";
			public static String accessKeySecret = "nEwDoSdLRkA1BRfW17pMZL9RlnrVywuTeHSkMn7y";
			public static String bucketName = "mian-ju-mi-liao";
			public static String oss_domain = "https://mian-ju-mi-liao.obs.cn-east-3.myhuaweicloud.com/";


			// 创建ObsClient实例
			public static ObsClient obsClient = new ObsClient(accessKeyId, accessKeySecret, endPoint);

			public static String obsUpload(HttpServletRequest request, MultipartFile file) throws IOException{
			//CommonsMultipartFile file = (CommonsMultipartFile)multipartFile;
			String fileName = "";
			if(file!=null && !"".equals(file.getOriginalFilename()) && file.getOriginalFilename()!=null){
			InputStream content = file.getInputStream();//获得指定文件的输入流
			ObjectMetadata meta = new ObjectMetadata();// 创建上传Object的Metadata
			meta.setContentLength(file.getSize()); // 必须设置ContentLength
			String originalFilename = file.getOriginalFilename();
			fileName = UUID.randomUUID().toString().replaceAll("-","") + originalFilename.subSequence(originalFilename.lastIndexOf("."), originalFilename.length());
			obsClient.putObject(bucketName,"admin/"+fileName,content,meta);// 上传Object.
			if(fileName != null && !"".equals(fileName)){
			System.out.println(fileName);
			fileName = oss_domain+"admin/"+fileName;
			}
			}
			return fileName;
			}

			/**
			* 删除某个Object
			*
			* @param bucketUrl
			* @return
			*/
			public static boolean deleteObject(String bucketUrl) {
			try {
			bucketUrl=bucketUrl.replace(oss_domain+"web","");
			// 删除Object.
			obsClient.deleteObject(bucketName, bucketUrl);
			} catch (Exception e) {
			e.printStackTrace();
			return false;
			} finally {
			//ossClient.shutdown();
			}
			return true;
			}

			// public static void createBucket(String bucketName)
			// {
			// //初始化 OSSClient
			//// ossClient = new OssClient(endPoint, accessKeyId, accessKeySecret);
			//package com.stylefeng.guns.core.util;
			//
			// // 新建一个Bucket
			// Bucket bucket = ossClient.createBucket(bucketName);
			// System.out.println(bucket.getName());
			// System.out.println(bucket.getCreationDate());
			// }
			//
			// public static void main(String[] args) {
			// OssUploadUtil.createBucket("ssfdfsd");
			//import com.obs.services.ObsClient;
			//import com.obs.services.model.ObjectMetadata;
			//import org.springframework.web.multipart.MultipartFile;
			//
			//import javax.servlet.http.HttpServletRequest;
			//import java.io.IOException;
			//import java.io.InputStream;
			//import java.util.UUID;
			//
			//public class ObsUploadUtil {
			// //OBS图片访问域名
			// public static String endPoint = "obs.cn-east-3.myhuaweicloud.com";
			// public static String accessKeyId = "HB7DOVELEVWYYUS7QHYX";
			// public static String accessKeySecret = "nEwDoSdLRkA1BRfW17pMZL9RlnrVywuTeHSkMn7y";
			// public static String bucketName = "mian-ju-mi-liao";
			// public static String oss_domain = "https://mian-ju-mi-liao.obs.cn-east-3.myhuaweicloud.com/";
			//
			//
			// // 创建ObsClient实例
			// public static ObsClient obsClient = new ObsClient(accessKeyId, accessKeySecret, endPoint);
			//
			// public static String obsUpload(HttpServletRequest request, MultipartFile file) throws IOException{
			// //CommonsMultipartFile file = (CommonsMultipartFile)multipartFile;
			// String fileName = "";
			// if(file!=null && !"".equals(file.getOriginalFilename()) && file.getOriginalFilename()!=null){
			// InputStream content = file.getInputStream();//获得指定文件的输入流
			// ObjectMetadata meta = new ObjectMetadata();// 创建上传Object的Metadata
			// meta.setContentLength(file.getSize()); // 必须设置ContentLength
			// String originalFilename = file.getOriginalFilename();
			// fileName = UUID.randomUUID().toString().replaceAll("-","") + originalFilename.subSequence(originalFilename.lastIndexOf("."), originalFilename.length());
			// obsClient.putObject(bucketName,"admin/"+fileName,content,meta);// 上传Object.
			// if(fileName != null && !"".equals(fileName)){
			// System.out.println(fileName);
			// fileName = oss_domain+"admin/"+fileName;
			// }
			// }
			// return fileName;
			// }
			}
			//
			// /**
			// * 删除某个Object
			// *
			// * @param bucketUrl
			// * @return
			// */
			// public static boolean deleteObject(String bucketUrl) {
			// try {
			// bucketUrl=bucketUrl.replace(oss_domain+"web","");
			// // 删除Object.
			// obsClient.deleteObject(bucketName, bucketUrl);
			// } catch (Exception e) {
			// e.printStackTrace();
			// return false;
			// } finally {
			// //ossClient.shutdown();
			// }
			// return true;
			// }
			//
			//// public static void createBucket(String bucketName)
			//// {
			//// //初始化 OSSClient
			////// ossClient = new OssClient(endPoint, accessKeyId, accessKeySecret);
			////
			//// // 新建一个Bucket
			//// Bucket bucket = ossClient.createBucket(bucketName);
			//// System.out.println(bucket.getName());
			//// System.out.println(bucket.getCreationDate());
			//// }
			////
			//// public static void main(String[] args) {
			//// OssUploadUtil.createBucket("ssfdfsd");
			//// }
			//}

			@@ -1,59 +1,59 @@
			package com.stylefeng.guns.core.util;

			import com.obs.services.ObsClient;
			import org.springframework.web.multipart.MultipartFile;

			import javax.servlet.http.HttpServletRequest;
			import java.io.IOException;
			import java.io.InputStream;
			import java.util.UUID;

			public class OssUploadUtil {
			public static String endPoint = "obs.cn-south-1.myhuaweicloud.com";
			public static String accessKeyId = "MLJEFPYY0LJKAVA5C4YI";
			public static String accessKeySecret = "C8PmdLHAW7OOKR1fbEGYrqIiTh4yaLrRzA0uVZ89";
			public static String bucketName = "qinqinzhuanche";
			public static String oss_domain = "https://qinqinzhuanche.obs.cn-south-1.myhuaweicloud.com/";
			// 创建ObsClient实例
			public static ObsClient obsClient = new ObsClient(accessKeyId, accessKeySecret, endPoint);

			public static String ossUpload(HttpServletRequest request,MultipartFile file) throws IOException{
			//CommonsMultipartFile file = (CommonsMultipartFile)multipartFile;
			String fileName = "";
			if(file!=null && !"".equals(file.getOriginalFilename()) && file.getOriginalFilename()!=null){
			InputStream content = file.getInputStream();//获得指定文件的输入流
			com.obs.services.model.ObjectMetadata meta = new com.obs.services.model.ObjectMetadata();// 创建上传Object的Metadata
			meta.setContentLength(file.getSize()); // 必须设置ContentLength
			String originalFilename = file.getOriginalFilename();
			fileName = UUID.randomUUID().toString().replaceAll("-","") + originalFilename.subSequence(originalFilename.lastIndexOf("."), originalFilename.length());
			obsClient.putObject(bucketName,fileName,content,meta);// 上传Object.
			if(fileName != null && !"".equals(fileName)){
			System.out.println(fileName);
			fileName = oss_domain+fileName;
			}
			}
			return fileName;
			}

			/**
			* 删除某个Object
			*
			* @param bucketUrl
			* @return
			*/
			public static boolean deleteObject(String bucketUrl) {
			try {
			bucketUrl=bucketUrl.replace(oss_domain+"web","");
			// 删除Object.
			obsClient.deleteObject(bucketName, bucketUrl);
			} catch (Exception e) {
			e.printStackTrace();
			return false;
			} finally {
			//ossClient.shutdown();
			}
			return true;
			}


			}
			//package com.stylefeng.guns.core.util;
			//
			//import com.obs.services.ObsClient;
			//import org.springframework.web.multipart.MultipartFile;
			//
			//import javax.servlet.http.HttpServletRequest;
			//import java.io.IOException;
			//import java.io.InputStream;
			//import java.util.UUID;
			//
			//public class OssUploadUtil {
			// public static String endPoint = "obs.cn-south-1.myhuaweicloud.com";
			// public static String accessKeyId = "MLJEFPYY0LJKAVA5C4YI";
			// public static String accessKeySecret = "C8PmdLHAW7OOKR1fbEGYrqIiTh4yaLrRzA0uVZ89";
			// public static String bucketName = "qinqinzhuanche";
			// public static String oss_domain = "https://qinqinzhuanche.obs.cn-south-1.myhuaweicloud.com/";
			// // 创建ObsClient实例
			// public static ObsClient obsClient = new ObsClient(accessKeyId, accessKeySecret, endPoint);
			//
			// public static String ossUpload(HttpServletRequest request,MultipartFile file) throws IOException{
			// //CommonsMultipartFile file = (CommonsMultipartFile)multipartFile;
			// String fileName = "";
			// if(file!=null && !"".equals(file.getOriginalFilename()) && file.getOriginalFilename()!=null){
			// InputStream content = file.getInputStream();//获得指定文件的输入流
			// com.obs.services.model.ObjectMetadata meta = new com.obs.services.model.ObjectMetadata();// 创建上传Object的Metadata
			// meta.setContentLength(file.getSize()); // 必须设置ContentLength
			// String originalFilename = file.getOriginalFilename();
			// fileName = UUID.randomUUID().toString().replaceAll("-","") + originalFilename.subSequence(originalFilename.lastIndexOf("."), originalFilename.length());
			// obsClient.putObject(bucketName,fileName,content,meta);// 上传Object.
			// if(fileName != null && !"".equals(fileName)){
			// System.out.println(fileName);
			// fileName = oss_domain+fileName;
			// }
			// }
			// return fileName;
			// }
			//
			// /**
			// * 删除某个Object
			// *
			// * @param bucketUrl
			// * @return
			// */
			// public static boolean deleteObject(String bucketUrl) {
			// try {
			// bucketUrl=bucketUrl.replace(oss_domain+"web","");
			// // 删除Object.
			// obsClient.deleteObject(bucketName, bucketUrl);
			// } catch (Exception e) {
			// e.printStackTrace();
			// return false;
			// } finally {
			// //ossClient.shutdown();
			// }
			// return true;
			// }
			//
			//
			//}

			@@ -39,10 +39,10 @@

			public static void main(String[] args) {
			SpringApplication.run(ZuulApplication.class, args);
			NettyServer nettyServer = new NettyServer();
			nettyServer.bind();
			NettyServer0 nettyServer0 = new NettyServer0();
			nettyServer0.bind();
			// NettyServer nettyServer = new NettyServer();
			// nettyServer.bind();
			// NettyServer0 nettyServer0 = new NettyServer0();
			// nettyServer0.bind();
			}

			@@ -50,7 +50,7 @@
			/**
			* 获取即时通讯启动端口
			*/
			private Integer nettyPort = 8889;
			private Integer nettyPort = 8888;
			@Override
			public void run() {
			EventLoopGroup bossGroup = new NioEventLoopGroup();