From 2d531699d26ce46d4b13e71a9356f8828de9b24a Mon Sep 17 00:00:00 2001
From: jiekechoo <jiekechoo@sectong.com>
Date: Thu, 27 Oct 2016 00:38:24 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9F=AD=E4=BF=A1?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E5=8A=9F=E8=83=BD=EF=BC=88253.com?=
 =?UTF-8?q?=EF=BC=89=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=87=8D=E7=BD=AE=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  33 ++--
 .../sectong/controller/NewsController.java    |   4 +
 .../controller/ThirdPartyController.java      |  69 ++++++++
 .../sectong/controller/UserController.java    |  92 ++++++++--
 .../com/sectong/domain/ResetPasswordForm.java |  42 +++++
 src/main/java/com/sectong/domain/Sms.java     |  65 +++++++
 .../com/sectong/domain/UserCreateForm.java    |  11 ++
 .../com/sectong/repository/SmsRepository.java |  11 ++
 .../com/sectong/service/SendSMSService.java   |  11 ++
 .../sectong/service/SendSMSServiceImpl.java   |  80 +++++++++
 .../java/com/sectong/service/UserService.java |   3 +
 .../com/sectong/service/UserServiceImpl.java  |  15 ++
 .../java/com/sectong/thirdparty/README.md     |   1 +
 .../com/sectong/thirdparty/sms/SendSMS.java   |  61 +++++++
 .../com/sectong/validator/ValidatorUtil.java  | 167 ++++++++++++++++++
 15 files changed, 642 insertions(+), 23 deletions(-)
 create mode 100644 src/main/java/com/sectong/controller/ThirdPartyController.java
 create mode 100644 src/main/java/com/sectong/domain/ResetPasswordForm.java
 create mode 100644 src/main/java/com/sectong/domain/Sms.java
 create mode 100644 src/main/java/com/sectong/repository/SmsRepository.java
 create mode 100644 src/main/java/com/sectong/service/SendSMSService.java
 create mode 100644 src/main/java/com/sectong/service/SendSMSServiceImpl.java
 create mode 100644 src/main/java/com/sectong/thirdparty/README.md
 create mode 100644 src/main/java/com/sectong/thirdparty/sms/SendSMS.java
 create mode 100644 src/main/java/com/sectong/validator/ValidatorUtil.java

diff --git a/pom.xml b/pom.xml
index c3ce681..33d08ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.sectong</groupId>
 	<artifactId>yidongyi</artifactId>
-	<version>0.1.0-RELEASE</version>
+	<version>0.2.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>yidongyi</name>
@@ -47,28 +47,35 @@
 			<artifactId>spring-boot-starter-thymeleaf</artifactId>
 		</dependency>
 		<dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
-        </dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-jdbc</artifactId>
+		</dependency>
 		<dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-        </dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+		</dependency>
 		<dependency>
-		    <groupId>io.springfox</groupId>
-		    <artifactId>springfox-swagger2</artifactId>
-		    <version>${swagger.version}</version>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger2</artifactId>
+			<version>${swagger.version}</version>
 		</dependency>
 		<dependency>
