修改

hzgzpt-admin/src/main/java/com/miaxis/app/controller/news/NewsInfoController.java

@@ -19,8 +19,8 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.enums.BusinessTypeEnum;
-import com.miaxis.system.domain.NewsInfo;
-import com.miaxis.system.service.INewsInfoService;
+import com.miaxis.app.user.domain.NewsInfo;
+import com.miaxis.app.user.service.INewsInfoService;
 import com.miaxis.common.utils.poi.ExcelUtil;
 import com.miaxis.common.core.page.ResponsePageInfo;
 

hzgzpt-admin/src/main/java/com/miaxis/app/controller/school/SchoolRegionController.java

@@ -17,8 +17,8 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.enums.BusinessTypeEnum;
-import com.miaxis.system.domain.SchoolRegion;
-import com.miaxis.system.service.ISchoolRegionService;
+import com.miaxis.app.user.domain.SchoolRegion;
+import com.miaxis.app.user.service.ISchoolRegionService;
 import com.miaxis.common.utils.poi.ExcelUtil;
 import com.miaxis.common.core.page.ResponsePageInfo;
 

hzgzpt-admin/src/main/java/com/miaxis/system/controller/common/SmsController.java → hzgzpt-admin/src/main/java/com/miaxis/app/controller/sms/SmsController.java

@@ -1,10 +1,10 @@
-package com.miaxis.system.controller.common;
+package com.miaxis.app.controller.sms;
 
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.SysUser;
 import com.miaxis.common.utils.SecurityUtils;
-import com.miaxis.system.service.ISmsService;
+import com.miaxis.app.user.service.ISmsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

hzgzpt-common/pom.xml

@@ -173,6 +173,12 @@
             <version>1.9.4</version>
         </dependency>
 
+        <!--aliyun OSS-->
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

hzgzpt-common/src/main/java/com/miaxis/common/aliyun/AliyunConfig.java

@@ -0,0 +1,24 @@
+package com.miaxis.common.aliyun;
+
+public class AliyunConfig {
+	public static String endpoint = "oss-cn-shanghai.aliyuncs.com";
+	public static String accessKeyId = "LTAIijc2Vl913Dha";
+	public static String accessKeySecret = "HbQBG0RQqdfKoYGJmoqdT1FFYO8OTs";
+	public static String bucketName = "xzzfile";
+	public static String visitPath = "http://image.jppt.com.cn";
+
+	public static String gzpt_path = "gzpt/";
+	/** 教练员图片文件*/
+	public static String gzpt_coach_rootpath = gzpt_path + "coach/";
+	/** 学员图片文件 */
+	public static String gzpt_student_rootpath = gzpt_path + "student/";
+	/** 学员图片文件 */
+	public static String gzpt_trainCar_rootpath = gzpt_path + "trainCar/";
+	/** 人脸识别图像文件 */
+	public static String gzpt_faces_rootpath = gzpt_path + "faces/";
+
+	public static String tms_news_rootpath = gzpt_path + "news/";
+
+	
+}
+ 

hzgzpt-common/src/main/java/com/miaxis/common/aliyun/AliyunDown.java

