:zap: 公众号管理端集成、代码优化

src/main/java/com/ifast/common/shiro/config/ShiroConfiguration.java

@@ -152,7 +152,7 @@ public class ShiroConfiguration {
         filterChainDefinitionMap.put("/api/**", "jwt");
         // email
         filterChainDefinitionMap.put("/emil/**", "anon");
-        
+
         filterChainDefinitionMap.put("/doc.html**", "anon");
         filterChainDefinitionMap.put("/swagger-resources/**", "anon");
         filterChainDefinitionMap.put("/webjars/**", "anon");

src/main/java/com/ifast/email/IMailsendService.java

@@ -1,13 +0,0 @@
-package com.ifast.email;
-
-import com.ifast.common.utils.CaptchaUtils.Type;
-
-public interface IMailsendService {
-	/**
-	 * 
-	 * @Title: sendMessage @Description: 该方法的主要作用：发送邮件 @param 设定文件 @return
-	 * 返回类型：void @throws
-	 */
-	void sendMessage(String form,String to,String content,Type type);
-	
-}

src/main/java/com/ifast/email/config/EmailConfig.java

@@ -1,98 +0,0 @@
-package com.ifast.email.config;
-
-import java.util.Properties;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
-import org.springframework.stereotype.Component;
-import org.springframework.ui.freemarker.FreeMarkerConfigurationFactoryBean;
-
-@Component
-//@PropertySource("classpath:config/application-mail.properties")
-//@ConfigurationProperties(prefix = "ifast.mail")
-public class EmailConfig {
- 
-	/**邮件发送服务器的主机*/
-    @Value("${spring.mail.host}")
-	private String host;
-    
-    /**邮件发送服务器的端口*/
-	@Value("${spring.mail.port}")
-	private int port;
-	
-	/**账户*/
-	@Value("${spring.mail.username}")
-	private String account;
-	
-	/**密码*/
-	@Value("${spring.mail.password}")
-	private String password;
-	
-	/**邮件发送协议*/
-	@Value("${spring.mail.protocol}")
-	private String protocol;
-	
-	/**一般情况下，发送邮件都是要进行验证*/
-	@Value("${spring.mail.properties.mail.smtp.auth}")
-	private String isAuth;
-	
-	/**邮件发送超时时间*/
-	@Value("${spring.mail.properties.mail.smtp.timeout}")
-	private String outTime;
-	
-	/**默认编码模式*/
-	@Value("${spring.mail.default-encoding}")
-	private String encoding;
-	
-	/**模板地址*/
-	@Value("${spring.mail.templateLoaderPath}") 
-	private String templateLoaderPath;
-
-	/**
-	 *  邮件服务
-	 * @return
-	 */
-	@Bean(name = "javaMailSender")
-	public JavaMailSenderImpl getMailSender() {
-		JavaMailSenderImpl javaMailSender = new JavaMailSenderImpl();
-		javaMailSender.setHost(host);
-		javaMailSender.setPort(port);
-		javaMailSender.setUsername(account);
-		javaMailSender.setPassword(password);
-		javaMailSender.setProtocol(protocol);
-		Properties properties = new Properties();
-		properties.put("mail.smtp.auth", isAuth);
-		properties.put("mail.smtp.timeout", outTime);
-		
-//		javaMailSender.setHost("smtp.163.com");
-//		javaMailSender.setPort(25);
-//		javaMailSender.setUsername("18291548738@163.com");
-//		javaMailSender.setPassword("zyl163com");
-//		javaMailSender.setProtocol("smtp");
-//		Properties properties = new Properties();
-//		properties.put("mail.smtp.auth", true);
-//		properties.put("mail.smtp.timeout", 25000);
-		
-		javaMailSender.setJavaMailProperties(properties);
-		return javaMailSender;
-	}
-	
-	
-	/**
-	  * 配置FreeMarker
-	  * @return
-	  */
-	@Bean(name = "configuration")
-	public FreeMarkerConfigurationFactoryBean getFreeMarkerConfiguration() {
-		FreeMarkerConfigurationFactoryBean freeMarkerConfiguration = new FreeMarkerConfigurationFactoryBean();
-		freeMarkerConfiguration.setTemplateLoaderPath(templateLoaderPath);//指定模板文件路径 
-		freeMarkerConfiguration.setDefaultEncoding(encoding);//设置freekMarker编码格式
-		
-//		freeMarkerConfiguration.setTemplateLoaderPath("classpath:/freemarker");//指定模板文件路径 
-//		freeMarkerConfiguration.setDefaultEncoding("UTF-8");//设置freekMarker编码格式
-		return freeMarkerConfiguration;
-	}
-	
- 
-}

src/main/java/com/ifast/email/controller/EmailController.java

@@ -1,64 +0,0 @@
-package com.ifast.email.controller;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.ifast.email.IMailsendService;
-import com.ifast.common.utils.CaptchaUtils.Type;
-
-
-/**
- * 邮件测试类
- * @author admin
- *
- */
-@RequestMapping("/emil")
-@Controller
-public class EmailController {
-
-	
-	/**使用模板发送邮件*/
-	@Autowired
-	@Qualifier(value = "createMatterServiceImpl")
-	private IMailsendService   createMatterService;
-	
-	/**发送带附件的邮件*/
-	@Autowired
-	@Qualifier(value = "attMailsendServiceImpl")
-	private IMailsendService   attMailsendService;
-	
-	/**发送简单邮件*/
-	@Autowired
-	@Qualifier(value = "simpleMailsendServiceImpl")
-	private IMailsendService   simpleMailsendService;
-	
-	/**
-	 * 发送简单邮件
-	 */
-	@RequestMapping("/simpleMailsend")
-	public void simpleMailsend() {
-		simpleMailsendService.sendMessage("18291548738@163.com", "1045877180@qq.com", "发送简单邮件！", null);
-	    System.out.println("发送成功");
-	}
-	/**
-	 * 发送带附件的邮件
-	 */
-	@RequestMapping("/attMailsend")
-	public void attMailsend() {
-		attMailsendService.sendMessage("18291548738@163.com", "1045877180@qq.com", null, null);
-		System.out.println("发送成功");
-	}
-	
-	/**
-	 * 使用模板发送邮件
-	 */
-	@RequestMapping("/createMatterMailsend")
-	public void createMatterMailsend() {
-		createMatterService.sendMessage("18291548738@163.com", "1045877180@qq.com", "123456", Type.Register);
-		System.out.println("发送成功");
-	}
-	
-	
-}

src/main/java/com/ifast/email/impl/AttMailsendServiceImpl.java

@@ -1,78 +0,0 @@
-package com.ifast.email.impl;
-
-import javax.mail.internet.MimeMessage;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.mail.javamail.JavaMailSender;
-import org.springframework.mail.javamail.MimeMessageHelper;
-import org.springframework.stereotype.Service;
-
-import com.ifast.email.IMailsendService;
-import com.ifast.common.utils.CaptchaUtils.Type;
-
-
-/**
- * TODO:发送带附件的邮件
- * 
- * @author zyl
- * @since:2017年9月7日
- * @author zyl 2017年9月7日
- * @version
- */
-@Service("attMailsendServiceImpl")
-public class AttMailsendServiceImpl implements IMailsendService {
-	
-	@Autowired
-	private JavaMailSender javaMailSender;
-
-	/**
-	 * (非 Javadoc)
-	 * <p>
-	 * Title: sendMessage
-	 * </p>
-	 * <p>
-	 * Description(描述):发送带附件的邮件
-	 * </p>
-	 * 
-	 * @see org.service.IMailsendService#sendMessage()
-	 */
-
-	@Override
-	public void sendMessage(String form, String to,String content,Type type) {
-		MimeMessage message = javaMailSender.createMimeMessage();
-		MimeMessageHelper helper;
-		try {
-			helper = new MimeMessageHelper(message, true, "utf-8");
-			helper.setFrom(form);
-			helper.setTo(to);
-			helper.setSubject("带附件的邮件");
-			// 普通格式的
-			// helper.setText("发送一个附件内容！<a
-			// href='http://www.baidu.com'>百度搜索</a>");
-			// html格式的
-			helper.setText("发送一个附件内容！<a href='http://www.baidu.com'>百度搜索</a>", true);
-			// 添加附件1
-			ClassPathResource file1 = new ClassPathResource("/freemarker/doc.txt");
-			helper.addAttachment(file1.getFilename(), file1.getFile());
-			// 添加附件2
-			ClassPathResource file2 = new ClassPathResource("/freemarker/text.txt");
-			helper.addAttachment(file2.getFilename(), file2.getFile());
-			javaMailSender.send(message);
-
-		} catch (Exception e) {
-			// TODO 异常执行块！
-			e.printStackTrace();
-		}
-
-	}
-
-	public JavaMailSender getJavaMailSender() {
-		return javaMailSender;
-	}
-
-	public void setJavaMailSender(JavaMailSender javaMailSender) {
-		this.javaMailSender = javaMailSender;
-	}
-
-}

src/main/java/com/ifast/email/impl/CreateMatterServiceImpl.java

@@ -1,180 +0,0 @@
-package com.ifast.email.impl;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.mail.javamail.JavaMailSender;
-import org.springframework.mail.javamail.MimeMessageHelper;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.freemarker.FreeMarkerTemplateUtils;
-
-import com.ifast.common.utils.CaptchaUtils.Type;
-import com.ifast.email.IMailsendService;
-
-import freemarker.template.Configuration;
-import freemarker.template.Template;
-import freemarker.template.TemplateException;
-
-/**
- * TODO:模板发送带html格式的邮件
- * 
- * @author zyl
- * @since:2017年9月6日
- * @author zyl 2017年9月6日
- * @version
- */
-@Service(value = "createMatterServiceImpl")
-public class CreateMatterServiceImpl implements IMailsendService {
-
-	@Autowired
-	private JavaMailSender javaMailSender;
-	
-	@Autowired
-	private Configuration configuration;
-
-	/**
-	 * (非 Javadoc)
-	 * <p>
-	 * Title: sendMessage
-	 * </p>
-	 * <p>
-	 * Description(描述):使用后模板发送邮件
-	 * </p>
-	 * 
-	 * @see org.service.IMailsendService#sendMessage()
-	 */
-
-	@Override
-	public void sendMessage(String form, String to,String captcha,Type type) {
-		MimeMessage message = javaMailSender.createMimeMessage();
-		try {
-			MimeMessageHelper helper = new MimeMessageHelper(message, true, "UTF-8");
-			helper.setFrom(form);
-			helper.setTo(to);
-			String  subiect=getSubject(type);
-			helper.setSubject("请输入验证码  "+captcha+subiect);
-			helper.setText(getText(to,captcha,type), true);
-			// 从模板里面读取
-			javaMailSender.send(message);
-		} catch (MessagingException e) {
-			// TODO 异常执行块！
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 *TODO:根据验证码类型决定不同的主题
-	 *@author ZYL 2017年9月27日
-	 *@param type
-	 *@return
-	 *@version 1.1
-	 */
-	private String getSubject(Type type) {
-		String result = null;
-		switch (type) {
-		case Register:
-			result = " 完成注册";
-			break;
-		case BinDingPhone:
-			result = " 完成绑定手机";
-			break;
-		case BinDingEmail:
-			result = " 完成绑定邮箱";
-			break;
-		case ForgetPswd:
-			result = " 完成忘记密码";
-			break;
-		case Paypwd:
-			result = " 完成设置支付密码";
-			break;
-		case AlterMobile:
-			result = " 完成修改手机";
-			break;
-		case AlterEmail:
-			result = " 完成修改邮箱";
-			break;
-		default:
-			throw new IllegalArgumentException("The Type isn't supported!Please see Captcha.Type!");
-		}
-		return result;
-	}
-
-	/**
-	 *TODO:根据验证码类型决定不同的模板
-	 *@author ZYL 2017年9月27日
-	 *@param type
-	 *@return
-	 *@version 1.1
-	 */
-	private String getSMSContent(Type type) {
-		String result = null;
-		switch (type) {
-		case Register:
-			result = "/mail.ftl";
-			break;
-		case BinDingPhone:
-			result = "/mailBinDingPhone.ftl";
-			break;
-		case BinDingEmail:
-			result = "/mailBinDingEmail.ftl";
-			break;
-		case ForgetPswd:
-			result = "/mailForgetPswd.ftl";
-			break;
-		case AlterMobile:
-			result = "/mailAlterMobile.ftl";
-			break;
-		case AlterEmail:
-			result = "/mailAlterEmail.ftl";
-			break;
-		default:
-			throw new IllegalArgumentException("The Type isn't supported!Please see Captcha.Type!");
-		}
-		return result;
-	}
-
-	// 读取模板
-	private String getText(String username, String captcha,Type type) {
-		String txt = "";
-		try {
-			String file=getSMSContent(type);
-			Template template = configuration.getTemplate(file);
-			// 通过map传递动态数据
-			Map<String, String> map = new HashMap<String, String>();
-			map.put("username", username);
-			map.put("captcha", captcha);
-			// 解析模板文件
-			txt = FreeMarkerTemplateUtils.processTemplateIntoString(template, map);
-		} catch (IOException e) {
-			// TODO 异常执行块！
-			e.printStackTrace();
-		} catch (TemplateException e) {
-			// TODO 异常执行块！
-			e.printStackTrace();
-		}
-
-		return txt;
-	}
-
-	public JavaMailSender getJavaMailSender() {
-		return javaMailSender;
-	}
-
-	public void setJavaMailSender(JavaMailSender javaMailSender) {
-		this.javaMailSender = javaMailSender;
-	}
-
-	public Configuration getConfiguration() {
-		return configuration;
-	}
-
-	public void setConfiguration(Configuration configuration) {
-		this.configuration = configuration;
-	}
-
-}

src/main/java/com/ifast/email/impl/SimpleMailsendServiceImpl.java

@@ -1,53 +0,0 @@
-package com.ifast.email.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.mail.SimpleMailMessage;
-import org.springframework.mail.javamail.JavaMailSender;
-import org.springframework.stereotype.Service;
-
-import com.ifast.email.IMailsendService;
-import com.ifast.common.utils.CaptchaUtils.Type;
-
-/**
- *TODO:发送简单邮件
- *@author zyl
- *@since:2017年9月7日
- *@author zyl 2017年9月7日
- *@version
- */
-@Service(value="simpleMailsendServiceImpl")
-public class SimpleMailsendServiceImpl implements IMailsendService {
-	
-	@Autowired
-	private JavaMailSender javaMailSender;
-
-	
-
-	public JavaMailSender getJavaMailSender() {
-		return javaMailSender;
-	}
-
-
-
-	public void setJavaMailSender(JavaMailSender javaMailSender) {
-		this.javaMailSender = javaMailSender;
-	}
-
-
-
-	@Override
-	public void sendMessage(String form, String to,String content,Type type) {
-		SimpleMailMessage msg = new SimpleMailMessage();
-		msg.setFrom(form);// 发件地址
-		msg.setTo(to);// 收件地址
-		msg.setSubject("测试");// 标题
-		msg.setText("第一个邮件！");// 内容
-		try {
-			javaMailSender.send(msg);// 发送邮件
-			System.out.println("成功！");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-}

src/main/java/com/ifast/wxmp/domain/MpArticleDO.java

@@ -2,8 +2,10 @@ package com.ifast.wxmp.domain;
 
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -18,6 +20,8 @@ import java.util.Date;
 @Data
 @TableName("wx_mp_article")
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class MpArticleDO implements Serializable {
 	@TableId
 	private Long id;

src/main/java/com/ifast/wxmp/domain/MpFansDO.java

@@ -3,6 +3,7 @@ package com.ifast.wxmp.domain;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -21,6 +22,8 @@ import java.util.Date;
  @TableName("wx_mp_fans")
  @Data
  @Builder
+ @NoArgsConstructor
+ @AllArgsConstructor
 public class MpFansDO implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

src/main/java/com/ifast/wxmp/domain/MpMenuDO.java

@@ -2,8 +2,10 @@ package com.ifast.wxmp.domain;
 
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -18,6 +20,8 @@ import java.util.Date;
 @Data
 @TableName("wx_mp_menu")
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class MpMenuDO implements Serializable {
 	@TableId
 	private Long id;

src/main/resources/application-dev.yml

@@ -23,7 +23,7 @@ ifast:
   oss:
     local: # 配置 localPath 启用本地上传（默认方式）
       localPath: upload
-      rootURL: http://localhost:8088/upload
+      rootURL: ${ifast.projectRootURL}upload
     aliyun: # 配置 accessKeySecret 启用阿里云OSS
       accessKeyId:
       accessKeySecret:

src/main/resources/application-prod.yml

@@ -20,7 +20,7 @@ ifast:
   oss:
     local: # 配置 localPath 启用本地上传（默认方式）
       localPath: upload
-      rootURL: http://localhost:8088/upload
+      rootURL: ${ifast.projectRootURL}upload
     aliyun: # 配置 accessKeySecret 启用阿里云OSS
       accessKeyId:
       accessKeySecret:
@@ -59,7 +59,7 @@ spring:
     url: jdbc:mysql://127.0.0.1:3306/ifast?useUnicode=true&useSSL=false
     connectionInitSqls: SET NAMES utf8mb4;
     username: root
-    password: 1024key@root
+    password: aron
     initialSize: 1
     minIdle: 3
     maxActive: 20

src/main/resources/application.properties

@@ -1,12 +0,0 @@
-spring.mail.host=smtp.163.com
-spring.mail.username=18291548738@163.com
-#\u6388\u6743\u7801g\uFF0C\u5728QQ\u90AE\u7BB1\u5BA2\u6237\u7AEF\u751F\u6210 \u4FEE\u6539\u6210\u81EA\u5DF1\u7684  \u8BBE\u7F6E-\u8D26\u6237-\u5F00\u542F\u670D\u52A1-\u83B7\u53D6\u6388\u6743\u7801
-spring.mail.password=xxxxxxx
-spring.mail.protocol=smtp
-spring.mail.port=25
-spring.mail.default-encoding=UTF-8
-spring.mail.templateLoaderPath=classpath:/freemarker
-spring.mail.properties.mail.smtp.auth=true
-spring.mail.properties.mail.smtp.timeout=25000
-spring.mail.properties.mail.smtp.starttls.enable=true
-spring.mail.properties.mail.smtp.starttls.required=true

src/main/resources/application.yml

@@ -22,7 +22,7 @@ spring:
     generator:
       WRITE_NUMBERS_AS_STRINGS: true    
   profiles:
-    active: @activatedProperties@
+    active: dev
   http:
     multipart:
       max-file-size: 30Mb