-		    <groupId>io.springfox</groupId>
-		    <artifactId>springfox-swagger-ui</artifactId>
-		    <version>${swagger.version}</version>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+			<version>${swagger.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-undertow</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+			<version>3.1</version>
+		</dependency>
+
 	</dependencies>
 
 	<!-- <repositories> <repository> <id>spring-releases</id> <url>https://repo.spring.io/libs-release</url> 
diff --git a/src/main/java/com/sectong/controller/NewsController.java b/src/main/java/com/sectong/controller/NewsController.java
index 4f303b9..ed75f48 100644
--- a/src/main/java/com/sectong/controller/NewsController.java
+++ b/src/main/java/com/sectong/controller/NewsController.java
@@ -23,6 +23,8 @@ import com.sectong.domain.NewsCreateForm;
 import com.sectong.message.Message;
 import com.sectong.service.NewsService;
 
+import io.swagger.annotations.ApiOperation;
+
 @RestController
 @RequestMapping(value = "/api/v1", name = "新闻API")
 public class NewsController {
@@ -39,6 +41,7 @@ public class NewsController {
 
 	@ResponseBody
 	@RequestMapping(value = "i/news/create", method = RequestMethod.POST)
+	@ApiOperation(value="创建新闻接口", notes="创建新闻，接口提交json格式，字段参见form参数")
 	public ResponseEntity<Message> createNews(@Valid @RequestBody NewsCreateForm form, BindingResult bindingResult) {
 		try {
 			News news = newsService.create(form);
@@ -52,6 +55,7 @@ public class NewsController {
 	}
 
 	@RequestMapping(value = "news/getNewsList", method = RequestMethod.GET)
+	@ApiOperation(value="获取新闻列表接口", notes="获取新闻列表，接口startid默认0，下拉时根据最大值获取后续列表，可分页查询")
 	public ResponseEntity<Message> getNewsList(@RequestParam(defaultValue = "0") Long startid, Pageable p) {
 		Page<News> news = newsService.getNewsList(startid, p);
 		message.setMsg(1, "获取新闻列表成功", news);
diff --git a/src/main/java/com/sectong/controller/ThirdPartyController.java b/src/main/java/com/sectong/controller/ThirdPartyController.java
new file mode 100644
index 0000000..1796439
--- /dev/null
+++ b/src/main/java/com/sectong/controller/ThirdPartyController.java
@@ -0,0 +1,69 @@
+package com.sectong.controller;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.sectong.message.Message;
+import com.sectong.service.SendSMSService;
+import com.sectong.validator.ValidatorUtil;
+
+import io.swagger.annotations.ApiOperation;
+
+@Controller
+@RequestMapping(value = "/api/v1", name = "第三方API")
+
+public class ThirdPartyController {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(ThirdPartyController.class);
+	private Message message = new Message();
+
+	private SendSMSService sendSMSService;
+
+	@Autowired
+	public ThirdPartyController(SendSMSService sendSMSService) {
+		this.sendSMSService = sendSMSService;
+	}
+
+	/**
+	 * 请求短信验证码
+	 * 
+	 * @param mobile
+	 * @return
+	 */
+	@PostMapping("requestSMS")
+	@ApiOperation(value="请求短信验证码接口", notes="请求短信验证码接口，POST请求，参数mobile必须为11位手机号码")
+	public ResponseEntity<Message> requestSMS(@RequestParam String mobile) {
+
+		if (mobile.isEmpty()) {
+			LOGGER.info("手机号码输入为空");
+			message.setMsg(0, "手机号码不能为空");
+			return new ResponseEntity<Message>(message, HttpStatus.OK);
+		}
+		if (!ValidatorUtil.isMobile(mobile)) {
+			LOGGER.info("手机号码错误：{}", mobile);
+			message.setMsg(0, "手机号码错误");
+			return new ResponseEntity<Message>(message, HttpStatus.OK);
+		}
+
+		String ret = sendSMSService.send(mobile);
+		if (ret.equals("0")) {
+			LOGGER.info("验证码发送成功：{}", mobile);
+			message.setMsg(1, "验证码发送成功");
+		} else {
+			LOGGER.info("验证码发送失败：{}", mobile);
+			message.setMsg(0, "验证码发送失败：" + ret);
+		}
+
+		LOGGER.info("Access ThirdPartyController.requestSMS");
+		return new ResponseEntity<Message>(message, HttpStatus.OK);
+
+	}
+
+}
diff --git a/src/main/java/com/sectong/controller/UserController.java b/src/main/java/com/sectong/controller/UserController.java
index a64f4ea..f6b4eac 100644
--- a/src/main/java/com/sectong/controller/UserController.java
+++ b/src/main/java/com/sectong/controller/UserController.java
@@ -1,16 +1,21 @@
 package com.sectong.controller;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.PropertySource;
-import org.springframework.core.env.Environment;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.authentication.WebAuthenticationDetails;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
@@ -23,13 +28,17 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import com.sectong.domain.ResetPasswordForm;
 import com.sectong.domain.User;
 import com.sectong.domain.UserCreateForm;
 import com.sectong.message.Message;
 import com.sectong.repository.UserRepository;
+import com.sectong.service.SendSMSService;
 import com.sectong.service.UserService;
 import com.sectong.validator.UserCreateFormValidator;
 
+import io.swagger.annotations.ApiOperation;
+
 /**
  * 处理用户类接口
  * 
@@ -45,20 +54,23 @@ public class UserController {
 	private UserService userService;
 	private UserCreateFormValidator userCreateFormValidator;
 	private UserRepository userRepository;
+	private SendSMSService sendSMSService;
 
 	private Message message = new Message();
 
-	@Autowired
-	private Environment env;
-
 	@Autowired
 	public UserController(UserService userService, UserCreateFormValidator userCreateFormValidator,
-			UserRepository userRepository) {
+			UserRepository userRepository, SendSMSService sendSMSService) {
 		this.userService = userService;
 		this.userCreateFormValidator = userCreateFormValidator;
 		this.userRepository = userRepository;
+		this.sendSMSService = sendSMSService;
 	}
 
+	// 装载用户认证Manager
+	@Autowired
+	protected AuthenticationManager authenticationManager;
+
 	/**
 	 * 创建用户验证表单
 	 * 
@@ -76,16 +88,17 @@ public class UserController {
 	 * @return
 	 */
 	@RequestMapping(value = "i/userLogin", method = RequestMethod.POST)
+	@ApiOperation(value = "用户登录接口", notes = "用户登录，接口POST请求，采用HttpBasic认证方式")
 	public ResponseEntity<Message> userLogin(HttpServletRequest request) {
 		User user = userService.getCurrentUser();
-		if(user == null){
+		if (user == null) {
 			message.setMsg(0, "用户登录失败");
 			return new ResponseEntity<Message>(message, HttpStatus.OK);
-		}else {
+		} else {
 			message.setMsg(1, "用户登录成功", user);
 			return new ResponseEntity<Message>(message, HttpStatus.OK);
 		}
-		
+
 	}
 
 	/**
@@ -97,12 +110,20 @@ public class UserController {
 	 */
 	@ResponseBody
 	@RequestMapping(value = "create", method = RequestMethod.POST)
+	@ApiOperation(value = "创建用户接口", notes = "创建用户，接口POST请求，提交用户创建json")
 	public ResponseEntity<Message> handleUserCreateForm(@Valid @RequestBody UserCreateForm form,
 			BindingResult bindingResult) {
+
+		if (sendSMSService.findByUsernameAndVcode(form.getUsername(), form.getVcode()) == null) {
+			LOGGER.info("验证码错误，或找不到");
+			message.setMsg(0, "验证码错误或过期");
+			return new ResponseEntity<Message>(message, HttpStatus.OK);
+		}
+
 		LOGGER.debug("Processing user create form={}, bindingResult={}", form, bindingResult);
 		if (bindingResult.hasErrors()) {
 			// failed validation
-			message.setMsg(0, "user_create error: failed validation");
+			message.setMsg(0, "用户创建失败");
 			return new ResponseEntity<Message>(message, HttpStatus.OK);
 		}
 		try {
@@ -115,10 +136,39 @@ public class UserController {
 
 		}
 		// ok, redirect
-		message.setMsg(1, "create user success");
+		message.setMsg(1, "用户创建成功");
 		return new ResponseEntity<Message>(message, HttpStatus.OK);
 	}
 
+	@ResponseBody
+	@RequestMapping(value = "i/user/resetPassword", method = RequestMethod.POST)
+	@ApiOperation(value = "重置密码接口", notes = "重置密码，接口POST请求，参数为ResetPasswordForm类")
+	public ResponseEntity<Message> resetPassword(@Valid @RequestBody ResetPasswordForm form,
+			BindingResult bindingResult, HttpServletRequest request, HttpServletResponse response) {
+		if (userService.getUserByUsername(form.getMobile()) == null) {
+			LOGGER.info("用户不存在");
+			message.setMsg(0, "用户不存在");
+			return new ResponseEntity<Message>(message, HttpStatus.OK);
+		}
+		if (sendSMSService.findByUsernameAndVcode(form.getMobile(), form.getVcode()) == null) {
+			LOGGER.info("验证码错误，或找不到");
+			message.setMsg(0, "验证码错误或过期");
+			return new ResponseEntity<Message>(message, HttpStatus.OK);
+		}
+
+		try {
+			User user = userService.resetPassword(form);
+			authenticateUserAndSetSession(form.getMobile(), form.getPassword(), request);
+			message.setMsg(1, "用户修改、重置密码成功", user);
+			return new ResponseEntity<Message>(message, HttpStatus.OK);
+		} catch (DataIntegrityViolationException e) {
+			LOGGER.warn("数据提交错误，请遵守验证规则", e);
+			message.setMsg(2, "数据提交错误，请遵守验证规则");
+			return new ResponseEntity<Message>(message, HttpStatus.OK);
+		}
+
+	}
+
 	/**
 	 * 使用 ResponseBody作为结果 200
 	 * 
@@ -127,6 +177,7 @@ public class UserController {
 	 */
 	@ResponseBody
 	@RequestMapping(value = "i/user/{id}", method = RequestMethod.GET)
+	@ApiOperation(value = "获取用户信息接口", notes = "获取用户信息，接口GET请求，{id}参数为用户id号")
 	public ResponseEntity<Message> findByUserId(@PathVariable long id) {
 		User user = userRepository.findOne(id);
 		HttpStatus status = user != null ? HttpStatus.OK : HttpStatus.NOT_FOUND;
@@ -147,6 +198,7 @@ public class UserController {
 	 * @return
 	 */
 	@RequestMapping(value = "i/uploadImage", method = RequestMethod.POST)
+	@ApiOperation(value = "上传用户头像接口", notes = "上传用户头像，接口采用MultipartFile上传图片文件")
 	public ResponseEntity<?> uploadImage(@RequestParam MultipartFile file, HttpServletRequest request) {
 		message.setMsg(1, "用户上传头像成功", userService.uploadImage(file, request));
 		return new ResponseEntity<Message>(message, HttpStatus.OK);
@@ -168,4 +220,24 @@ public class UserController {
 
 	}
 
+	/**
+	 * 自动登录，获得session和x-auth-token
+	 * 
+	 * @param username
+	 * @param password
+	 * @param request
+	 */
+	private void authenticateUserAndSetSession(String username, String password, HttpServletRequest request) {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(username, password);
+
+		// generate session if one doesn't exist
+		request.getSession();
+
+		token.setDetails(new WebAuthenticationDetails(request));
+		Authentication authenticatedUser = authenticationManager.authenticate(token);
+		LOGGER.info("Auto login with {}", authenticatedUser.getPrincipal());
+
+		SecurityContextHolder.getContext().setAuthentication(authenticatedUser);
+	}
+
 }
diff --git a/src/main/java/com/sectong/domain/ResetPasswordForm.java b/src/main/java/com/sectong/domain/ResetPasswordForm.java
new file mode 100644
index 0000000..df8f074
--- /dev/null
+++ b/src/main/java/com/sectong/domain/ResetPasswordForm.java
@@ -0,0 +1,42 @@
+package com.sectong.domain;
+
+import javax.validation.constraints.Size;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+/**
+ * 修改、重置密码POJO表单
+ * 
+ * @author jiekechoo
+ *
+ */
+public class ResetPasswordForm {
+
+	// 手机号码
+	@NotEmpty
+	@Size(min = 11, max = 11)
+	private String mobile;
+
+	// 重置密码
+	@NotEmpty
+	@Size(min = 6, max = 32)
+	private String password;
+
+	// 手机短信验证码
+	@NotEmpty
+	@Size(min = 6, max = 6)
+	private String vcode;
+
+	public String getMobile() {
+		return mobile;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public String getVcode() {
+		return vcode;
+	}
+
+}
diff --git a/src/main/java/com/sectong/domain/Sms.java b/src/main/java/com/sectong/domain/Sms.java
new file mode 100644
index 0000000..598cd90
--- /dev/null
+++ b/src/main/java/com/sectong/domain/Sms.java
@@ -0,0 +1,65 @@
+package com.sectong.domain;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+/**
+ * 短信pojo
+ * 
+ * @author jiekechoo
+ *
+ */
+@Entity
+public class Sms {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	private Integer id;
+
+	private String mobile;
+	private String vcode;
+	private Date expiredDatetime;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getMobile() {
+		return mobile;
+	}
+
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
+	}
+
+	public String getVcode() {
+		return vcode;
+	}
+
+	public void setVcode(String vcode) {
+		this.vcode = vcode;
+	}
+
+	public Date getExpiredDatetime() {
+		return expiredDatetime;
+	}
+
+	public void setExpiredDatetime(Date expiredDatetime) {
+		this.expiredDatetime = expiredDatetime;
+	}
+
+	public void createSms(String mobile, String vcode, Date expiredDatetime) {
+		this.mobile = mobile;
+		this.vcode = vcode;
+		this.expiredDatetime = expiredDatetime;
+	}
+
+}
diff --git a/src/main/java/com/sectong/domain/UserCreateForm.java b/src/main/java/com/sectong/domain/UserCreateForm.java
index 4834de0..e9100fa 100644
--- a/src/main/java/com/sectong/domain/UserCreateForm.java
+++ b/src/main/java/com/sectong/domain/UserCreateForm.java
@@ -16,6 +16,9 @@ public class UserCreateForm {
 	@NotEmpty
 	private String password;
 
+	@NotEmpty
+	private String vcode;
+
 	public String getUsername() {
 		return username;
 	}
@@ -32,6 +35,14 @@ public class UserCreateForm {
 		this.password = password;
 	}
 
+	public String getVcode() {
+		return vcode;
+	}
+
+	public void setVcode(String vcode) {
+		this.vcode = vcode;
+	}
+
 	@Override
 	public String toString() {
 		return "UserCreateForm [username=" + username + ", password=" + password + "]";
diff --git a/src/main/java/com/sectong/repository/SmsRepository.java b/src/main/java/com/sectong/repository/SmsRepository.java
new file mode 100644
index 0000000..34e1f7d
--- /dev/null
+++ b/src/main/java/com/sectong/repository/SmsRepository.java
@@ -0,0 +1,11 @@
+package com.sectong.repository;
+
+import org.springframework.data.repository.CrudRepository;
+
+import com.sectong.domain.Sms;
+
+public interface SmsRepository extends CrudRepository<Sms, Long> {
+	
+	Sms findFirstByMobileAndVcodeOrderByExpiredDatetimeDesc(String mobile, String vcode);
+
+}
diff --git a/src/main/java/com/sectong/service/SendSMSService.java b/src/main/java/com/sectong/service/SendSMSService.java
new file mode 100644
index 0000000..5a8457c
--- /dev/null
+++ b/src/main/java/com/sectong/service/SendSMSService.java
@@ -0,0 +1,11 @@
+package com.sectong.service;
+
+import com.sectong.domain.Sms;
+
+public interface SendSMSService {
+
+	String send(String mobile);
+	
+	Sms findByUsernameAndVcode(String mobile, String vcode);
+
+}
diff --git a/src/main/java/com/sectong/service/SendSMSServiceImpl.java b/src/main/java/com/sectong/service/SendSMSServiceImpl.java
new file mode 100644
index 0000000..ac170c5
--- /dev/null
+++ b/src/main/java/com/sectong/service/SendSMSServiceImpl.java
@@ -0,0 +1,80 @@
+package com.sectong.service;
+
+import java.util.Date;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.sectong.domain.Sms;
+import com.sectong.repository.SmsRepository;
+import com.sectong.thirdparty.sms.SendSMS;
+
+/**
+ * 短信服务
+ * 
+ * @author jiekechoo
+ *
+ */
+@Service
+public class SendSMSServiceImpl implements SendSMSService {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(SendSMSServiceImpl.class);
+	private SmsRepository smsRepository;
+
+	@Autowired
+	public SendSMSServiceImpl(SmsRepository smsRepository) {
+		this.smsRepository = smsRepository;
+	}
+
+	/**
+	 * 发送短信
+	 */
+	@Override
+	public String send(String mobile) {
+		String url = "http://sms.253.com/msg/";// 应用地址
+		String account = "N8528646";// 账号
+		String pswd = "aIpOKDt2bu908a";// 密码
+		int mobile_code = (int) ((Math.random() * 9 + 1) * 100000); // 验证码
+		String msg = "【253云通讯】您好，您的验证码是" + mobile_code;// 短信内容
+		Boolean needstatus = true;// 是否需要状态报告，需要true，不需要false
+		String extno = null;// 扩展码
+
+		try {
+			String returnString = SendSMS.batchSend(url, account, pswd, mobile, msg, needstatus, extno);
+			LOGGER.info(returnString);
+			// 20161026182305,0\n
+			// 16102618230521663
+			String code = returnString.split("\n")[0].split(",")[1];
+
+			// 保存短信验证码
+			Sms sms = new Sms();
+			Date today = new Date();
+			Date expireDate = new Date(today.getTime() + (1000 * 60 * 30)); // 短信半小时后过期
+			sms.createSms(mobile, String.valueOf(mobile_code), expireDate);
+			smsRepository.save(sms);
+
+			return code;
+			// TODO 处理返回值,参见HTTP协议文档
+		} catch (Exception e) {
+			// TODO 处理异常
+			e.printStackTrace();
+			return "error";
+		}
+	}
+
+	@Override
+	public Sms findByUsernameAndVcode(String mobile, String vcode) {
+		Sms sms = new Sms();
+		sms = smsRepository.findFirstByMobileAndVcodeOrderByExpiredDatetimeDesc(mobile, vcode);
+		LOGGER.info("Finding username and vcode");
+		if (sms != null && (sms.getExpiredDatetime().getTime() > new Date().getTime())) {
+			LOGGER.info("username/vcode matched and valid");
+			return sms;
+		}
+		LOGGER.info("username/vcode not matched and invalid");
+		return null;
+	}
+
+}
diff --git a/src/main/java/com/sectong/service/UserService.java b/src/main/java/com/sectong/service/UserService.java
index 0cca793..dd59109 100644
--- a/src/main/java/com/sectong/service/UserService.java
+++ b/src/main/java/com/sectong/service/UserService.java
@@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.multipart.MultipartFile;
 
+import com.sectong.domain.ResetPasswordForm;
 import com.sectong.domain.User;
 import com.sectong.domain.UserCreateForm;
 
@@ -30,4 +31,6 @@ public interface UserService {
 
 	Object getUserList(int current, int rowCount, String searchPhrase);
 
+	User resetPassword(ResetPasswordForm form);
+
 }
diff --git a/src/main/java/com/sectong/service/UserServiceImpl.java b/src/main/java/com/sectong/service/UserServiceImpl.java
index 583a304..c2f1487 100644
--- a/src/main/java/com/sectong/service/UserServiceImpl.java
+++ b/src/main/java/com/sectong/service/UserServiceImpl.java
@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.sectong.domain.Authority;
+import com.sectong.domain.ResetPasswordForm;
 import com.sectong.domain.User;
 import com.sectong.domain.UserCreateForm;
 import com.sectong.repository.AuthorityRepository;
@@ -84,6 +85,20 @@ public class UserServiceImpl implements UserService {
 		return userRepository.save(user);
 	}
 
+	/**
+	 * 重置用户密码
+	 */
+	@Override
+	public User resetPassword(ResetPasswordForm form) {
+		User user = userRepository.findByUsername(form.getMobile());
+		user.setPassword(new BCryptPasswordEncoder(10).encode(form.getPassword()));
+		return userRepository.save(user);
+	}
+
+	/**
+	 * 用户上传头像
+	 */
+
 	@Override
 	public Object uploadImage(MultipartFile file, HttpServletRequest request) {
 		User user = getCurrentUser();
diff --git a/src/main/java/com/sectong/thirdparty/README.md b/src/main/java/com/sectong/thirdparty/README.md
new file mode 100644
index 0000000..b968bfc
--- /dev/null
+++ b/src/main/java/com/sectong/thirdparty/README.md
@@ -0,0 +1 @@
+# 第三方工具库
\ No newline at end of file
diff --git a/src/main/java/com/sectong/thirdparty/sms/SendSMS.java b/src/main/java/com/sectong/thirdparty/sms/SendSMS.java
new file mode 100644
index 0000000..f4fc378
--- /dev/null
+++ b/src/main/java/com/sectong/thirdparty/sms/SendSMS.java
@@ -0,0 +1,61 @@
+package com.sectong.thirdparty.sms;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.net.URLDecoder;
+
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.NameValuePair;
+import org.apache.commons.httpclient.SimpleHttpConnectionManager;
+import org.apache.commons.httpclient.URI;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.params.HttpClientParams;
+
+
+	/**
+	 * 
+	 * @param url 应用地址，类似于http://ip:port/msg/
+	 * @param account 账号
+	 * @param pswd 密码
+	 * @param mobile 手机号码，多个号码使用","分割
+	 * @param msg 短信内容
+	 * @param needstatus 是否需要状态报告，需要true，不需要false
+	 * @return 返回值定义参见HTTP协议文档
+	 * @throws Exception
+	 */
+	 public class SendSMS {
+	public static String batchSend(String url, String account, String pswd, String mobile, String msg,
+			boolean needstatus, String extno) throws Exception {
+		HttpClient client = new HttpClient(new HttpClientParams(), new SimpleHttpConnectionManager(true));
+		GetMethod method = new GetMethod();
+		try {
+			URI base = new URI(url, false);
+			method.setURI(new URI(base, "HttpBatchSendSM", false));
+			method.setQueryString(new NameValuePair[] { 
+					new NameValuePair("account", account),
+					new NameValuePair("pswd", pswd), 
+					new NameValuePair("mobile", mobile),
+					new NameValuePair("needstatus", String.valueOf(needstatus)), 
+					new NameValuePair("msg", msg),
+					new NameValuePair("extno", extno), 
+				});
+			int result = client.executeMethod(method);
+			if (result == HttpStatus.SC_OK) {
+				InputStream in = method.getResponseBodyAsStream();
+				ByteArrayOutputStream baos = new ByteArrayOutputStream();
+				byte[] buffer = new byte[1024];
+				int len = 0;
+				while ((len = in.read(buffer)) != -1) {
+					baos.write(buffer, 0, len);
+				}
+				return URLDecoder.decode(baos.toString(), "UTF-8");
+			} else {
+				throw new Exception("HTTP ERROR Status: " + method.getStatusCode() + ":" + method.getStatusText());
+			}
+		} finally {
+			method.releaseConnection();
+			}
+		}
+
+	}
\ No newline at end of file
diff --git a/src/main/java/com/sectong/validator/ValidatorUtil.java b/src/main/java/com/sectong/validator/ValidatorUtil.java
new file mode 100644
index 0000000..ee8f807
--- /dev/null
+++ b/src/main/java/com/sectong/validator/ValidatorUtil.java
@@ -0,0 +1,167 @@
+package com.sectong.validator;
+
+import java.text.SimpleDateFormat;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class ValidatorUtil {
+	/**
+	 * 判断是否为浮点数或者整数
+	 * 
+	 * @param str
+	 * @return true Or false
+	 */
+	public static boolean isNumeric(String str) {
+		Pattern pattern = Pattern.compile("^(-?\\d+)(\\.\\d+)?$");
+		Matcher isNum = pattern.matcher(str);
+		if (!isNum.matches()) {
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * 判断是否为正确的邮件格式
+	 * 
+	 * @param str
+	 * @return boolean
+	 */
+	public static boolean isEmail(String str) {
+		if (isEmpty(str))
+			return false;
+		return str.matches("^[\\w-]+(\\.[\\w-]+)*@[\\w-]+(\\.[\\w-]+)+$");
+	}
+
+	/**
+	 * 判断字符串是否为合法手机号 11位 13 14 15 16 17 18 19开头
+	 * 
+	 * @param str
+	 * @return boolean
+	 */
+	public static boolean isMobile(String str) {
+		if (isEmpty(str))
+			return false;
+		return str.matches("^(13|14|15|16|17|18|19)\\d{9}$");
+	}
+
+	/**
+	 * 判断是否为数字
+	 * 
+	 * @param str
+	 * @return
+	 */
+	public static boolean isNumber(String str) {
+		try {
+			Integer.parseInt(str);
+			return true;
+		} catch (Exception ex) {
+			return false;
+		}
+	}
+
+	/**
+	 * 判断字符串是否为非空(包含null与"")
+	 * 
+	 * @param str
+	 * @return
+	 */
+	public static boolean isNotEmpty(String str) {
+		if (str == null || "".equals(str))
+			return false;
+		return true;
+	}
+
+	/**
+	 * 判断字符串是否为非空(包含null与"","    ")
+	 * 
+	 * @param str
+	 * @return
+	 */
+	public static boolean isNotEmptyIgnoreBlank(String str) {
+		if (str == null || "".equals(str) || "".equals(str.trim()))
+			return false;
+		return true;
+	}
+
+	/**
+	 * 判断字符串是否为空(包含null与"")
+	 * 
+	 * @param str
+	 * @return
+	 */
+	public static boolean isEmpty(String str) {
+		if (str == null || "".equals(str))
+			return true;
+		return false;
+	}
+
+	/**
+	 * 判断字符串是否为空(包含null与"","    ")
+	 * 
+	 * @param str
+	 * @return
+	 */
+	public static boolean isEmptyIgnoreBlank(String str) {
+		if (str == null || "".equals(str) || "".equals(str.trim()))
+			return true;
+		return false;
+	}
+
+	public static boolean isYearMonth(String str) {
+		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMM");
+		dateFormat.setLenient(false);
+		try {
+			dateFormat.parse(str);
+			return true;
+		} catch (Exception e) {
+			return false;
+		}
+	}
+
+	public static boolean isYearMonthDay(String str) {
+		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
+		dateFormat.setLenient(false);
+		try {
+
+			dateFormat.parse(str);
+
+			return true;
+		} catch (Exception e) {
+			return false;
+		}
+	}
+
+	public static boolean isYear_Month_Day(String str) {
+		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+		dateFormat.setLenient(false);
+		try {
+
+			dateFormat.parse(str);
+
+			return true;
+		} catch (Exception e) {
+			return false;
+		}
+	}
+
+	public static boolean isHourMinute(String str) {
+		SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm");
+		dateFormat.setLenient(false);
+		try {
+			dateFormat.parse(str);
+			return true;
+		} catch (Exception e) {
+			return false;
+		}
+	}
+
+	// public static void main(String[] args) {
+	// System.out.println(isHourMinute("23:22"));
+	// }
+
+	// 禁止实例化
+	private ValidatorUtil() {
+	}
+	
+	
+}
-- 
Gitee


From cf20baf1f0d1190946c64826a2ffc95e1c8aabc1 Mon Sep 17 00:00:00 2001
From: jiekechoo <jiekechoo@sectong.com>
Date: Wed, 2 Nov 2016 08:45:30 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20SwaggerConfig=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20API=20=E6=8F=8F=E8=BF=B0=E6=88=90=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                        |  6 +-----
 src/main/java/com/sectong/SwaggerConfig.java   |  4 ++--
 .../sectong/controller/AdminController.java    | 18 ++++++++++++++++++
 .../com/sectong/controller/NewsController.java | 14 +++++++++-----
 .../controller/ThirdPartyController.java       |  5 +++--
 .../com/sectong/controller/UserController.java |  2 ++
 src/main/java/com/sectong/thirdparty/README.md |  6 +++++-
 7 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 33d08ca..eb9770c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<start-class>com.sectong.YidongyiApplication</start-class>
 		<java.version>1.8</java.version>
-		<swagger.version>2.5.0</swagger.version>
+		<swagger.version>2.6.0</swagger.version>
 	</properties>
 
 	<dependencies>
@@ -65,10 +65,6 @@
 			<version>${swagger.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-undertow</artifactId>
-		</dependency>
 
 		<dependency>
 			<groupId>commons-httpclient</groupId>
diff --git a/src/main/java/com/sectong/SwaggerConfig.java b/src/main/java/com/sectong/SwaggerConfig.java
index 144a273..386a970 100644
--- a/src/main/java/com/sectong/SwaggerConfig.java
+++ b/src/main/java/com/sectong/SwaggerConfig.java
@@ -35,8 +35,8 @@ public class SwaggerConfig {
 
 	@SuppressWarnings("deprecation")
 	private ApiInfo apiInfo() {
-		ApiInfo apiInfo = new ApiInfo("移动易 API 手册", "API手册", "0.1.0", "Terms of service", "support@sectong.com",
-				"Apache 2.0", "");
+		ApiInfo apiInfo = new ApiInfo("移动易 API 手册", "此在线API手册为客户端用户提供开发参考", "0.2.0", "Terms of service", "support@sectong.com",
+				"sectong|赛克通", "http://www.sectong.com");
 		return apiInfo;
 	}
 
diff --git a/src/main/java/com/sectong/controller/AdminController.java b/src/main/java/com/sectong/controller/AdminController.java
index 1b9ceac..11d49e4 100644
--- a/src/main/java/com/sectong/controller/AdminController.java
+++ b/src/main/java/com/sectong/controller/AdminController.java
@@ -11,12 +11,19 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import com.fasterxml.jackson.annotation.JsonCreator.Mode;
 import com.sectong.domain.News;
 import com.sectong.domain.User;
 import com.sectong.repository.NewsRepository;
 import com.sectong.repository.UserRepository;
 import com.sectong.service.UserService;
 
+/**
+ * 后台管理控制器
+ * 
+ * @author jiekechoo
+ *
+ */
 @Controller
 public class AdminController {
 
@@ -125,6 +132,17 @@ public class AdminController {
 	public String delNews(Model model, @RequestParam Long id) {
 		newsRepository.delete(id);
 		return "redirect:/admin/news";
+	}
 
+	/**
+	 * 后台配置管理
+	 * 
+	 * @param model
+	 * @return
+	 */
+	@PreAuthorize("hasRole('ROLE_ADMIN')")
+	@GetMapping("/admin/configuration")
+	public String configuration(Mode model) {
+		return "admin/configuration";
 	}
 }
diff --git a/src/main/java/com/sectong/controller/NewsController.java b/src/main/java/com/sectong/controller/NewsController.java
index ed75f48..92a54a6 100644
--- a/src/main/java/com/sectong/controller/NewsController.java
+++ b/src/main/java/com/sectong/controller/NewsController.java
@@ -11,9 +11,10 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -23,10 +24,13 @@ import com.sectong.domain.NewsCreateForm;
 import com.sectong.message.Message;
 import com.sectong.service.NewsService;
 
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
 @RestController
 @RequestMapping(value = "/api/v1", name = "新闻API")
+@Api(tags = "新闻API")
+
 public class NewsController {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(NewsController.class);
@@ -40,8 +44,8 @@ public class NewsController {
 	}
 
 	@ResponseBody
-	@RequestMapping(value = "i/news/create", method = RequestMethod.POST)
-	@ApiOperation(value="创建新闻接口", notes="创建新闻，接口提交json格式，字段参见form参数")
+	@PostMapping(value = "i/news/create")
+	@ApiOperation(value = "创建新闻接口", notes = "创建新闻，接口提交json格式，字段参见form参数")
 	public ResponseEntity<Message> createNews(@Valid @RequestBody NewsCreateForm form, BindingResult bindingResult) {
 		try {
 			News news = newsService.create(form);
@@ -54,8 +58,8 @@ public class NewsController {
 		}
 	}
 
-	@RequestMapping(value = "news/getNewsList", method = RequestMethod.GET)
-	@ApiOperation(value="获取新闻列表接口", notes="获取新闻列表，接口startid默认0，下拉时根据最大值获取后续列表，可分页查询")
+	@GetMapping(value = "news/getNewsList")
+	@ApiOperation(value = "获取新闻列表接口", notes = "获取新闻列表，接口startid默认0，下拉时根据最大值获取后续列表，可分页查询")
 	public ResponseEntity<Message> getNewsList(@RequestParam(defaultValue = "0") Long startid, Pageable p) {
 		Page<News> news = newsService.getNewsList(startid, p);
 		message.setMsg(1, "获取新闻列表成功", news);
diff --git a/src/main/java/com/sectong/controller/ThirdPartyController.java b/src/main/java/com/sectong/controller/ThirdPartyController.java
index 1796439..7716381 100644
--- a/src/main/java/com/sectong/controller/ThirdPartyController.java
+++ b/src/main/java/com/sectong/controller/ThirdPartyController.java
@@ -14,11 +14,12 @@ import com.sectong.message.Message;
 import com.sectong.service.SendSMSService;
 import com.sectong.validator.ValidatorUtil;
 
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
 @Controller
 @RequestMapping(value = "/api/v1", name = "第三方API")
-
+@Api(tags = "第三方API")
 public class ThirdPartyController {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(ThirdPartyController.class);
@@ -38,7 +39,7 @@ public class ThirdPartyController {
 	 * @return
 	 */
 	@PostMapping("requestSMS")
-	@ApiOperation(value="请求短信验证码接口", notes="请求短信验证码接口，POST请求，参数mobile必须为11位手机号码")
+	@ApiOperation(value = "请求短信验证码接口", notes = "请求短信验证码接口，POST请求，参数mobile必须为11位手机号码")
 	public ResponseEntity<Message> requestSMS(@RequestParam String mobile) {
 
 		if (mobile.isEmpty()) {
diff --git a/src/main/java/com/sectong/controller/UserController.java b/src/main/java/com/sectong/controller/UserController.java
index f6b4eac..dd3891b 100644
--- a/src/main/java/com/sectong/controller/UserController.java
+++ b/src/main/java/com/sectong/controller/UserController.java
@@ -37,6 +37,7 @@ import com.sectong.service.SendSMSService;
 import com.sectong.service.UserService;
 import com.sectong.validator.UserCreateFormValidator;
 
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
 /**
@@ -48,6 +49,7 @@ import io.swagger.annotations.ApiOperation;
 @RestController
 @PropertySource("classpath:message.properties")
 @RequestMapping(value = "/api/v1/", name = "用户API")
+@Api(tags = "用户API")
 public class UserController {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(UserController.class);
diff --git a/src/main/java/com/sectong/thirdparty/README.md b/src/main/java/com/sectong/thirdparty/README.md
index b968bfc..1e8f118 100644
--- a/src/main/java/com/sectong/thirdparty/README.md
+++ b/src/main/java/com/sectong/thirdparty/README.md
@@ -1 +1,5 @@
-# 第三方工具库
\ No newline at end of file
+# 第三方工具库
+
+sms: 短信平台
+push: 推送平台
+im: 即时通讯平台
\ No newline at end of file
-- 
Gitee


From 968922299624a0778c17a009ffcadfbc5e7edbec Mon Sep 17 00:00:00 2001
From: jiekechoo <jiekechoo@sectong.com>
Date: Mon, 7 Nov 2016 23:58:07 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E8=B4=A6=E5=8F=B7=EF=BC=9A=E7=9F=AD=E4=BF=A1=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sectong/controller/AdminController.java   |  70 +++++++++--
 .../sectong/controller/NewsController.java    |   2 +-
 .../controller/ThirdPartyController.java      |   2 +-
 .../sectong/controller/UserController.java    |   2 +-
 .../java/com/sectong/domain/ThirdParty.java   |  41 ++++++
 .../repository/ThirdpartyRepository.java      |  11 ++
 .../com/sectong/service/SendSMSService.java   |   6 +-
 .../sectong/service/SendSMSServiceImpl.java   |  58 ++++++++-
 .../com/sectong/thirdparty/sms/SendSMS.java   |  86 ++++++++++---
 .../templates/admin/content/news.html         |  12 +-
 .../templates/admin/content/thirdparty.html   | 119 ++++++++++++++++++
 .../templates/admin/content/user.html         |  33 -----
 .../templates/admin/layouts/sidebar.html      |   6 +
 .../resources/templates/admin/thirdparty.html |  14 +++
 14 files changed, 385 insertions(+), 77 deletions(-)
 create mode 100644 src/main/java/com/sectong/domain/ThirdParty.java
 create mode 100644 src/main/java/com/sectong/repository/ThirdpartyRepository.java
 create mode 100644 src/main/resources/templates/admin/content/thirdparty.html
 create mode 100644 src/main/resources/templates/admin/thirdparty.html

diff --git a/src/main/java/com/sectong/controller/AdminController.java b/src/main/java/com/sectong/controller/AdminController.java
index 11d49e4..8ed6a6e 100644
--- a/src/main/java/com/sectong/controller/AdminController.java
+++ b/src/main/java/com/sectong/controller/AdminController.java
@@ -11,11 +11,12 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.fasterxml.jackson.annotation.JsonCreator.Mode;
 import com.sectong.domain.News;
 import com.sectong.domain.User;
 import com.sectong.repository.NewsRepository;
+import com.sectong.repository.ThirdpartyRepository;
 import com.sectong.repository.UserRepository;
+import com.sectong.service.SendSMSService;
 import com.sectong.service.UserService;
 
 /**
@@ -25,17 +26,23 @@ import com.sectong.service.UserService;
  *
  */
 @Controller
+@PreAuthorize("hasRole('ROLE_ADMIN')")
 public class AdminController {
 
 	private UserRepository userRepository;
 	private NewsRepository newsRepository;
 	private UserService userService;
+	private SendSMSService sendSMSService;
+	private ThirdpartyRepository thirdpartyRepository;
 
 	@Autowired
-	public AdminController(NewsRepository newsRepository, UserRepository userRepository, UserService userService) {
+	public AdminController(NewsRepository newsRepository, UserRepository userRepository, UserService userService,
+			SendSMSService sendSMSService, ThirdpartyRepository thirdpartyRepository) {
 		this.userRepository = userRepository;
 		this.newsRepository = newsRepository;
 		this.userService = userService;
+		this.sendSMSService = sendSMSService;
+		this.thirdpartyRepository = thirdpartyRepository;
 	}
 
 	/**
@@ -84,7 +91,6 @@ public class AdminController {
 	 * @param model
 	 * @return
 	 */
-	@PreAuthorize("hasRole('ROLE_ADMIN')")
 	@GetMapping("/admin/news/add")
 	public String newsAdd(Model model) {
 		model.addAttribute("newsAdd", new News());
@@ -97,7 +103,6 @@ public class AdminController {
 	 * @param model
 	 * @return
 	 */
-	@PreAuthorize("hasRole('ROLE_ADMIN')")
 	@GetMapping("/admin/news/edit")
 	public String newsEdit(Model model, @RequestParam Long id) {
 		model.addAttribute("newsEdit", newsRepository.findOne(id));
@@ -110,7 +115,6 @@ public class AdminController {
 	 * @param news
 	 * @return
 	 */
-	@PreAuthorize("hasRole('ROLE_ADMIN')")
 	@PostMapping("/admin/news/edit")
 	public String newsSubmit(@ModelAttribute News news) {
 		news.setDatetime(new Date());
@@ -127,7 +131,6 @@ public class AdminController {
 	 * @param id
 	 * @return
 	 */
-	@PreAuthorize("hasRole('ROLE_ADMIN')")
 	@GetMapping("/admin/news/del")
 	public String delNews(Model model, @RequestParam Long id) {
 		newsRepository.delete(id);
@@ -140,9 +143,60 @@ public class AdminController {
 	 * @param model
 	 * @return
 	 */
-	@PreAuthorize("hasRole('ROLE_ADMIN')")
 	@GetMapping("/admin/configuration")
-	public String configuration(Mode model) {
+	public String configuration(Model model) {
 		return "admin/configuration";
 	}
+
+	/**
+	 * 第三方配置管理
+	 * 
+	 * @param model
+	 * @return
+	 */
+
+	@GetMapping("/admin/thirdparty")
+	public String thirdparty(Model model) {
+		model.addAttribute("thirdparty", true);
+		String smsUsername = null, smsPassword = null;
+		try {
+			smsUsername = thirdpartyRepository.findOne("smsUsername").getValue();
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
+		try {
+			smsPassword = thirdpartyRepository.findOne("smsPassword").getValue();
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
+
+		if (!sendSMSService.checkSmsAccountStatus(smsUsername, smsPassword)) {
+			model.addAttribute("error", true);// 状态不正常
+		}
+		if (smsUsername == null && smsPassword == null) {
+			model.addAttribute("init", true);// 第一次初始化
+			model.addAttribute("error", false);
+		}
+		model.addAttribute("smsUsername", smsUsername);
+		model.addAttribute("smsPassword", smsPassword);
+		return "admin/thirdparty";
+	}
+
+	/**
+	 * 提交短信平台账号信息
+	 * 
+	 * @param username
+	 * @param password
+	 * @return
+	 */
+	@PostMapping("/admin/thirdpartysms")
+	public String thirdpartysms(@RequestParam String username, @RequestParam String password) {
+		sendSMSService.saveSmsConfig(username, password);
+		if (sendSMSService.checkSmsAccountStatus(username, password)) {
+			return "redirect:/admin/thirdparty?ok";// 账号正常
+		} else {
+			return "redirect:/admin/thirdparty?error";// 状态不正常
+		}
+
+	}
 }
diff --git a/src/main/java/com/sectong/controller/NewsController.java b/src/main/java/com/sectong/controller/NewsController.java
index 92a54a6..9c38c7d 100644
--- a/src/main/java/com/sectong/controller/NewsController.java
+++ b/src/main/java/com/sectong/controller/NewsController.java
@@ -29,7 +29,7 @@ import io.swagger.annotations.ApiOperation;
 
 @RestController
 @RequestMapping(value = "/api/v1", name = "新闻API")
-@Api(tags = "新闻API")
+@Api(description = "新闻API")
 
 public class NewsController {
 
diff --git a/src/main/java/com/sectong/controller/ThirdPartyController.java b/src/main/java/com/sectong/controller/ThirdPartyController.java
index 7716381..686fd85 100644
--- a/src/main/java/com/sectong/controller/ThirdPartyController.java
+++ b/src/main/java/com/sectong/controller/ThirdPartyController.java
@@ -19,7 +19,7 @@ import io.swagger.annotations.ApiOperation;
 
 @Controller
 @RequestMapping(value = "/api/v1", name = "第三方API")
-@Api(tags = "第三方API")
+@Api(description = "第三方API")
 public class ThirdPartyController {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(ThirdPartyController.class);
diff --git a/src/main/java/com/sectong/controller/UserController.java b/src/main/java/com/sectong/controller/UserController.java
index dd3891b..b66cd29 100644
--- a/src/main/java/com/sectong/controller/UserController.java
+++ b/src/main/java/com/sectong/controller/UserController.java
@@ -49,7 +49,7 @@ import io.swagger.annotations.ApiOperation;
 @RestController
 @PropertySource("classpath:message.properties")
 @RequestMapping(value = "/api/v1/", name = "用户API")
-@Api(tags = "用户API")
+@Api(description = "用户API")
 public class UserController {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(UserController.class);
diff --git a/src/main/java/com/sectong/domain/ThirdParty.java b/src/main/java/com/sectong/domain/ThirdParty.java
new file mode 100644
index 0000000..1075ecf
--- /dev/null
+++ b/src/main/java/com/sectong/domain/ThirdParty.java
@@ -0,0 +1,41 @@
+package com.sectong.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+/**
+ * 第三方配置信息
+ * 
+ * @author jiekechoo
+ *
+ */
+@Entity
+public class ThirdParty {
+
+	@Id
+	private String config;
+
+	private String value;
+
+	public String getConfig() {
+		return config;
+	}
+
+	public void setConfig(String config) {
+		this.config = config;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	public void createConfig(String config, String value) {
+		this.config = config;
+		this.value = value;
+	}
+
+}
diff --git a/src/main/java/com/sectong/repository/ThirdpartyRepository.java b/src/main/java/com/sectong/repository/ThirdpartyRepository.java
new file mode 100644
index 0000000..96064a7
--- /dev/null
+++ b/src/main/java/com/sectong/repository/ThirdpartyRepository.java
@@ -0,0 +1,11 @@
+package com.sectong.repository;
+
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.rest.core.annotation.RestResource;
+
+import com.sectong.domain.ThirdParty;
+
+@RestResource(exported = false) // 禁止暴露REST
+public interface ThirdpartyRepository extends CrudRepository<ThirdParty, String> {
+
+}
diff --git a/src/main/java/com/sectong/service/SendSMSService.java b/src/main/java/com/sectong/service/SendSMSService.java
index 5a8457c..c6d82b5 100644
--- a/src/main/java/com/sectong/service/SendSMSService.java
+++ b/src/main/java/com/sectong/service/SendSMSService.java
@@ -5,7 +5,11 @@ import com.sectong.domain.Sms;
 public interface SendSMSService {
 
 	String send(String mobile);
-	
+
 	Sms findByUsernameAndVcode(String mobile, String vcode);
 
+	void saveSmsConfig(String username, String password);
+
+	Boolean checkSmsAccountStatus(String account, String password);
+
 }
diff --git a/src/main/java/com/sectong/service/SendSMSServiceImpl.java b/src/main/java/com/sectong/service/SendSMSServiceImpl.java
index ac170c5..e0a70b0 100644
--- a/src/main/java/com/sectong/service/SendSMSServiceImpl.java
+++ b/src/main/java/com/sectong/service/SendSMSServiceImpl.java
@@ -8,7 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.sectong.domain.Sms;
+import com.sectong.domain.ThirdParty;
 import com.sectong.repository.SmsRepository;
+import com.sectong.repository.ThirdpartyRepository;
 import com.sectong.thirdparty.sms.SendSMS;
 
 /**
@@ -22,10 +24,12 @@ public class SendSMSServiceImpl implements SendSMSService {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(SendSMSServiceImpl.class);
 	private SmsRepository smsRepository;
+	private ThirdpartyRepository thirdpartyRepository;
 
 	@Autowired
-	public SendSMSServiceImpl(SmsRepository smsRepository) {
+	public SendSMSServiceImpl(SmsRepository smsRepository, ThirdpartyRepository thirdpartyRepository) {
 		this.smsRepository = smsRepository;
+		this.thirdpartyRepository = thirdpartyRepository;
 	}
 
 	/**
@@ -34,8 +38,17 @@ public class SendSMSServiceImpl implements SendSMSService {
 	@Override
 	public String send(String mobile) {
 		String url = "http://sms.253.com/msg/";// 应用地址
-		String account = "N8528646";// 账号
-		String pswd = "aIpOKDt2bu908a";// 密码
+		String account = null, pswd = null;
+		try {
+			account = thirdpartyRepository.findOne("smsUsername").getValue();
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
+		try {
+			pswd = thirdpartyRepository.findOne("smsPassword").getValue();
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
 		int mobile_code = (int) ((Math.random() * 9 + 1) * 100000); // 验证码
 		String msg = "【253云通讯】您好，您的验证码是" + mobile_code;// 短信内容
 		Boolean needstatus = true;// 是否需要状态报告，需要true，不需要false
@@ -77,4 +90,43 @@ public class SendSMSServiceImpl implements SendSMSService {
 		return null;
 	}
 
+	/**
+	 * 保存短信配置
+	 */
+	@Override
+	public void saveSmsConfig(String username, String password) {
+		ThirdParty thirdParty = new ThirdParty();
+		thirdParty.createConfig("smsUsername", username);
+		thirdpartyRepository.save(thirdParty);
+		thirdParty.createConfig("smsPassword", password);
+		thirdpartyRepository.save(thirdParty);
+
+	}
+
+	/**
+	 * 检查短信账号状态
+	 * 
+	 * @return
+	 */
+	@Override
+	public Boolean checkSmsAccountStatus(String account, String password) {
+
+		Boolean ret = false;
+		try {
+			String status = SendSMS.checkAccountStatus(account, password);
+			LOGGER.info("status: '{}'", status);
+			switch (status.trim()) {
+			case "1":
+				ret = true;// 正常
+				break;
+			default:
+				break;
+			}
+		} catch (Exception e) {
+
+		}
+		return ret;
+
+	}
+
 }
diff --git a/src/main/java/com/sectong/thirdparty/sms/SendSMS.java b/src/main/java/com/sectong/thirdparty/sms/SendSMS.java
index f4fc378..eae6401 100644
--- a/src/main/java/com/sectong/thirdparty/sms/SendSMS.java
+++ b/src/main/java/com/sectong/thirdparty/sms/SendSMS.java
@@ -12,19 +12,37 @@ import org.apache.commons.httpclient.URI;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.params.HttpClientParams;
 
-
+/**
+ * 
+ * @param url
+ *            应用地址，类似于http://ip:port/msg/
+ * @param account
+ *            账号
+ * @param pswd
+ *            密码
+ * @param mobile
+ *            手机号码，多个号码使用","分割
+ * @param msg
+ *            短信内容
+ * @param needstatus
+ *            是否需要状态报告，需要true，不需要false
+ * @return 返回值定义参见HTTP协议文档
+ * @throws Exception
+ */
+public class SendSMS {
 	/**
+	 * 群发短信
 	 * 
-	 * @param url 应用地址，类似于http://ip:port/msg/
-	 * @param account 账号
-	 * @param pswd 密码
-	 * @param mobile 手机号码，多个号码使用","分割
-	 * @param msg 短信内容
-	 * @param needstatus 是否需要状态报告，需要true，不需要false
-	 * @return 返回值定义参见HTTP协议文档
+	 * @param url
+	 * @param account
+	 * @param pswd
+	 * @param mobile
+	 * @param msg
+	 * @param needstatus
+	 * @param extno
+	 * @return
 	 * @throws Exception
 	 */
-	 public class SendSMS {
 	public static String batchSend(String url, String account, String pswd, String mobile, String msg,
 			boolean needstatus, String extno) throws Exception {
 		HttpClient client = new HttpClient(new HttpClientParams(), new SimpleHttpConnectionManager(true));
@@ -32,14 +50,10 @@ import org.apache.commons.httpclient.params.HttpClientParams;
 		try {
 			URI base = new URI(url, false);
 			method.setURI(new URI(base, "HttpBatchSendSM", false));
-			method.setQueryString(new NameValuePair[] { 
-					new NameValuePair("account", account),
-					new NameValuePair("pswd", pswd), 
-					new NameValuePair("mobile", mobile),
-					new NameValuePair("needstatus", String.valueOf(needstatus)), 
-					new NameValuePair("msg", msg),
-					new NameValuePair("extno", extno), 
-				});
+			method.setQueryString(new NameValuePair[] { new NameValuePair("account", account),
+					new NameValuePair("pswd", pswd), new NameValuePair("mobile", mobile),
+					new NameValuePair("needstatus", String.valueOf(needstatus)), new NameValuePair("msg", msg),
+					new NameValuePair("extno", extno), });
 			int result = client.executeMethod(method);
 			if (result == HttpStatus.SC_OK) {
 				InputStream in = method.getResponseBodyAsStream();
@@ -55,7 +69,43 @@ import org.apache.commons.httpclient.params.HttpClientParams;
 			}
 		} finally {
 			method.releaseConnection();
+		}
+	}
+
+	/**
+	 * 检查账号状态
+	 * 
+	 * @param account
+	 * @param password
+	 * @return
+	 * @throws Exception
+	 */
+	public static String checkAccountStatus(String account, String password) throws Exception {
+		String url = "http://erp.253.com/api/";// 应用地址
+		HttpClient client = new HttpClient(new HttpClientParams(), new SimpleHttpConnectionManager(true));
+		GetMethod method = new GetMethod();
+		try {
+
+			URI base = new URI(url, false);
+			method.setURI(new URI(base, "checkaccount", false));
+			method.setQueryString(new NameValuePair[] { new NameValuePair("did", "57"),
+					new NameValuePair("account", account), new NameValuePair("password", password), });
+			int result = client.executeMethod(method);
+			if (result == HttpStatus.SC_OK) {
+				InputStream in = method.getResponseBodyAsStream();
+				ByteArrayOutputStream baos = new ByteArrayOutputStream();
+				byte[] buffer = new byte[1024];
+				int len = 0;
+				while ((len = in.read(buffer)) != -1) {
+					baos.write(buffer, 0, len);
+				}
+				return URLDecoder.decode(baos.toString(), "UTF-8");
+			} else {
+				throw new Exception("HTTP ERROR Status: " + method.getStatusCode() + ":" + method.getStatusText());
 			}
+		} finally {
+			method.releaseConnection();
 		}
+	}
 
-	}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/resources/templates/admin/content/news.html b/src/main/resources/templates/admin/content/news.html
index 56ad6d9..d0299b6 100644
--- a/src/main/resources/templates/admin/content/news.html
+++ b/src/main/resources/templates/admin/content/news.html
@@ -9,22 +9,12 @@
 <body>
 	<div id="content" th:fragment="content">
 		<div class="container">
-			<!-- Breadcrumbs line -->
-			<div class="crumbs">
-				<ul id="breadcrumbs" class="breadcrumb">
-					<li><i class="icon-home"></i> <a href="/">仪表盘</a></li>
-					<li class="current">新闻管理</li>
-				</ul>
-
-			</div>
-			<!-- /Breadcrumbs line -->
 
 			<!--=== Page Header ===-->
 			<div class="page-header">
 				<div class="page-title">
-					<span th:inline="text">欢迎使用，[[${#httpServletRequest.remoteUser}]]!</span>
+					<h3>新闻管理</h3>
 				</div>
-
 			</div>
 			<!-- /Page Header -->
 
diff --git a/src/main/resources/templates/admin/content/thirdparty.html b/src/main/resources/templates/admin/content/thirdparty.html
new file mode 100644
index 0000000..c756f42
--- /dev/null
+++ b/src/main/resources/templates/admin/content/thirdparty.html
@@ -0,0 +1,119 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org"
+	xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity3">
+<head>
+<title>header</title>
+</head>
+
+<body>
+	<div id="content" th:fragment="content">
+		<div class="container">
+
+			<!--=== Page Header ===-->
+			<div class="page-header">
+				<div class="page-title">
+					<h3>第三方配置管理</h3>
+				</div>
+
+			</div>
+			<!-- /Page Header -->
+
+			<!--=== Page Content ===-->
+
+			<div class="row">
+				<div class="col-md-12">
+					<div class="widget box">
+						<div class="widget-header">
+							<h4>
+								<i class="icon-reorder"></i> 第三方配置
+							</h4>
+							<div class="toolbar no-padding">
+								<div class="btn-group">
+									<span class="btn btn-xs widget-collapse"><i
+										class="icon-angle-down"></i></span>
+								</div>
+							</div>
+						</div>
+						<div class="widget-content">
+							<div class="row">
+								<div class="col-md-6">
+									<!-- Tabs-->
+									<div class="tabbable tabbable-custom">
+										<ul class="nav nav-tabs">
+											<li class="active"><a href="#tab_1" data-toggle="tab">短信平台</a></li>
+											<li><a href="#tab_2" data-toggle="tab">推送平台</a></li>
+										</ul>
+										<div class="tab-content">
+											<div class="tab-pane active" id="tab_1">
+												<div th:if="${param.error} or ${error}"
+													class="alert alert-danger fade in">
+													<i class="icon-remove close" data-dismiss="alert"></i>
+													账号异常，请<a
+														href="http://cps.253.com/redirect/url?did=57&amp;rid=0&amp;jump=http://zz.253.com/site/register.html"
+														target="_blank">注册一个新账号</a>。
+												</div>
+												<div th:if="${param.ok}" class="alert alert-info fade in">
+													<i class="icon-remove close" data-dismiss="alert"></i>
+													账号增加正常。
+												</div>
+												<div th:if="${init}" class="alert alert-info fade in">
+													<i class="icon-remove close" data-dismiss="alert"></i>
+													请初始化短信平台账号。
+												</div>
+												<p>
+													请输入创蓝·253短信平台用户名密码，如果还没有账号，请<a
+														href="http://cps.253.com/redirect/url?did=57&amp;rid=0&amp;jump=http://zz.253.com/site/register.html"
+														target="_blank">注册一个</a>。
+												</p>
+												<form class="form-horizontal row-border" id="validate-1"
+													action="/admin/thirdpartysms" novalidate="novalidate"
+													method="post">
+													<div class="form-group">
+														<label class="col-md-3 control-label">用户名 <span
+															class="required">*</span></label>
+														<div class="col-md-9">
+															<input name="username" class="form-control" type="text"
+																th:value="${smsUsername}" />
+														</div>
+													</div>
+													<div class="form-group">
+														<label class="col-md-3 control-label">密码 <span
+															class="required">*</span></label>
+														<div class="col-md-9">
+															<input name="password" class="form-control" type="text"
+																th:value="${smsPassword}" />
+														</div>
+													</div>
+													<div class="form-actions">
+														<input value="确认" class="btn btn-primary pull-right"
+															type="submit" />
+													</div>
+												</form>
+											</div>
+											<div class="tab-pane" id="tab_2">
+												<p>I'm in Section 2.</p>
+											</div>
+										</div>
+									</div>
+									<!--END TABS-->
+								</div>
+
+							</div>
+							<!-- /.row -->
+						</div>
+						<!-- /.widget-content -->
+					</div>
+					<!-- /.widget .box -->
+				</div>
+			</div>
+
+			<!-- /.row -->
+			<!-- /Page Content -->
+		</div>
+		<!-- /.container -->
+
+	</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/admin/content/user.html b/src/main/resources/templates/admin/content/user.html
index dfefc75..3ad70a8 100644
--- a/src/main/resources/templates/admin/content/user.html
+++ b/src/main/resources/templates/admin/content/user.html
@@ -9,45 +9,12 @@
 <body>
 	<div id="content" th:fragment="content">
 		<div class="container">
-			<!-- Breadcrumbs line -->
-			<div class="crumbs">
-				<ul id="breadcrumbs" class="breadcrumb">
-					<li><i class="icon-home"></i> <a href="/">仪表盘</a></li>
-					<li class="current">用户管理
-					</li>
-				</ul>
-
-			</div>
-			<!-- /Breadcrumbs line -->
 
 			<!--=== Page Header ===-->
 			<div class="page-header">
 				<div class="page-title">
 					<h3>用户管理</h3>
-					<span th:inline="text">欢迎使用，[[${#httpServletRequest.remoteUser}]]!</span>
 				</div>
-
-				<!-- Page Stats -->
-				<ul class="page-stats">
-					<li>
-						<div class="summary">
-							<span>新订单</span>
-							<h3>17,561</h3>
-						</div>
-						<div id="sparkline-bar" class="graph sparkline hidden-xs">20,15,8,50,20,40,20,30,20,15,30,20,25,20</div>
-						<!-- Use instead of sparkline e.g. this:
-							<div class="graph circular-chart" data-percent="73">73%</div>
-							-->
-					</li>
-					<li>
-						<div class="summary">
-							<span>我的余额</span>
-							<h3>$21,561.21</h3>
-						</div>
-						<div id="sparkline-bar2" class="graph sparkline hidden-xs">20,15,8,50,20,40,20,30,20,15,30,20,25,20</div>
-					</li>
-				</ul>
-				<!-- /Page Stats -->
 			</div>
 			<!-- /Page Header -->
 
diff --git a/src/main/resources/templates/admin/layouts/sidebar.html b/src/main/resources/templates/admin/layouts/sidebar.html
index a822382..bde2bd8 100644
--- a/src/main/resources/templates/admin/layouts/sidebar.html
+++ b/src/main/resources/templates/admin/layouts/sidebar.html
@@ -33,6 +33,12 @@
 				<li th:class="${news} ? 'current' : ''"><a href="/admin/news"> <i
 						class="icon-list"></i> 新闻管理
 				</a></li>
+				<div class="sidebar-title">
+					<span>系统配置</span>
+				</div>
+				<li th:class="${thirdparty} ? 'current' : ''"><a href="/admin/thirdparty"> <i
+						class="icon-cogs"></i> 第三方配置
+				</a></li>
 				<div class="sidebar-title">
 					<span>API管理</span>
 				</div>
diff --git a/src/main/resources/templates/admin/thirdparty.html b/src/main/resources/templates/admin/thirdparty.html
new file mode 100644
index 0000000..e35ed87
--- /dev/null
+++ b/src/main/resources/templates/admin/thirdparty.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org"
+	xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity3">
+<head th:replace="admin/layouts/header :: header(title=第三方配置管理)">
+</head>
+<body>
+	<div th:replace="admin/layouts/top :: top">...</div>
+	<div id="container">
+		<div th:replace="admin/layouts/sidebar :: sidebar">...</div>
+		<div th:replace="admin/content/thirdparty :: content">...</div>
+	</div>
+</body>
+</html>
\ No newline at end of file
-- 
Gitee


From ff62c5bc9bc1d733d291588929829bfb0b5bad75 Mon Sep 17 00:00:00 2001
From: jiekechoo <jiekechoo@sectong.com>
Date: Mon, 14 Nov 2016 23:26:23 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=AA=E6=8E=A8APP-PUS?=
 =?UTF-8?q?H=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=9C=A8=E7=BA=BF=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=B5=8B=E8=AF=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  13 ++
 .../sectong/controller/AdminController.java   |  66 ++++++-
 .../com/sectong/service/AppPushService.java   |  11 ++
 .../sectong/service/AppPushServiceImpl.java   |  67 +++++++
 .../com/sectong/thirdparty/push/AppPush.java  |  43 ++++
 .../sectong/thirdparty/push/AppPushTest.java  |  48 +++++
 .../com/sectong/thirdparty/sms/SendSMS.java   |  17 +-
 src/main/resources/application.properties     |   2 +-
 .../templates/admin/content/thirdparty.html   | 185 +++++++++++++-----
 9 files changed, 389 insertions(+), 63 deletions(-)
 create mode 100644 src/main/java/com/sectong/service/AppPushService.java
 create mode 100644 src/main/java/com/sectong/service/AppPushServiceImpl.java
 create mode 100644 src/main/java/com/sectong/thirdparty/push/AppPush.java
 create mode 100644 src/main/java/com/sectong/thirdparty/push/AppPushTest.java

diff --git a/pom.xml b/pom.xml
index eb9770c..82e78de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,10 +72,23 @@
 			<version>3.1</version>
 		</dependency>
 
+	<!-- 个推sdk -->
+		<dependency>
+			<groupId>com.gexin.platform</groupId>
+			<artifactId>gexin-rp-sdk-http</artifactId>
+			<version>4.0.1.2</version>
+		</dependency>
+
 	</dependencies>
 
 	<!-- <repositories> <repository> <id>spring-releases</id> <url>https://repo.spring.io/libs-release</url> 
 		</repository> </repositories> -->
+	<repositories>
+		<repository>
+			<id>getui-nexus</id>
+			<url>http://mvn.gt.igexin.com/nexus/content/repositories/releases/</url>
+		</repository>
+	</repositories>
 
 	<build>
 		<plugins>
diff --git a/src/main/java/com/sectong/controller/AdminController.java b/src/main/java/com/sectong/controller/AdminController.java
index 8ed6a6e..12100be 100644
--- a/src/main/java/com/sectong/controller/AdminController.java
+++ b/src/main/java/com/sectong/controller/AdminController.java
@@ -1,7 +1,10 @@
 package com.sectong.controller;
 
+import java.io.IOException;
 import java.util.Date;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
@@ -16,8 +19,10 @@ import com.sectong.domain.User;
 import com.sectong.repository.NewsRepository;
 import com.sectong.repository.ThirdpartyRepository;
 import com.sectong.repository.UserRepository;
+import com.sectong.service.AppPushService;
 import com.sectong.service.SendSMSService;
 import com.sectong.service.UserService;
+import com.sectong.thirdparty.push.AppPush;
 
 /**
  * 后台管理控制器
@@ -29,20 +34,24 @@ import com.sectong.service.UserService;
 @PreAuthorize("hasRole('ROLE_ADMIN')")
 public class AdminController {
 
+	private static final Logger LOGGER = LoggerFactory.getLogger(AdminController.class);
+
 	private UserRepository userRepository;
 	private NewsRepository newsRepository;
 	private UserService userService;
 	private SendSMSService sendSMSService;
 	private ThirdpartyRepository thirdpartyRepository;
+	private AppPushService appPushService;;
 
 	@Autowired
 	public AdminController(NewsRepository newsRepository, UserRepository userRepository, UserService userService,
-			SendSMSService sendSMSService, ThirdpartyRepository thirdpartyRepository) {
+			SendSMSService sendSMSService, ThirdpartyRepository thirdpartyRepository, AppPushService appPushService) {
 		this.userRepository = userRepository;
 		this.newsRepository = newsRepository;
 		this.userService = userService;
 		this.sendSMSService = sendSMSService;
 		this.thirdpartyRepository = thirdpartyRepository;
+		this.appPushService = appPushService;
 	}
 
 	/**
@@ -158,7 +167,7 @@ public class AdminController {
 	@GetMapping("/admin/thirdparty")
 	public String thirdparty(Model model) {
 		model.addAttribute("thirdparty", true);
-		String smsUsername = null, smsPassword = null;
+		String smsUsername = null, smsPassword = null, pushAppID = null, pushAppKey = null, pushMasterSecret = null;
 		try {
 			smsUsername = thirdpartyRepository.findOne("smsUsername").getValue();
 		} catch (Exception e) {
@@ -170,6 +179,24 @@ public class AdminController {
 			// TODO: handle exception
 		}
 
+		try {
+			pushAppID = thirdpartyRepository.findOne("pushAppID").getValue();
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
+
+		try {
+			pushAppKey = thirdpartyRepository.findOne("pushAppKey").getValue();
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
+
+		try {
+			pushMasterSecret = thirdpartyRepository.findOne("pushMasterSecret").getValue();
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
+
 		if (!sendSMSService.checkSmsAccountStatus(smsUsername, smsPassword)) {
 			model.addAttribute("error", true);// 状态不正常
 		}
@@ -177,8 +204,15 @@ public class AdminController {
 			model.addAttribute("init", true);// 第一次初始化
 			model.addAttribute("error", false);
 		}
+
+		if (pushAppID == null && pushAppKey == null && pushMasterSecret == null) {
+			model.addAttribute("initpush", true);// 第一次初始化
+		}
 		model.addAttribute("smsUsername", smsUsername);
 		model.addAttribute("smsPassword", smsPassword);
+		model.addAttribute("pushAppID", pushAppID);
+		model.addAttribute("pushAppKey", pushAppKey);
+		model.addAttribute("pushMasterSecret", pushMasterSecret);
 		return "admin/thirdparty";
 	}
 
@@ -199,4 +233,32 @@ public class AdminController {
 		}
 
 	}
+
+	/**
+	 * 提交推送平台信息
+	 * 
+	 * @param appID
+	 * @param appKey
+	 * @param masterSecret
+	 * @return
+	 */
+	@PostMapping("/admin/thirdpartypush")
+	public String thirdPartyPush(@RequestParam String pushAppID, @RequestParam String pushAppKey,
+			@RequestParam String pushMasterSecret) {
+		appPushService.savePushConfig(pushAppID, pushAppKey, pushMasterSecret);
+
+		return "redirect:/admin/thirdparty?pok#push";
+	}
+
+	@PostMapping("/admin/thirdpartypushtest")
+	public String thirdPartyPushTest(@RequestParam String title, @RequestParam String text,
+			@RequestParam String openUrl) throws IOException {
+		if (appPushService.sendPushMsg(title, text, openUrl)) {
+			return "redirect:/admin/thirdparty?testok#push";
+		}else {
+			return "redirect:/admin/thirdparty?testerror#push";
+		}
+		
+
+	}
 }
diff --git a/src/main/java/com/sectong/service/AppPushService.java b/src/main/java/com/sectong/service/AppPushService.java
new file mode 100644
index 0000000..c56d844
--- /dev/null
+++ b/src/main/java/com/sectong/service/AppPushService.java
@@ -0,0 +1,11 @@
+package com.sectong.service;
+
+import java.io.IOException;
+
+public interface AppPushService {
+
+	void savePushConfig(String appID, String appKey, String masterSecret);
+
+	Boolean sendPushMsg(String title, String text, String openUrl) throws IOException;
+
+}
diff --git a/src/main/java/com/sectong/service/AppPushServiceImpl.java b/src/main/java/com/sectong/service/AppPushServiceImpl.java
new file mode 100644
index 0000000..f9cb550
--- /dev/null
+++ b/src/main/java/com/sectong/service/AppPushServiceImpl.java
@@ -0,0 +1,67 @@
+package com.sectong.service;
+
+import java.io.IOException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.sectong.domain.ThirdParty;
+import com.sectong.repository.ThirdpartyRepository;
+import com.sectong.thirdparty.push.AppPush;
+
+@Service
+public class AppPushServiceImpl implements AppPushService {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(AppPushServiceImpl.class);
+
+	private ThirdpartyRepository thirdpartyRepository;
+
+	@Autowired
+	public AppPushServiceImpl(ThirdpartyRepository thirdpartyRepository) {
+		this.thirdpartyRepository = thirdpartyRepository;
+	}
+
+	@Override
+	public void savePushConfig(String appID, String appKey, String masterSecret) {
+		ThirdParty thirdParty = new ThirdParty();
+		thirdParty.createConfig("pushAppID", appID);
+		thirdpartyRepository.save(thirdParty);
+		thirdParty.createConfig("pushAppKey", appKey);
+		thirdpartyRepository.save(thirdParty);
+		thirdParty.createConfig("pushMasterSecret", masterSecret);
+		thirdpartyRepository.save(thirdParty);
+
+	}
+
+	/**
+	 * 发送测试推送信息
+	 * 
+	 * @param title
+	 * @param text
+	 * @param openUrl
+	 * @return
+	 * @throws IOException
+	 */
+	@Override
+	public Boolean sendPushMsg(String title, String text, String openUrl) throws IOException {
+
+		Boolean ret = false;
+
+		String pushAppID = null, pushAppKey = null, pushMasterSecret = null;
+		try {
+			pushAppID = thirdpartyRepository.findOne("pushAppID").getValue();
+			pushAppKey = thirdpartyRepository.findOne("pushAppKey").getValue();
+			pushMasterSecret = thirdpartyRepository.findOne("pushMasterSecret").getValue();
+			ret = true;
+			LOGGER.info("appID: {}, appKey: {}, masterSecret: {}", pushAppID, pushAppKey, pushMasterSecret);
+			AppPush.SendAppPush(pushAppID, pushAppKey, pushMasterSecret, title, text, openUrl);
+			ret = true;
+		} catch (Exception e) {
+			ret = false;
+		}
+		return ret;
+	}
+
+}
diff --git a/src/main/java/com/sectong/thirdparty/push/AppPush.java b/src/main/java/com/sectong/thirdparty/push/AppPush.java
new file mode 100644
index 0000000..22266c5
--- /dev/null
+++ b/src/main/java/com/sectong/thirdparty/push/AppPush.java
@@ -0,0 +1,43 @@
+package com.sectong.thirdparty.push;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.gexin.rp.sdk.base.IPushResult;
+import com.gexin.rp.sdk.base.impl.AppMessage;
+import com.gexin.rp.sdk.http.IGtPush;
+import com.gexin.rp.sdk.template.LinkTemplate;
+
+public class AppPush {
+
+	private static String url = "http://sdk.open.api.igexin.com/apiex.htm";// 推送服务器地址
+
+	public static void SendAppPush(String appId, String appKey, String masterSecret, String title, String text,
+			String openUrl) throws IOException {
+
+		IGtPush push = new IGtPush(url, appKey, masterSecret);
+		push.connect();
+
+		// 定义"点击链接打开通知模板"，并设置标题、内容、链接
+		LinkTemplate template = new LinkTemplate();
+		template.setAppId(appId);
+		template.setAppkey(appKey);
+		template.setTitle(title);
+		template.setText(text);
+		template.setUrl(openUrl);
+
+		List<String> appIds = new ArrayList<String>();
+		appIds.add(appId);
+
+		// 定义"AppMessage"类型消息对象，设置消息内容模板、发送的目标App列表、是否支持离线发送、以及离线消息有效期(单位毫秒)
+		AppMessage message = new AppMessage();
+		message.setData(template);
+		message.setAppIdList(appIds);
+		message.setOffline(true);
+		message.setOfflineExpireTime(1000 * 600);
+
+		IPushResult ret = push.pushMessageToApp(message);
+		System.out.println(ret.getResponse().toString());
+	}
+}
diff --git a/src/main/java/com/sectong/thirdparty/push/AppPushTest.java b/src/main/java/com/sectong/thirdparty/push/AppPushTest.java
new file mode 100644
index 0000000..c82fdfc
--- /dev/null
+++ b/src/main/java/com/sectong/thirdparty/push/AppPushTest.java
@@ -0,0 +1,48 @@
+package com.sectong.thirdparty.push;
+
+
+import com.gexin.rp.sdk.base.IPushResult;
+import com.gexin.rp.sdk.base.impl.AppMessage;
+import com.gexin.rp.sdk.http.IGtPush;
+import com.gexin.rp.sdk.template.LinkTemplate;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class AppPushTest {
+
+    //定义常量, appId、appKey、masterSecret 采用本文档 "第二步 获取访问凭证 "中获得的应用配置
+    private static String appId = "1dEURGOBQc9qLn423WOXL";
+    private static String appKey = "nYFEUxlXL7AmWCm1UvqOs";
+    private static String masterSecret = "DzJsgmcj1wArGiaY4Ntob7";
+    private static String url = "http://sdk.open.api.igexin.com/apiex.htm";
+
+    public static void main(String[] args) throws IOException {
+
+        IGtPush push = new IGtPush(url, appKey, masterSecret);
+        push.connect();
+
+        // 定义"点击链接打开通知模板"，并设置标题、内容、链接
+        LinkTemplate template = new LinkTemplate();
+        template.setAppId(appId);
+        template.setAppkey(appKey);
+        template.setTitle("欢迎使用移动易!");
+        template.setText("这是一条测试推送消息");
+        template.setUrl("http://www.mobileeasy.cc");
+
+        List<String> appIds = new ArrayList<String>();
+        appIds.add(appId);
+
+        // 定义"AppMessage"类型消息对象，设置消息内容模板、发送的目标App列表、是否支持离线发送、以及离线消息有效期(单位毫秒)
+        AppMessage message = new AppMessage();
+        message.setData(template);
+        message.setAppIdList(appIds);
+        message.setOffline(true);
+        message.setOfflineExpireTime(1000 * 600);
+
+        IPushResult ret = push.pushMessageToApp(message);
+        System.out.println(ret.getResponse().toString());
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/sectong/thirdparty/sms/SendSMS.java b/src/main/java/com/sectong/thirdparty/sms/SendSMS.java
index eae6401..7ebd517 100644
--- a/src/main/java/com/sectong/thirdparty/sms/SendSMS.java
+++ b/src/main/java/com/sectong/thirdparty/sms/SendSMS.java
@@ -13,21 +13,10 @@ import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.params.HttpClientParams;
 
 /**
+ * 短信平台
  * 
- * @param url
- *            应用地址，类似于http://ip:port/msg/
- * @param account
- *            账号
- * @param pswd
- *            密码
- * @param mobile
- *            手机号码，多个号码使用","分割
- * @param msg
- *            短信内容
- * @param needstatus
- *            是否需要状态报告，需要true，不需要false
- * @return 返回值定义参见HTTP协议文档
- * @throws Exception
+ * @author jiekechoo
+ *
  */
 public class SendSMS {
 	/**
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 4071d28..0950ebb 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -4,7 +4,7 @@ spring.datasource.test-on-borrow=true
 
 #日志文件设置
 logging.level.*=DEBUG
-logging.file=/logs/server.log
+logging.file=/tmp/logs/server.log
 
 image.file.upload.dir=static/upload/
 
diff --git a/src/main/resources/templates/admin/content/thirdparty.html b/src/main/resources/templates/admin/content/thirdparty.html
index c756f42..cb80cf4 100644
--- a/src/main/resources/templates/admin/content/thirdparty.html
+++ b/src/main/resources/templates/admin/content/thirdparty.html
@@ -37,62 +37,155 @@
 						</div>
 						<div class="widget-content">
 							<div class="row">
-								<div class="col-md-6">
+								<div class="col-md-12">
 									<!-- Tabs-->
 									<div class="tabbable tabbable-custom">
 										<ul class="nav nav-tabs">
-											<li class="active"><a href="#tab_1" data-toggle="tab">短信平台</a></li>
-											<li><a href="#tab_2" data-toggle="tab">推送平台</a></li>
+											<li class="active"><a href="#sms" data-toggle="tab">短信平台</a></li>
+											<li><a href="#push" data-toggle="tab">推送平台</a></li>
 										</ul>
 										<div class="tab-content">
-											<div class="tab-pane active" id="tab_1">
-												<div th:if="${param.error} or ${error}"
-													class="alert alert-danger fade in">
-													<i class="icon-remove close" data-dismiss="alert"></i>
-													账号异常，请<a
-														href="http://cps.253.com/redirect/url?did=57&amp;rid=0&amp;jump=http://zz.253.com/site/register.html"
-														target="_blank">注册一个新账号</a>。
-												</div>
-												<div th:if="${param.ok}" class="alert alert-info fade in">
-													<i class="icon-remove close" data-dismiss="alert"></i>
-													账号增加正常。
-												</div>
-												<div th:if="${init}" class="alert alert-info fade in">
-													<i class="icon-remove close" data-dismiss="alert"></i>
-													请初始化短信平台账号。
-												</div>
-												<p>
-													请输入创蓝·253短信平台用户名密码，如果还没有账号，请<a
-														href="http://cps.253.com/redirect/url?did=57&amp;rid=0&amp;jump=http://zz.253.com/site/register.html"
-														target="_blank">注册一个</a>。
-												</p>
-												<form class="form-horizontal row-border" id="validate-1"
-													action="/admin/thirdpartysms" novalidate="novalidate"
-													method="post">
-													<div class="form-group">
-														<label class="col-md-3 control-label">用户名 <span
-															class="required">*</span></label>
-														<div class="col-md-9">
-															<input name="username" class="form-control" type="text"
-																th:value="${smsUsername}" />
+
+											<div class="tab-pane active" id="sms">
+												<div class="col-md-6">
+													<div th:if="${param.error} or ${error}"
+														class="alert alert-danger fade in">
+														<i class="icon-remove close" data-dismiss="alert"></i>
+														账号异常，请<a
+															href="http://cps.253.com/redirect/url?did=57&amp;rid=0&amp;jump=http://zz.253.com/site/register.html"
+															target="_blank">注册一个新账号</a>。
+													</div>
+													<div th:if="${param.ok}" class="alert alert-info fade in">
+														<i class="icon-remove close" data-dismiss="alert"></i>
+														账号增加正常。
+													</div>
+													<div th:if="${init}" class="alert alert-danger fade in">
+														<i class="icon-remove close" data-dismiss="alert"></i>
+														请初始化短信平台账号。
+													</div>
+													<p>
+														请输入创蓝·253短信平台用户名密码，如果还没有账号，请<a
+															href="http://cps.253.com/redirect/url?did=57&amp;rid=0&amp;jump=http://zz.253.com/site/register.html"
+															target="_blank">注册一个</a>。
+													</p>
+													<form class="form-horizontal row-border"
+														action="/admin/thirdpartysms" method="post">
+														<div class="form-group">
+															<label class="col-md-3 control-label">用户名 <span
+																class="required">*</span></label>
+															<div class="col-md-9">
+																<input name="username" class="form-control" type="text"
+																	th:value="${smsUsername}" />
+															</div>
+														</div>
+														<div class="form-group">
+															<label class="col-md-3 control-label">密码 <span
+																class="required">*</span></label>
+															<div class="col-md-9">
+																<input name="password" class="form-control" type="text"
+																	th:value="${smsPassword}" />
+															</div>
+														</div>
+														<div class="form-actions">
+															<input value="确认" class="btn btn-primary pull-right"
+																type="submit" />
 														</div>
+													</form>
+												</div>
+											</div>
+
+											<div class="tab-pane" id="push">
+												<div class="col-md-6">
+													<div th:if="${param.pok}" class="alert alert-info fade in">
+														<i class="icon-remove close" data-dismiss="alert"></i>
+														推送账号增加正常。
 													</div>
-													<div class="form-group">
-														<label class="col-md-3 control-label">密码 <span
-															class="required">*</span></label>
-														<div class="col-md-9">
-															<input name="password" class="form-control" type="text"
-																th:value="${smsPassword}" />
+													<div th:if="${initpush}" class="alert alert-danger fade in">
+														<i class="icon-remove close" data-dismiss="alert"></i>
+														请初始化推送平台账号。
+													</div>
+													<p>请输入个推平台信息，如果还没有账号，请注册一个。</p>
+													<form class="form-horizontal row-border"
+														action="/admin/thirdpartypush" method="post">
+														<div class="form-group">
+															<label class="col-md-3 control-label">AppID <span
+																class="required">*</span></label>
+															<div class="col-md-9">
+																<input name="pushAppID" class="form-control" type="text"
+																	th:value="${pushAppID}" />
+															</div>
+														</div>
+														<div class="form-group">
+															<label class="col-md-3 control-label">AppKey <span
+																class="required">*</span></label>
+															<div class="col-md-9">
+																<input name="pushAppKey" class="form-control"
+																	type="text" th:value="${pushAppKey}" />
+															</div>
+														</div>
+														<div class="form-group">
+															<label class="col-md-3 control-label">MasterSecret
+																<span class="required">*</span>
+															</label>
+															<div class="col-md-9">
+																<input name="pushMasterSecret" class="form-control"
+																	type="text" th:value="${pushMasterSecret}" />
+															</div>
 														</div>
+														<div class="form-actions">
+															<input value="确认" class="btn btn-primary pull-right"
+																type="submit" />
+														</div>
+													</form>
+												</div>
+
+												<div class="col-md-6">
+													<div th:if="${param.testok}"
+														class="alert alert-info fade in">
+														<i class="icon-remove close" data-dismiss="alert"></i>
+														推送测试发送成功。
 													</div>
-													<div class="form-actions">
-														<input value="确认" class="btn btn-primary pull-right"
-															type="submit" />
+													<div th:if="${param.testerror}"
+														class="alert alert-warning fade in">
+														<i class="icon-remove close" data-dismiss="alert"></i>
+														推送测试发送失败。
 													</div>
-												</form>
-											</div>
-											<div class="tab-pane" id="tab_2">
-												<p>I'm in Section 2.</p>
+													<p class="center">测试推送</p>
+													<form class="form-horizontal row-border"
+														action="/admin/thirdpartypushtest" method="post">
+														<div class="form-group">
+															<label class="col-md-3 control-label">标题 <span
+																class="required">*</span>
+															</label>
+															<div class="col-md-9">
+																<input name="title" class="form-control" type="text"
+																	value="移动易" />
+															</div>
+														</div>
+														<div class="form-group">
+															<label class="col-md-3 control-label">内容 <span
+																class="required">*</span>
+															</label>
+															<div class="col-md-9">
+																<input name="text" class="form-control" type="text"
+																	value="移动易开源APP组合套件" />
+															</div>
+														</div>
+														<div class="form-group">
+															<label class="col-md-3 control-label">打开链接 <span
+																class="required">*</span>
+															</label>
+															<div class="col-md-9">
+																<input name="openUrl" class="form-control" type="text"
+																	value="http://www.mobileeasy.cc" />
+															</div>
+														</div>
+														<div class="form-actions">
+															<input value="发送测试" class="btn btn-warning pull-right"
+																type="submit" />
+														</div>
+													</form>
+												</div>
 											</div>
 										</div>
 									</div>
-- 
Gitee


From 3a5dfcae4c0b4857350a5f56e6a008ec5c09a9a2 Mon Sep 17 00:00:00 2001
From: jiekechoo <jiekechoo@sectong.com>
Date: Sat, 19 Nov 2016 10:58:55 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Controller=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/sectong/controller/AdminController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/sectong/controller/AdminController.java b/src/main/java/com/sectong/controller/AdminController.java
index 12100be..49a022e 100644
--- a/src/main/java/com/sectong/controller/AdminController.java
+++ b/src/main/java/com/sectong/controller/AdminController.java
@@ -22,7 +22,6 @@ import com.sectong.repository.UserRepository;
 import com.sectong.service.AppPushService;
 import com.sectong.service.SendSMSService;
 import com.sectong.service.UserService;
-import com.sectong.thirdparty.push.AppPush;
 
 /**
  * 后台管理控制器
@@ -65,6 +64,7 @@ public class AdminController {
 		model.addAttribute("dashboard", true);
 		model.addAttribute("userscount", userRepository.count());
 		model.addAttribute("newscount", newsRepository.count());
+		LOGGER.info("access admin /");
 		return "admin/index";
 	}
 
-- 
Gitee


From 90c78dc3cd412b8cbaa791c238f07ad61a2cbb6a Mon Sep 17 00:00:00 2001
From: jiekechoo <jiekechoo@sectong.com>
Date: Sat, 19 Nov 2016 11:01:10 +0800
Subject: [PATCH 6/6] v0.2.0 release

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 82e78de..b7f2883 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.sectong</groupId>
 	<artifactId>yidongyi</artifactId>
-	<version>0.2.0-SNAPSHOT</version>
+	<version>0.2.0</version>
 	<packaging>jar</packaging>
 
 	<name>yidongyi</name>
-- 
Gitee