@@ -0,0 +1,69 @@
+package com.miaxis.common.aliyun;
+
+import com.aliyun.oss.OSSClient;
+import com.aliyun.oss.model.DownloadFileRequest;
+import com.aliyun.oss.model.DownloadFileResult;
+import com.aliyun.oss.model.GetObjectRequest;
+
+import java.io.File;
+
+public class AliyunDown {
+
+	/**
+	 * 通过URL地址，从阿里云下载文件到指定目录，
+	 * @param  url 阿里的访问地址，必须是我们自己上传的文件才能有效
+	 * @param  savePath 保存在本地的地址
+	 * */
+	public static boolean  downAliyunFromUrlTolLocalFile(String url,String savePath){
+		OSSClient ossClient = new OSSClient(AliyunConfig.endpoint, AliyunConfig.accessKeyId,AliyunConfig.accessKeySecret);
+
+		try {
+			String key = url.replaceAll(AliyunConfig.visitPath, "");
+			key = key.replace("/tms", "tms");
+
+			ossClient.getObject(new GetObjectRequest(AliyunConfig.bucketName, key), new File(savePath));
+			return true;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}finally{
+			ossClient.shutdown();
+		}
+	}
+	
+	/**
+	 * 通过URL地址，从阿里云下载文件到指定目录，
+	 * @param  url 阿里的访问地址，必须是我们自己上传的文件才能有效
+	 * @param  savePath 保存在本地的地址
+	 * */
+	public static boolean  downBigFileAliyunFromUrlTolLocalFile(String url,String savePath){
+		OSSClient ossClient = new OSSClient(AliyunConfig.endpoint, AliyunConfig.accessKeyId,AliyunConfig.accessKeySecret);
+		try {
+			String key = url.replaceAll(AliyunConfig.visitPath, "");
+			System.out.println(key);
+			//ossClient.getObject(new GetObjectRequest(AliyunConfig.bucketName, key), new File(savePath));
+			// 下载请求，10个任务并发下载，启动断点续传
+			DownloadFileRequest downloadFileRequest = new DownloadFileRequest(AliyunConfig.bucketName, key);
+			downloadFileRequest.setDownloadFile(savePath);
+			downloadFileRequest.setTaskNum(10);
+			downloadFileRequest.setEnableCheckpoint(true);
+			// 下载文件
+			DownloadFileResult downloadRes = ossClient.downloadFile(downloadFileRequest);
+			// 下载成功时，会返回文件的元信息
+			downloadRes.getObjectMetadata();
+			return true;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		} catch (Throwable e) {
+			e.printStackTrace();
+			return false;
+		}finally{
+			ossClient.shutdown();
+		}
+	}
+	public static void main(String[] args) {
+		String url = "http://image.lnjppt.com/tms/sld/2101000000001-1.pdf";
+		downAliyunFromUrlTolLocalFile(url.replace("http://image.lnjppt.com/", ""), "E://temp.pdf");
+	}
+}

hzgzpt-common/src/main/java/com/miaxis/common/aliyun/AliyunUpload.java

@@ -0,0 +1,223 @@
+package com.miaxis.common.aliyun;
+
+import com.aliyun.oss.OSSClient;
+import com.miaxis.common.utils.Base64;
+import sun.misc.BASE64Decoder;
+
+import java.io.*;
+import java.net.URL;
+import java.net.URLEncoder;
+
+public class AliyunUpload {
+
+	@SuppressWarnings("restriction")
+	public static byte[] getByteFormString(String content){
+		BASE64Decoder decoder = new BASE64Decoder();
+		byte[] sourceBytes  = null;
+		try {
+			sourceBytes = decoder.decodeBuffer(content);
+			for (int i = 0; i < sourceBytes.length; ++i) {
+				if (sourceBytes[i] < 0) {// 调整异常数据
+					sourceBytes[i] += 256;
+				}
+			}
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
+		
+		return sourceBytes;
+	}
+	/**
+	 * 上传byte数组
+	 * @param  content 比如"Hello OSS".getBytes();
+	 * @param  savePath 保存的路径
+	 * @param  fileName 上传文件的名称包含后坠
+	 * @return 如果上传成功返回访问地址，如果失败返回"";
+	 * */
+	@SuppressWarnings("deprecation")
+	public static String uploadForByte(byte[] content,String savePath,String fileName){
+		OSSClient ossClient = new OSSClient(AliyunConfig.endpoint, AliyunConfig.accessKeyId,AliyunConfig.accessKeySecret);
+		String url = "";
+		try {
+			String key = savePath+fileName;
+			ossClient.putObject(AliyunConfig.bucketName, key, new ByteArrayInputStream(content));
+			url = AliyunConfig.visitPath+"/"+savePath+URLEncoder.encode(fileName);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}finally{
+			ossClient.shutdown();
+		}
+		return url;
+	}
+	/**
+	 * 上传本地文件
+	 * @param  file 如new File("d://1.jpg")
+	 * @param  savePath 保存的路径 如 D://1.jpg
+	 * @param  fileName 上传文件的名称 1.jpg
+	 * @return 如果上传成功返回访问地址，如果失败返回"";
+	 * */
+	@SuppressWarnings("deprecation")
+	public static String uploadForLocalFile(File file, String savePath,String fileName){
+		OSSClient ossClient = new OSSClient(AliyunConfig.endpoint, AliyunConfig.accessKeyId,AliyunConfig.accessKeySecret);
+		String url = "";
+		try {
+			String key = savePath+fileName;
+			ossClient.putObject(AliyunConfig.bucketName, key, file);
+			url = AliyunConfig.visitPath+"/"+savePath+URLEncoder.encode(fileName);
+		} catch (Exception e) {
+			//e.printStackTrace();
+			return null;
+		}finally{
+			ossClient.shutdown();
+		}
+		return url;
+	}
+	/**
+	 * 上传文件流
+	 * @param   is 比如InputStream inputStream = new FileInputStream("localFile");
+	 * @param  savePath 保存的路径 如 D://1.jpg
+	 * @param  fileName 上传文件的名称 1.jpg
+	 * @return 如果上传成功返回访问地址，如果失败返回"";
+	 * */
+	@SuppressWarnings("deprecation")
+	public static String uploadForStream(InputStream  is, String savePath,String fileName){
+		OSSClient ossClient = new OSSClient(AliyunConfig.endpoint, AliyunConfig.accessKeyId,AliyunConfig.accessKeySecret);
+		String url = "";
+		try {
+			String key = savePath+fileName;
+			ossClient.putObject(AliyunConfig.bucketName, key, is);
+			url = AliyunConfig.visitPath+"/"+savePath+URLEncoder.encode(fileName);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}finally{
+			ossClient.shutdown();
+		}
+		return url;
+	}
+	/**
+	 * 上传网络流
+	 * @param  url 图片路径
+	 * @param  savePath 保存的路径 如 D://1.jpg
+	 * @param  fileName 上传文件的名称 1.jpg
+	 * @return 如果上传成功返回访问地址，如果失败返回"";
+	 * */
+	@SuppressWarnings("deprecation")
+	public static String uploadForUrl(String url, String savePath,String fileName){
+		OSSClient ossClient = new OSSClient(AliyunConfig.endpoint, AliyunConfig.accessKeyId,AliyunConfig.accessKeySecret);
+		String path = "";
+		try {
+			String key = savePath+fileName;
+			InputStream inputStream = new URL(url).openStream();
+			ossClient.putObject(AliyunConfig.bucketName, key, inputStream);
+			path = AliyunConfig.visitPath+"/"+savePath+URLEncoder.encode(fileName);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}finally{
+			ossClient.shutdown();
+		}
+		return path;
+	}
+	/**
+	 * 上传字符串
+	 * @param  content 上传的内容
+	 * @param  savePath 保存的路径 如 D://1.jpg
+	 * @param  fileName 上传文件的名称 1.jpg
+	 * @return 如果上传成功返回访问地址，如果失败返回"";
+	 * */
+	@SuppressWarnings("deprecation")
+	public static String uploadForString(String content, String savePath,String fileName){
+		OSSClient ossClient = new OSSClient(AliyunConfig.endpoint, AliyunConfig.accessKeyId,AliyunConfig.accessKeySecret);
+		String path = "";
+		try {
+			String key = savePath+fileName;
+			ossClient.putObject(AliyunConfig.bucketName, key, new ByteArrayInputStream(content.getBytes()));
+			path = AliyunConfig.visitPath+"/"+savePath+URLEncoder.encode(fileName);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}finally{
+			ossClient.shutdown();
+		}
+		return path;
+	}
+	public static void main1(String[] args) {
+		//OSSClient ossClient = new OSSClient("http://oss-cn-beijing.aliyuncs.com", "LTAIf6iXk0nNVS6R","V8XHqsYUBlcebbN1o3FqsntYepIifB");
+		String keyId= "LTAIijc2Vl913Dha";
+		String accessKey="HbQBG0RQqdfKoYGJmoqdT1FFYO8OTs";
+		OSSClient ossClient = new OSSClient("http://oss-cn-beijing.aliyuncs.com", keyId,accessKey);
+		String path = "";
+		try {
+			
+			String url = "http://218.60.2.212:8080/lnvideo/upload/weier/180228/20180228175702.mp4";
+			try {
+				 URL temp = new URL(url);  
+	             InputStream in = temp.openStream();  
+	             System.out.println("连接可用");  
+			} catch (Exception e) {
+				 System.out.println("连接不可用");  
+			}
+			
+			String key =  "video/"+url.replace("http://218.60.2.212:8080/lnvideo/", "");
+			//String fileName = url.substring(url.lastIndexOf("/"),url.length());
+			System.out.println(key);
+			//System.out.println(fileName);
+			InputStream inputStream = new URL(url).openStream();
+			ossClient.putObject("lnfile", key, inputStream);
+			path = AliyunConfig.visitPath+key;
+			System.out.println(path);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}finally{
+			ossClient.shutdown();
+		}
+	}
+
+
+	public static String GetImageStr(String imgFile)  
+    {//将图片文件转化为字节数组字符串，并对其进行Base64编码处理  
+        //String imgFile = "F:\\36.jpg";//待处理的图片  
+        InputStream in = null;  
+        byte[] data = null;  
+        //读取图片字节数组  
+        try   
+        {  
+            in = new FileInputStream(imgFile);          
+            data = new byte[in.available()];  
+            in.read(data);  
+            in.close();  
+        }   
+        catch (IOException e)   
+        {  
+            e.printStackTrace();  
+        }  
+        //对字节数组Base64编码  
+        return Base64.encode(data);//返回Base64编码过的字节数组字符串
+    }  
+	
+	/**
+	 * 上传文件流
+	 * @param   is 比如InputStream inputStream = new FileInputStream("localFile");
+	 * @param  savePath 保存的路径 如 D://1.jpg
+	 * @param  fileName 上传文件的名称 1.jpg
+	 * @return 如果上传成功返回访问地址，如果失败返回"";
+	 * */
+	@SuppressWarnings("deprecation")
+	public static String uploadForGzptStream(InputStream  is, String savePath,String fileName){
+		OSSClient ossClient = new OSSClient(AliyunConfig.endpoint, AliyunConfig.accessKeyId,AliyunConfig.accessKeySecret);
+		String url = "";
+		try {
+			String key = savePath+fileName;
+			ossClient.putObject(AliyunConfig.bucketName, key, is);
+			url = savePath+URLEncoder.encode(fileName);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}finally{
+			ossClient.shutdown();
+		}
+		return url;
+	}
+}

hzgzpt-common/src/main/java/com/miaxis/common/constant/SmsTemplateConstants.java

@@ -0,0 +1,23 @@
+package com.miaxis.common.constant;
+
+/**
+ * 短信模板常量
+ *
+ * @Author wwl
+ * @Date 2020/12/23
+ * @Version 1.0
+ */
+public class SmsTemplateConstants {
+
+    /**
+     * 登录短信模板
+     */
+    public static final String login = "登录验证码：code,验证码两分钟内有效";
+
+    /**
+     * 修改手机号短信模板
+     */
+    public static final String modify = "本次验证码：code,验证码两分钟内有效";
+
+
+}

hzgzpt-common/src/main/java/com/miaxis/common/utils/Base64.java

@@ -0,0 +1,124 @@
+package com.miaxis.common.utils;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * Base64编码工具类
+ * 
+ * @date 2012-10-11
+ */
+public class Base64 {
+	private static final char[] legalChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".toCharArray();
+
+	public static String encode(byte[] data) {
+		int start = 0;
+		int len = data.length;
+		StringBuffer buf = new StringBuffer(data.length * 3 / 2);
+
+		int end = len - 3;
+		int i = start;
+		int n = 0;
+
+		while (i <= end) {
+			int d = ((data[i] & 0x0ff) << 16) | ((data[i + 1] & 0x0ff) << 8) | (data[i + 2] & 0x0ff);
+
+			buf.append(legalChars[(d >> 18) & 63]);
+			buf.append(legalChars[(d >> 12) & 63]);
+			buf.append(legalChars[(d >> 6) & 63]);
+			buf.append(legalChars[d & 63]);
+
+			i += 3;
+
+			if (n++ >= 14) {
+				n = 0;
+				buf.append(" ");
+			}
+		}
+
+		if (i == start + len - 2) {
+			int d = ((data[i] & 0x0ff) << 16) | ((data[i + 1] & 255) << 8);
+
+			buf.append(legalChars[(d >> 18) & 63]);
+			buf.append(legalChars[(d >> 12) & 63]);
+			buf.append(legalChars[(d >> 6) & 63]);
+			buf.append("=");
+		} else if (i == start + len - 1) {
+			int d = (data[i] & 0x0ff) << 16;
+
+			buf.append(legalChars[(d >> 18) & 63]);
+			buf.append(legalChars[(d >> 12) & 63]);
+			buf.append("==");
+		}
+
+		return buf.toString();
+	}
+
+	private static int decode(char c) {
+		if (c >= 'A' && c <= 'Z')
+			return c - 65;
+		else if (c >= 'a' && c <= 'z')
+			return c - 97 + 26;
+		else if (c >= '0' && c <= '9')
+			return c - 48 + 26 + 26;
+		else
+			switch (c) {
+			case '+':
+				return 62;
+			case '/':
+				return 63;
+			case '=':
+				return 0;
+			default:
+				throw new RuntimeException("unexpected code: " + c);
+			}
+	}
+
+	/**
+	 * Decodes the given Base64 encoded String to a new byte array. The byte array holding the decoded data is returned.
+	 */
+
+	public static byte[] decode(String s) {
+
+		ByteArrayOutputStream bos = new ByteArrayOutputStream();
+		try {
+			decode(s, bos);
+		} catch (IOException e) {
+			throw new RuntimeException();
+		}
+		byte[] decodedBytes = bos.toByteArray();
+		try {
+			bos.close();
+			bos = null;
+		} catch (IOException ex) {
+			System.err.println("Error while decoding BASE64: " + ex.toString());
+		}
+		return decodedBytes;
+	}
+
+	private static void decode(String s, OutputStream os) throws IOException {
+		int i = 0;
+
+		int len = s.length();
+
+		while (true) {
+			while (i < len && s.charAt(i) <= ' ')
+				i++;
+
+			if (i == len)
+				break;
+
+			int tri = (decode(s.charAt(i)) << 18) + (decode(s.charAt(i + 1)) << 12) + (decode(s.charAt(i + 2)) << 6) + (decode(s.charAt(i + 3)));
+
+			os.write((tri >> 16) & 255);
+			if (s.charAt(i + 2) == '=')
+				break;
+			os.write((tri >> 8) & 255);
+			if (s.charAt(i + 3) == '=')
+				break;
+			os.write(tri & 255);
+
+			i += 4;
+		}
+	}
+}

hzgzpt-system/src/main/java/com/miaxis/system/domain/NewsInfo.java → hzgzpt-service-app/src/main/java/com/miaxis/app/user/domain/NewsInfo.java

@@ -1,4 +1,4 @@
-package com.miaxis.system.domain;
+package com.miaxis.app.user.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.miaxis.common.core.domain.BaseBusinessEntity;

hzgzpt-system/src/main/java/com/miaxis/system/domain/SchoolRegion.java → hzgzpt-service-app/src/main/java/com/miaxis/app/user/domain/SchoolRegion.java

@@ -1,4 +1,4 @@
-package com.miaxis.system.domain;
+package com.miaxis.app.user.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

hzgzpt-system/src/main/java/com/miaxis/system/mapper/NewsInfoMapper.java → hzgzpt-service-app/src/main/java/com/miaxis/app/user/mapper/NewsInfoMapper.java

@@ -1,8 +1,10 @@
-package com.miaxis.system.mapper;
+package com.miaxis.app.user.mapper;
+
 
-import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.system.domain.NewsInfo;
+import com.miaxis.app.user.domain.NewsInfo;
+
+import java.util.List;
 
 /**
  * 新闻(首页资讯、通知、公告相关)Mapper接口

hzgzpt-system/src/main/java/com/miaxis/system/mapper/SchoolRegionMapper.java → hzgzpt-service-app/src/main/java/com/miaxis/app/user/mapper/SchoolRegionMapper.java

@@ -1,8 +1,10 @@
-package com.miaxis.system.mapper;
+package com.miaxis.app.user.mapper;
+
 
-import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.system.domain.SchoolRegion;
+import com.miaxis.app.user.domain.SchoolRegion;
+
+import java.util.List;
 
 /**
  * 驾校训练场Mapper接口

hzgzpt-system/src/main/java/com/miaxis/system/service/INewsInfoService.java → hzgzpt-service-app/src/main/java/com/miaxis/app/user/service/INewsInfoService.java

@@ -1,8 +1,10 @@
-package com.miaxis.system.service;
+package com.miaxis.app.user.service;
+
 
-import java.util.List;
-import com.miaxis.system.domain.NewsInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.app.user.domain.NewsInfo;
+
+import java.util.List;
 
 /**
  * 新闻(首页资讯、通知、公告相关)Service接口
@@ -10,7 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author miaxis
  * @date 2020-12-22
  */
-public interface INewsInfoService extends IService<NewsInfo>{
+public interface INewsInfoService extends IService<NewsInfo> {
     /**
      * 查询新闻(首页资讯、通知、公告相关)
      * 

hzgzpt-system/src/main/java/com/miaxis/system/service/ISchoolRegionService.java → hzgzpt-service-app/src/main/java/com/miaxis/app/user/service/ISchoolRegionService.java

@@ -1,8 +1,10 @@
-package com.miaxis.system.service;
+package com.miaxis.app.user.service;
+
 
-import java.util.List;
-import com.miaxis.system.domain.SchoolRegion;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.app.user.domain.SchoolRegion;
+
+import java.util.List;
 
 /**
  * 驾校训练场Service接口
@@ -10,7 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author miaxis
  * @date 2020-12-23
  */
-public interface ISchoolRegionService extends IService<SchoolRegion>{
+public interface ISchoolRegionService extends IService<SchoolRegion> {
     /**
      * 查询驾校训练场
      * 

hzgzpt-system/src/main/java/com/miaxis/system/service/ISmsService.java → hzgzpt-service-app/src/main/java/com/miaxis/app/user/service/ISmsService.java

@@ -1,4 +1,4 @@
-package com.miaxis.system.service;
+package com.miaxis.app.user.service;
 
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.SysUser;

hzgzpt-system/src/main/java/com/miaxis/system/service/impl/NewsInfoServiceImpl.java → hzgzpt-service-app/src/main/java/com/miaxis/app/user/service/impl/NewsInfoServiceImpl.java

@@ -1,13 +1,16 @@
-package com.miaxis.system.service.impl;
+package com.miaxis.app.user.service.impl;
+
 
-import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.app.user.domain.NewsInfo;
+import com.miaxis.app.user.mapper.NewsInfoMapper;
+import com.miaxis.app.user.service.INewsInfoService;
 import com.miaxis.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.miaxis.system.mapper.NewsInfoMapper;
-import com.miaxis.system.domain.NewsInfo;
-import com.miaxis.system.service.INewsInfoService;
+
+import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 新闻(首页资讯、通知、公告相关)Service业务层处理
@@ -17,7 +20,7 @@ import com.miaxis.system.service.INewsInfoService;
  */
 @Service
 public class NewsInfoServiceImpl extends ServiceImpl<NewsInfoMapper, NewsInfo> implements INewsInfoService {
-    @Autowired
+    @Resource
     private NewsInfoMapper newsInfoMapper;
 
     /**

hzgzpt-system/src/main/java/com/miaxis/system/service/impl/SchoolRegionServiceImpl.java → hzgzpt-service-app/src/main/java/com/miaxis/app/user/service/impl/SchoolRegionServiceImpl.java

@@ -1,13 +1,17 @@
-package com.miaxis.system.service.impl;
+package com.miaxis.app.user.service.impl;
+
 
-import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.app.user.domain.SchoolRegion;
+import com.miaxis.app.user.mapper.SchoolRegionMapper;
+import com.miaxis.app.user.service.ISchoolRegionService;
 import com.miaxis.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.miaxis.system.mapper.SchoolRegionMapper;
-import com.miaxis.system.domain.SchoolRegion;
-import com.miaxis.system.service.ISchoolRegionService;
+
+import javax.annotation.Resource;
+import java.util.List;
+
 
 /**
  * 驾校训练场Service业务层处理
@@ -17,7 +21,7 @@ import com.miaxis.system.service.ISchoolRegionService;
  */
 @Service
 public class SchoolRegionServiceImpl extends ServiceImpl<SchoolRegionMapper, SchoolRegion> implements ISchoolRegionService {
-    @Autowired
+    @Resource
     private SchoolRegionMapper schoolRegionMapper;
 
     /**

hzgzpt-system/src/main/java/com/miaxis/system/service/impl/SmsServiceImpl.java → hzgzpt-service-app/src/main/java/com/miaxis/app/user/service/impl/SmsServiceImpl.java

@@ -1,11 +1,11 @@
-package com.miaxis.system.service.impl;
+package com.miaxis.app.user.service.impl;
 
+import com.miaxis.app.user.service.ISmsService;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.ResponseEnum;
 import com.miaxis.common.core.domain.entity.SysUser;
 import com.miaxis.common.sms.Client;
-import com.miaxis.system.service.ISmsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;

hzgzpt-service-app/src/main/java/com/miaxis/app/user/service/impl/UserInfoServiceImpl.java

@@ -14,6 +14,8 @@ import com.miaxis.app.user.domain.UserInfo;
 import com.miaxis.app.user.service.IUserInfoService;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
+
 /**
  * 用户信息Service业务层处理
  *

hzgzpt-system/src/main/resources/mapper/system/NewsInfoMapper.xml → hzgzpt-service-app/src/main/resources/mapper/news/NewsInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.miaxis.system.mapper.NewsInfoMapper">
+<mapper namespace="com.miaxis.app.user.mapper.NewsInfoMapper">
     
     <resultMap type="NewsInfo" id="NewsInfoResult">
         <result property="id"    column="id"    />

hzgzpt-system/src/main/resources/mapper/system/SchoolRegionMapper.xml → hzgzpt-service-app/src/main/resources/mapper/school/SchoolRegionMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.miaxis.system.mapper.SchoolRegionMapper">
+<mapper namespace="com.miaxis.app.user.mapper.SchoolRegionMapper">
     
     <resultMap type="SchoolRegion" id="SchoolRegionResult">
         <result property="id"    column="id"    />

pom.xml

@@ -32,6 +32,7 @@
         <jwt.version>0.9.1</jwt.version>
         <mybatis-plus.version>3.4.1</mybatis-plus.version>
         <hutool.version>5.4.0</hutool.version>
+        <com.aliyun.oss.version>2.4.0</com.aliyun.oss.version>
     </properties>
 	
     <!-- 依赖声明 -->
@@ -217,6 +218,13 @@
                 <version>${ruoyi.version}</version>
             </dependency>
 
+            <!--aliyun OSS-->
+            <dependency>
+                <groupId>com.aliyun.oss</groupId>
+                <artifactId>aliyun-sdk-oss</artifactId>
+                <version>${com.aliyun.oss.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>