Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT.git

albertshaw 8 years ago
parent
commit
23fbe47bb8
44 changed files with 197 additions and 154 deletions
  1. 6 6
      src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java
  2. 3 2
      src/main/java/com/goafanti/cognizance/bo/CognizanceBo.java
  3. 3 1
      src/main/java/com/goafanti/cognizance/bo/CultivationListBo.java
  4. 3 3
      src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java
  5. 3 2
      src/main/java/com/goafanti/cognizance/service/impl/OrgActivityCostServiceImpl.java
  6. 3 2
      src/main/java/com/goafanti/cognizance/service/impl/OrgActivityServiceImpl.java
  7. 3 2
      src/main/java/com/goafanti/cognizance/service/impl/OrgAnnualReportServiceImpl.java
  8. 70 58
      src/main/java/com/goafanti/common/controller/PublicController.java
  9. 2 1
      src/main/java/com/goafanti/common/model/Admin.java
  10. 2 1
      src/main/java/com/goafanti/common/model/Notice.java
  11. 3 2
      src/main/java/com/goafanti/common/model/OrgActivity.java
  12. 4 3
      src/main/java/com/goafanti/common/model/OrgActivityCost.java
  13. 3 2
      src/main/java/com/goafanti/common/model/OrgAnnualReport.java
  14. 4 3
      src/main/java/com/goafanti/common/model/OrgCognizance.java
  15. 2 1
      src/main/java/com/goafanti/common/model/OrgCognizanceLog.java
  16. 2 1
      src/main/java/com/goafanti/common/model/OrgHonorDatum.java
  17. 2 1
      src/main/java/com/goafanti/common/model/OrgIntellectualProperty.java
  18. 2 1
      src/main/java/com/goafanti/common/model/OrgStandard.java
  19. 2 1
      src/main/java/com/goafanti/common/model/OrgTechCenter.java
  20. 1 1
      src/main/java/com/goafanti/common/model/OrgTechCenterDetail.java
  21. 4 3
      src/main/java/com/goafanti/common/model/OrganizationIdentity.java
  22. 4 3
      src/main/java/com/goafanti/common/model/PatentInfo.java
  23. 2 1
      src/main/java/com/goafanti/common/model/PatentLog.java
  24. 2 1
      src/main/java/com/goafanti/common/model/UserIdentity.java
  25. 4 3
      src/main/java/com/goafanti/copyright/bo/CopyrightInfoSummary.java
  26. 1 1
      src/main/java/com/goafanti/copyright/controller/CopyrightApiController.java
  27. 0 8
      src/main/java/com/goafanti/core/shiro/filter/LoginFilter.java
  28. 3 1
      src/main/java/com/goafanti/patent/bo/PatentApplicationFeeBo.java
  29. 4 3
      src/main/java/com/goafanti/patent/bo/PatentCompositeBo.java
  30. 5 3
      src/main/java/com/goafanti/patent/bo/PatentManageListBo.java
  31. 3 1
      src/main/java/com/goafanti/patent/bo/PatentNoticeOfCorrectionBo.java
  32. 3 1
      src/main/java/com/goafanti/patent/bo/PatentPendingBo.java
  33. 8 6
      src/main/java/com/goafanti/patent/bo/PatentRecieveSendBo.java
  34. 1 1
      src/main/java/com/goafanti/patent/controller/PatentApiController.java
  35. 2 2
      src/main/java/com/goafanti/patent/service/impl/PatentCostServiceImpl.java
  36. 4 4
      src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java
  37. 5 3
      src/main/java/com/goafanti/techproject/bo/TechProjectClientListBo.java
  38. 1 1
      src/main/java/com/goafanti/techproject/controller/TechProjectApiController.java
  39. 3 1
      src/main/java/com/goafanti/user/bo/OrgListBo.java
  40. 3 1
      src/main/java/com/goafanti/user/bo/UserListBo.java
  41. 2 1
      src/main/java/com/goafanti/user/controller/UserApiController.java
  42. 3 3
      src/main/java/com/goafanti/user/controller/UserRegisterController.java
  43. 7 6
      src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java
  44. 0 2
      src/main/resources/shiro_base_auth.ini

+ 6 - 6
src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java

@@ -888,31 +888,31 @@ public class AdminPatentApiController extends CertifyApiController {
 		try {
 			if (!StringUtils.isBlank(patentRegistrationBo.getAcceptanceIssueTime())) {
 				patentRegistration.setAcceptanceIssueTime(
-						DateUtils.parseDate(patentRegistrationBo.getAcceptanceIssueTime(), "yyyy-MM-dd"));
+						DateUtils.parseDate(patentRegistrationBo.getAcceptanceIssueTime(), AFTConstants.YYYYMMDD));
 			}
 			if (!StringUtils.isBlank(patentRegistrationBo.getAcceptanceReceiveTime())) {
 				patentRegistration.setAcceptanceReceiveTime(
-						DateUtils.parseDate(patentRegistrationBo.getAcceptanceReceiveTime(), "yyyy-MM-dd"));
+						DateUtils.parseDate(patentRegistrationBo.getAcceptanceReceiveTime(), AFTConstants.YYYYMMDD));
 			}
 			patentRegistration.setAcceptanceTrackingNumber(patentRegistrationBo.getAcceptanceTrackingNumber());
 			patentRegistration.setAuthorizationExpressCompany(patentRegistrationBo.getAuthorizationExpressCompany());
 			if (!StringUtils.isBlank(patentRegistrationBo.getAuthorizationIssueTime())) {
 				patentRegistration.setAuthorizationIssueTime(
-						DateUtils.parseDate(patentRegistrationBo.getAuthorizationIssueTime(), "yyyy-MM-dd"));
+						DateUtils.parseDate(patentRegistrationBo.getAuthorizationIssueTime(), AFTConstants.YYYYMMDD));
 			}
 			if (!StringUtils.isBlank(patentRegistrationBo.getAuthorizationReceiveTime())) {
 				patentRegistration.setAuthorizationReceiveTime(
-						DateUtils.parseDate(patentRegistrationBo.getAuthorizationReceiveTime(), "yyyy-MM-dd"));
+						DateUtils.parseDate(patentRegistrationBo.getAuthorizationReceiveTime(), AFTConstants.YYYYMMDD));
 			}
 			patentRegistration.setAuthorizationTrackingNumber(patentRegistrationBo.getAuthorizationTrackingNumber());
 			patentRegistration.setCertificateExpressCompany(patentRegistrationBo.getCertificateExpressCompany());
 			if (!StringUtils.isBlank(patentRegistrationBo.getCertificateIssueTime())) {
 				patentRegistration.setCertificateIssueTime(
-						DateUtils.parseDate(patentRegistrationBo.getCertificateIssueTime(), "yyyy-MM-dd"));
+						DateUtils.parseDate(patentRegistrationBo.getCertificateIssueTime(), AFTConstants.YYYYMMDD));
 			}
 			if (!StringUtils.isBlank(patentRegistrationBo.getCertificateRecieveTime())) {
 				patentRegistration.setCertificateRecieveTime(
-						DateUtils.parseDate(patentRegistrationBo.getCertificateRecieveTime(), "yyyy-MM-dd"));
+						DateUtils.parseDate(patentRegistrationBo.getCertificateRecieveTime(), AFTConstants.YYYYMMDD));
 			}
 		} catch (ParseException e) {
 		}

+ 3 - 2
src/main/java/com/goafanti/cognizance/bo/CognizanceBo.java

@@ -6,6 +6,7 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+import com.goafanti.common.constant.AFTConstants;
 
 public class CognizanceBo {
 	private String uid;
@@ -175,7 +176,7 @@ public class CognizanceBo {
 			if (this.createTime == null) {
 				return null;
 			} else {
-				return DateFormatUtils.format(this.getCreateTime(), "yyyy-MM-dd");
+				return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
 			}
 		}
 		
@@ -188,7 +189,7 @@ public class CognizanceBo {
 			if (this.issuingDate == null) {
 				return null;
 			} else {
-				return DateFormatUtils.format(this.getCreateTime(), "yyyy-MM-dd");
+				return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
 			}
 		}
 		

+ 3 - 1
src/main/java/com/goafanti/cognizance/bo/CultivationListBo.java

@@ -4,6 +4,8 @@ import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
+import com.goafanti.common.constant.AFTConstants;
+
 /**
  * 高企培育ListBo
  */
@@ -114,7 +116,7 @@ public class CultivationListBo {
 		if (this.issuingDate == null) {
 			 return null;
 		   } else {
-			 return DateFormatUtils.format(this.getIssuingDate(), "yyyy-MM-dd");
+			 return DateFormatUtils.format(this.getIssuingDate(), AFTConstants.YYYYMMDD);
 		   }
 	}
 		

+ 3 - 3
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -90,7 +90,7 @@ import com.goafanti.user.service.OrganizationIdentityService;
 import com.goafanti.user.service.UserService;
 
 @Controller
-@RequestMapping(value = "/techservice/cognizance")
+@RequestMapping(value = "/api/user/cognizance")
 public class CognizanceApiController extends CertifyApiController {
 	@Resource
 	private UserService						userService;
@@ -267,7 +267,7 @@ public class CognizanceApiController extends CertifyApiController {
 		}
 
 		if (!StringUtils.isBlank(signDateFormattedDate)) {
-			orgActivityCost.setSignDate(DateUtils.parseDate(signDateFormattedDate, "yyyy-MM-dd"));
+			orgActivityCost.setSignDate(DateUtils.parseDate(signDateFormattedDate, AFTConstants.YYYYMMDD));
 		}
 
 		OrgActivityCost oac = new OrgActivityCost();
@@ -391,7 +391,7 @@ public class CognizanceApiController extends CertifyApiController {
 		if (!StringUtils.isBlank(authorizationDateFormattedDate)) {
 			try {
 				orgIntellectualProperty
-						.setAuthorizationDate(DateUtils.parseDate(authorizationDateFormattedDate, "yyyy-MM-dd"));
+						.setAuthorizationDate(DateUtils.parseDate(authorizationDateFormattedDate, AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
 			}
 		}

+ 3 - 2
src/main/java/com/goafanti/cognizance/service/impl/OrgActivityCostServiceImpl.java

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.cognizance.service.OrgActivityCostService;
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.OrgActivityCostMapper;
 import com.goafanti.common.model.OrgActivityCost;
 import com.goafanti.common.utils.DateUtils;
@@ -35,12 +36,12 @@ public class OrgActivityCostServiceImpl extends BaseMybatisDao<OrgActivityCostMa
 		}
 		
 		if (!StringUtils.isBlank(sDate)){
-			startDate = DateUtils.parseDate(sDate, "yyyy-MM-dd");
+			startDate = DateUtils.parseDate(sDate, AFTConstants.YYYYMMDD);
 			params.put("startDate", startDate);
 		}
 		
 		if (!StringUtils.isBlank(eDate)){
-			endDate = DateUtils.addDays(DateUtils.parseDate(eDate, "yyyy-MM-dd"), 1);
+			endDate = DateUtils.addDays(DateUtils.parseDate(eDate, AFTConstants.YYYYMMDD), 1);
 			params.put("endDate", endDate);
 		}
 		

+ 3 - 2
src/main/java/com/goafanti/cognizance/service/impl/OrgActivityServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 
 import com.goafanti.cognizance.bo.ActivityNumberBo;
 import com.goafanti.cognizance.service.OrgActivityService;
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.OrgActivityCostMapper;
 import com.goafanti.common.dao.OrgActivityMapper;
 import com.goafanti.common.model.OrgActivity;
@@ -44,12 +45,12 @@ public class OrgActivityServiceImpl extends BaseMybatisDao<OrgActivityMapper> im
 		}
 		
 		if (!StringUtils.isBlank(sDate)){
-			startDate = DateUtils.parseDate(sDate, "yyyy-MM-dd");
+			startDate = DateUtils.parseDate(sDate, AFTConstants.YYYYMMDD);
 			params.put("startDate", startDate);
 		}
 		
 		if (!StringUtils.isBlank(eDate)){
-			endDate = DateUtils.addDays(DateUtils.parseDate(eDate, "yyyy-MM-dd"), 1);
+			endDate = DateUtils.addDays(DateUtils.parseDate(eDate, AFTConstants.YYYYMMDD), 1);
 			params.put("endDate", endDate);
 		}
 		

+ 3 - 2
src/main/java/com/goafanti/cognizance/service/impl/OrgAnnualReportServiceImpl.java

@@ -14,6 +14,7 @@ import com.goafanti.cognizance.bo.AnnualReportBo;
 import com.goafanti.cognizance.bo.AnnualReportMainBo;
 import com.goafanti.cognizance.bo.AnnualReportPropertyRightBo;
 import com.goafanti.cognizance.service.OrgAnnualReportService;
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.OrgAnnualReportMapper;
 import com.goafanti.common.model.OrgAnnualReport;
 import com.goafanti.core.mybatis.BaseMybatisDao;
@@ -121,7 +122,7 @@ public class OrgAnnualReportServiceImpl extends BaseMybatisDao<OrgAnnualReportMa
 			report.setLocationArea(m.getLocationArea());
 			report.setListed(m.getListed().toString());
 			if (null != m.getListedDate()) {
-				report.setListedDate(DateFormatUtils.format(m.getListedDate(), "yyyy-MM-dd"));
+				report.setListedDate(DateFormatUtils.format(m.getListedDate(), AFTConstants.YYYYMMDD));
 			}
 			report.setListedType(m.getListedType().toString());
 			report.setStockCode(m.getStockCode());
@@ -134,7 +135,7 @@ public class OrgAnnualReportServiceImpl extends BaseMybatisDao<OrgAnnualReportMa
 			report.setNetAsset(null == m.getNetAsset() ? new BigDecimal(0) : m.getNetAsset());
 			report.setCertificateNumber(m.getCertificateNumber());
 			if (null != m.getIssuingDate()) {
-				report.setIssuingDate(DateFormatUtils.format(m.getIssuingDate(), "yyyy-MM-dd"));
+				report.setIssuingDate(DateFormatUtils.format(m.getIssuingDate(), AFTConstants.YYYYMMDD));
 			}
 			report.setContacts(m.getContacts());
 			report.setResearchCost(null == m.getResearchCost() ? new BigDecimal(0) : m.getResearchCost());

+ 70 - 58
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -42,27 +42,25 @@ import com.goafanti.user.service.UserService;
 @RequestMapping("/open")
 public class PublicController extends BaseController {
 	@Value(value = "${accessKey}")
-	private String	accessKey			= null;
+	private String			accessKey			= null;
 
 	@Value(value = "${accessSecret}")
-	private String	accessSecret		= null;
+	private String			accessSecret		= null;
 
 	@Value(value = "${upload.path}")
-	private String	uploadPath			= null;
+	private String			uploadPath			= null;
 
 	@Value(value = "${upload.private.path}")
-	private String	uploadPrivatePath	= null;
+	private String			uploadPrivatePath	= null;
 
 	@Value(value = "${static.host}")
-	private String	staticHost			= null;
-	
-	
-	
+	private String			staticHost			= null;
+
 	@Resource
-	private UserService						userService;
-	
+	private UserService		userService;
+
 	@Resource
-	private AftFileService                  aftFileService;
+	private AftFileService	aftFileService;
 
 	/**
 	 * 获取验证码
@@ -79,7 +77,6 @@ public class PublicController extends BaseController {
 
 			// 生成随机字串
 			String verifyCode = VerifyCodeUtils.generateVerifyCode(4);
-			System.out.println(verifyCode);
 			// 存入Shiro会话session
 			TokenManager.setVal2Session(VerifyCodeUtils.V_CODE, verifyCode.toLowerCase());
 			// 生成图片
@@ -92,24 +89,36 @@ public class PublicController extends BaseController {
 
 	/**
 	 * 手机验证码
+	 * 
 	 * @param mobile
-	 * @param sign  是否用与找回密码
+	 * @param sign
+	 *            是否用与找回密码
 	 * @param type
 	 * @return
 	 */
 	@RequestMapping(value = "/getMCode", method = RequestMethod.GET)
 	@ResponseBody
-	public Result getMcode(String mobile ,boolean sign,Integer type) {
+	public Result getMcode(String mobile, boolean sign, Integer type, String verificationCode) {
 		Result res = new Result();
-		//用于找回密码
-		if(sign){
-			if(null == userService.selectByMobieAndType(mobile, type)){
-				res.getError().add(buildError(ErrorConstants.NON_REGISTER, "该用户未注册!"));
+		// 用于找回密码
+		if (sign) {
+			if (null == userService.selectByMobieAndType(mobile.trim(), type)) {
+				res.getError().add(buildError(ErrorConstants.NON_REGISTER, "", "该用户未注册!"));
+				return res;
+			}
+		}
+
+		if (!sign) {
+			if (StringUtils.isBlank(verificationCode)) {
+				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "验证码"));
+				return res;
+			}
+			if (!TokenManager.getSession().getAttribute(VerifyCodeUtils.V_CODE).equals(verificationCode)) {
+				res.getError().add(buildError(ErrorConstants.VCODE_ERROR, "", "验证码"));
 				return res;
 			}
 		}
-		
-		
+
 		if (TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE_TIME) == null
 				|| TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE_TIME) == "") {
 			sendMessage(mobile, res);
@@ -118,11 +127,11 @@ public class PublicController extends BaseController {
 			TokenManager.getSession().removeAttribute(VerifyCodeUtils.M_CODE_TIME);
 			sendMessage(mobile, res);
 		} else {
-			res.getError().add(buildError(ErrorConstants.MCODE_ERROR, "手机验证码发送频繁"));
+			res.getError().add(buildError(ErrorConstants.MCODE_ERROR, "", "手机验证码发送频繁!"));
 		}
-		
-		//resetCode
-		if(res.getError().isEmpty() && sign){
+
+		// resetCode
+		if (res.getError().isEmpty() && sign) {
 			String resetCode = UUID.randomUUID().toString();
 			TokenManager.setVal2Session(VerifyCodeUtils.RESET_CODE, resetCode);
 			TokenManager.setVal2Session(VerifyCodeUtils.RESET_CODE_TIME, System.currentTimeMillis());
@@ -169,29 +178,30 @@ public class PublicController extends BaseController {
 		}
 		return res;
 	}
-     
+
 	/**
 	 * 下载图片
+	 * 
 	 * @param response
 	 * @param path
 	 * @param request
 	 */
 	@RequestMapping(value = "/downLoadPicture", method = RequestMethod.GET)
-	public Result downLoadPicture(HttpServletResponse response, String path, HttpServletRequest request){
+	public Result downLoadPicture(HttpServletResponse response, String path, HttpServletRequest request) {
 		Result res = new Result();
-		if (path == "" || path == null){
+		if (path == "" || path == null) {
 			res.getError().add(buildError(ErrorConstants.FILE_NON_EXISTENT, "下载文件不存在!"));
 			return res;
 		}
-		String filename =Long.toString(System.nanoTime())+".jpg"; 
+		String filename = Long.toString(System.nanoTime()) + ".jpg";
 		InputStream in = null;
 		OutputStream out = null;
 		byte[] buffer = new byte[8 * 1024];
 		String fileSaveRootPath = "";
 		try {
-				fileSaveRootPath = uploadPrivatePath + path;
-				File file = new File(fileSaveRootPath);
-				in = new FileInputStream(file);
+			fileSaveRootPath = uploadPrivatePath + path;
+			File file = new File(fileSaveRootPath);
+			in = new FileInputStream(file);
 			out = response.getOutputStream();
 			// 设置文件MIME类型
 			response.setContentType("application/octet-stream");
@@ -219,30 +229,31 @@ public class PublicController extends BaseController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 删除图片文件(public图片)
+	 * 
 	 * @param path
 	 * @return
 	 */
 	@RequestMapping(value = "/deleteUploadPicture", method = RequestMethod.POST)
-	public boolean deleteUploadPicture(String path){
-		boolean flag = false;  
-		path = uploadPath+path;
-	   File file = new File(path);  
-	    // 判断目录或文件是否存在  
-	    if (!file.exists()||!file.isFile()) {  // 不存在返回 false  
-	        return flag;  
-	    } else {  
-	        return file.delete();  
-	    }  
+	public boolean deleteUploadPicture(String path) {
+		boolean flag = false;
+		path = uploadPath + path;
+		File file = new File(path);
+		// 判断目录或文件是否存在
+		if (!file.exists() || !file.isFile()) { // 不存在返回 false
+			return flag;
+		} else {
+			return file.delete();
+		}
 	}
-	
-    /**
-     * 获取并输出private图片	
-     */
-	@RequestMapping(value = "/writeImage" , method = RequestMethod.GET)
-	public void writeImage (HttpServletResponse response, HttpServletRequest request, String path){
+
+	/**
+	 * 获取并输出private图片
+	 */
+	@RequestMapping(value = "/writeImage", method = RequestMethod.GET)
+	public void writeImage(HttpServletResponse response, HttpServletRequest request, String path) {
 		try {
 			String realPath = uploadPrivatePath + path;
 			PictureUtils.outputImage(response, realPath);
@@ -250,10 +261,10 @@ public class PublicController extends BaseController {
 			LoggerUtils.fmtError(getClass(), e, "获取图片异常:%s", e.getMessage());
 		}
 	}
-	
-	
+
 	/**
 	 * 下载文件
+	 * 
 	 * @param res
 	 * @param fileName
 	 * @param response
@@ -266,32 +277,33 @@ public class PublicController extends BaseController {
 		Result res = new Result();
 		return handleDownloadFile(response, fileName, path, res);
 	}
-	
+
 	/**
 	 * 下载模版文件
+	 * 
 	 * @param response
 	 * @return
 	 */
 	@RequestMapping(value = "/downloadTemplateFile", method = RequestMethod.GET)
-	public Result downloadTemplateFile(HttpServletResponse response,String sign){
+	public Result downloadTemplateFile(HttpServletResponse response, String sign) {
 		Result res = new Result();
 		String fileName = "";
 		String path = aftFileService.selectAftFileBySign(sign).getFilePath();
 		String suffix = path.substring(path.lastIndexOf("."));
-		if (sign.equals("patent_prory_statement")){
+		if (sign.equals("patent_prory_statement")) {
 			fileName = "专利代理委托书模版" + suffix;
 		} else {
 			fileName = System.nanoTime() + " ";
 		}
-		if (!StringUtils.isBlank(path)){
+		if (!StringUtils.isBlank(path)) {
 			return handleDownloadFile(response, fileName, path, res);
 		} else {
 			res.getError().add(buildError(ErrorConstants.FILE_NON_EXISTENT, "下载文件不存在!"));
 			return res;
 		}
 	}
-	
-	private Result handleDownloadFile(HttpServletResponse response, String fileName, String path, Result res){
+
+	private Result handleDownloadFile(HttpServletResponse response, String fileName, String path, Result res) {
 		String fileSaveRootPath = uploadPrivatePath + path;
 		InputStream in = null;
 		OutputStream out = null;
@@ -301,7 +313,7 @@ public class PublicController extends BaseController {
 			in = new FileInputStream(file);
 			out = response.getOutputStream();
 			// 设置文件MIME类型
-			//response.setContentType("application/octet-stream");
+			// response.setContentType("application/octet-stream");
 			response.setContentType("multipart/form-data");
 			fileName = java.net.URLEncoder.encode(fileName, "UTF-8");
 			response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
@@ -328,5 +340,5 @@ public class PublicController extends BaseController {
 		}
 		return res;
 	}
-	
+
 }

+ 2 - 1
src/main/java/com/goafanti/common/model/Admin.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.goafanti.common.constant.AFTConstants;
 
 public class Admin extends BaseModel implements AftUser {
 	private static final long	serialVersionUID	= 1L;
@@ -116,7 +117,7 @@ public class Admin extends BaseModel implements AftUser {
 		if (this.createTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCreateTime(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 

+ 2 - 1
src/main/java/com/goafanti/common/model/Notice.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.enums.NoticeStatus;
 
 public class Notice {
@@ -107,7 +108,7 @@ public class Notice {
 		if (this.createTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCreateTime(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 

+ 3 - 2
src/main/java/com/goafanti/common/model/OrgActivity.java

@@ -7,6 +7,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.utils.FileUtils;
 
 public class OrgActivity {
@@ -299,7 +300,7 @@ public class OrgActivity {
 		if (this.startDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getStartDate(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getStartDate(), AFTConstants.YYYYMMDD);
 		}
 	}
 	
@@ -311,7 +312,7 @@ public class OrgActivity {
 		if (this.endDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getEndDate(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getEndDate(), AFTConstants.YYYYMMDD);
 		}
 	}
 	

+ 4 - 3
src/main/java/com/goafanti/common/model/OrgActivityCost.java

@@ -7,6 +7,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.utils.FileUtils;
 
 public class OrgActivityCost {
@@ -263,7 +264,7 @@ public class OrgActivityCost {
     	if (this.signDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getSignDate(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getSignDate(), AFTConstants.YYYYMMDD);
 		}
     }
     
@@ -275,7 +276,7 @@ public class OrgActivityCost {
 		if (this.startDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getStartDate(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getStartDate(), AFTConstants.YYYYMMDD);
 		}
 	}
 	
@@ -287,7 +288,7 @@ public class OrgActivityCost {
 		if (this.endDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getEndDate(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getEndDate(), AFTConstants.YYYYMMDD);
 		}
 	}
 	

+ 3 - 2
src/main/java/com/goafanti/common/model/OrgAnnualReport.java

@@ -7,6 +7,7 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+import com.goafanti.common.constant.AFTConstants;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 public class OrgAnnualReport {
@@ -153,7 +154,7 @@ public class OrgAnnualReport {
 		if (this.createTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCreateTime(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 	
@@ -165,7 +166,7 @@ public class OrgAnnualReport {
 		if (this.lastUpdateTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getLastUpdateTime(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getLastUpdateTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 	

+ 4 - 3
src/main/java/com/goafanti/common/model/OrgCognizance.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.goafanti.common.constant.AFTConstants;
 
 public class OrgCognizance {
     private String id;
@@ -270,7 +271,7 @@ public class OrgCognizance {
 		if (this.createTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCreateTime(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 	
@@ -282,7 +283,7 @@ public class OrgCognizance {
 		if (this.acceptDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCreateTime(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 	
@@ -294,7 +295,7 @@ public class OrgCognizance {
 		if (this.issuingDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCreateTime(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 	

+ 2 - 1
src/main/java/com/goafanti/common/model/OrgCognizanceLog.java

@@ -6,6 +6,7 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+import com.goafanti.common.constant.AFTConstants;
 
 
 public class OrgCognizanceLog {
@@ -99,7 +100,7 @@ public class OrgCognizanceLog {
 		if (this.recordTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getRecordTime(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getRecordTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 	

+ 2 - 1
src/main/java/com/goafanti/common/model/OrgHonorDatum.java

@@ -6,6 +6,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.utils.FileUtils;
 
 public class OrgHonorDatum {
@@ -99,7 +100,7 @@ public class OrgHonorDatum {
 		if (this.issuingTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getIssuingTime(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getIssuingTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 	

+ 2 - 1
src/main/java/com/goafanti/common/model/OrgIntellectualProperty.java

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.utils.FileUtils;
 
 public class OrgIntellectualProperty {
@@ -182,7 +183,7 @@ public class OrgIntellectualProperty {
 		if (this.authorizationDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getAuthorizationDate(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getAuthorizationDate(), AFTConstants.YYYYMMDD);
 		}
 	}
 	

+ 2 - 1
src/main/java/com/goafanti/common/model/OrgStandard.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.goafanti.common.constant.AFTConstants;
 
 public class OrgStandard {
     private String id;
@@ -111,7 +112,7 @@ public class OrgStandard {
 		if (this.createTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCreateTime(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 		

+ 2 - 1
src/main/java/com/goafanti/common/model/OrgTechCenter.java

@@ -6,6 +6,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.utils.FileUtils;
 
 public class OrgTechCenter {
@@ -126,7 +127,7 @@ public class OrgTechCenter {
 		if (this.foundingTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getFoundingTime(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getFoundingTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 	

+ 1 - 1
src/main/java/com/goafanti/common/model/OrgTechCenterDetail.java

@@ -127,7 +127,7 @@ public class OrgTechCenterDetail {
 		if (this.projectTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getProjectTime(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getProjectTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 	

+ 4 - 3
src/main/java/com/goafanti/common/model/OrganizationIdentity.java

@@ -7,6 +7,7 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+import com.goafanti.common.constant.AFTConstants;
 
 public class OrganizationIdentity {
     private String id;
@@ -643,7 +644,7 @@ public class OrganizationIdentity {
 		if (this.paymentDate == null) {
 			 return null;
 		   } else {
-			 return DateFormatUtils.format(this.getPaymentDate(), "yyyy-MM-dd");
+			 return DateFormatUtils.format(this.getPaymentDate(), AFTConstants.YYYYMMDD);
 		   }
 	}
 		
@@ -656,7 +657,7 @@ public class OrganizationIdentity {
 		if (this.listedDate == null) {
 			 return null;
 		   } else {
-			 return DateFormatUtils.format(this.getListedDate(), "yyyy-MM-dd");
+			 return DateFormatUtils.format(this.getListedDate(), AFTConstants.YYYYMMDD);
 		   }
 	}
 		
@@ -669,7 +670,7 @@ public class OrganizationIdentity {
 		if (this.issuingDate == null) {
 			 return null;
 		   } else {
-			 return DateFormatUtils.format(this.getIssuingDate(), "yyyy-MM-dd");
+			 return DateFormatUtils.format(this.getIssuingDate(), AFTConstants.YYYYMMDD);
 		   }
 	}
 		

+ 4 - 3
src/main/java/com/goafanti/common/model/PatentInfo.java

@@ -6,6 +6,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.utils.FileUtils;
 public class PatentInfo {
     private String id;
@@ -442,7 +443,7 @@ public class PatentInfo {
 		if (this.authorizedDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getAuthorizedDate(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getAuthorizedDate(), AFTConstants.YYYYMMDD);
 		}
 	}
 
@@ -455,7 +456,7 @@ public class PatentInfo {
 		if (this.patentApplicationDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getPatentApplicationDate(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getPatentApplicationDate(), AFTConstants.YYYYMMDD);
 		}
 	}
 	
@@ -468,7 +469,7 @@ public class PatentInfo {
 		if (this.createTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCreateTime(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 	

+ 2 - 1
src/main/java/com/goafanti/common/model/PatentLog.java

@@ -6,6 +6,7 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+import com.goafanti.common.constant.AFTConstants;
 
 public class PatentLog {
     private String id;
@@ -100,7 +101,7 @@ public class PatentLog {
 		if (this.recordTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getRecordTime(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getRecordTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 	

+ 2 - 1
src/main/java/com/goafanti/common/model/UserIdentity.java

@@ -7,6 +7,7 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+import com.goafanti.common.constant.AFTConstants;
 
 public class UserIdentity {
     private String id;
@@ -295,7 +296,7 @@ public class UserIdentity {
 		if (this.paymentDate == null) {
 			 return null;
 		   } else {
-			 return DateFormatUtils.format(this.getPaymentDate(), "yyyy-MM-dd");
+			 return DateFormatUtils.format(this.getPaymentDate(), AFTConstants.YYYYMMDD);
 		   }
 	}
 		

+ 4 - 3
src/main/java/com/goafanti/copyright/bo/CopyrightInfoSummary.java

@@ -6,6 +6,7 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+import com.goafanti.common.constant.AFTConstants;
 
 public class CopyrightInfoSummary {
 
@@ -234,7 +235,7 @@ public class CopyrightInfoSummary {
 		if (this.acceptTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.acceptTime, "yyyy-MM-dd");
+			return DateFormatUtils.format(this.acceptTime, AFTConstants.YYYYMMDD);
 		}
 	}
 
@@ -246,7 +247,7 @@ public class CopyrightInfoSummary {
 		if (this.authorizedDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.authorizedDate, "yyyy-MM-dd");
+			return DateFormatUtils.format(this.authorizedDate, AFTConstants.YYYYMMDD);
 		}
 	}
 
@@ -258,7 +259,7 @@ public class CopyrightInfoSummary {
 		if (this.createTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.createTime, "yyyy-MM-dd");
+			return DateFormatUtils.format(this.createTime, AFTConstants.YYYYMMDD);
 		}
 	}
 

+ 1 - 1
src/main/java/com/goafanti/copyright/controller/CopyrightApiController.java

@@ -34,7 +34,7 @@ import com.goafanti.copyright.service.CopyrightInfoService;
 import com.goafanti.core.shiro.token.TokenManager;
 
 @RestController
-@RequestMapping(value = "/techservice/copyright")
+@RequestMapping(value = "/api/user/copyright")
 public class CopyrightApiController extends CertifyApiController {
 	@Resource
 	private CopyrightInfoService copyrightInfoService;

+ 0 - 8
src/main/java/com/goafanti/core/shiro/filter/LoginFilter.java

@@ -46,14 +46,6 @@ public class LoginFilter extends AccessControlFilter {
 			return Boolean.TRUE;
 		}
 
-		if (token != null && uri.startsWith("techservice/") && token instanceof User) {
-			return Boolean.TRUE;
-		}
-
-		if (token != null && uri.startsWith("api/techproject/") && token instanceof User) {
-			return Boolean.TRUE;
-		}
-
 		if (token != null && uri.startsWith("api/user/") && token instanceof User) {
 			return Boolean.TRUE;
 		}

+ 3 - 1
src/main/java/com/goafanti/patent/bo/PatentApplicationFeeBo.java

@@ -4,6 +4,8 @@ import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
+import com.goafanti.common.constant.AFTConstants;
+
 /**
  * 专利申请费用管理
  */
@@ -178,7 +180,7 @@ public class PatentApplicationFeeBo {
 		if (this.patentApplicationDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getPatentApplicationDate(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getPatentApplicationDate(), AFTConstants.YYYYMMDD);
 		}
 	}
 	

+ 4 - 3
src/main/java/com/goafanti/patent/bo/PatentCompositeBo.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.utils.FileUtils;
 
 
@@ -354,7 +355,7 @@ public class PatentCompositeBo {
 			if (this.authorizedDate == null) {
 				return null;
 			} else {
-				return DateFormatUtils.format(this.getAuthorizedDate(), "yyyy-MM-dd");
+				return DateFormatUtils.format(this.getAuthorizedDate(), AFTConstants.YYYYMMDD);
 			}
 		}
 
@@ -367,7 +368,7 @@ public class PatentCompositeBo {
 			if (this.patentApplicationDate == null) {
 				return null;
 			} else {
-				return DateFormatUtils.format(this.getPatentApplicationDate(), "yyyy-MM-dd");
+				return DateFormatUtils.format(this.getPatentApplicationDate(), AFTConstants.YYYYMMDD);
 			}
 		}
 		
@@ -380,7 +381,7 @@ public class PatentCompositeBo {
 			if (this.createTime == null) {
 				return null;
 			} else {
-				return DateFormatUtils.format(this.getCreateTime(), "yyyy-MM-dd");
+				return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
 			}
 		}
 		

+ 5 - 3
src/main/java/com/goafanti/patent/bo/PatentManageListBo.java

@@ -4,6 +4,8 @@ import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
+import com.goafanti.common.constant.AFTConstants;
+
 public class PatentManageListBo {
 	private String	id;
 
@@ -140,7 +142,7 @@ public class PatentManageListBo {
 		if (this.authorizedDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getAuthorizedDate(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getAuthorizedDate(), AFTConstants.YYYYMMDD);
 		}
 	}
 
@@ -153,7 +155,7 @@ public class PatentManageListBo {
 		if (this.patentApplicationDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getPatentApplicationDate(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getPatentApplicationDate(), AFTConstants.YYYYMMDD);
 		}
 	}
 
@@ -166,7 +168,7 @@ public class PatentManageListBo {
 		if (this.createTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCreateTime(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 

+ 3 - 1
src/main/java/com/goafanti/patent/bo/PatentNoticeOfCorrectionBo.java

@@ -3,6 +3,8 @@ package com.goafanti.patent.bo;
 import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
+
+import com.goafanti.common.constant.AFTConstants;
 /**
  * 补正审查通知
  */
@@ -143,7 +145,7 @@ public class PatentNoticeOfCorrectionBo {
 			if (this.authorizedDate == null) {
 				return null;
 			} else {
-				return DateFormatUtils.format(this.getAuthorizedDate(), "yyyy-MM-dd");
+				return DateFormatUtils.format(this.getAuthorizedDate(), AFTConstants.YYYYMMDD);
 			}
 		}
 		

+ 3 - 1
src/main/java/com/goafanti/patent/bo/PatentPendingBo.java

@@ -4,6 +4,8 @@ import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
+import com.goafanti.common.constant.AFTConstants;
+
 /**
  * 待缴费专利管理
  */
@@ -145,7 +147,7 @@ public class PatentPendingBo {
 		if (this.authorizedDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getAuthorizedDate(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getAuthorizedDate(), AFTConstants.YYYYMMDD);
 		}
 	}
 			

+ 8 - 6
src/main/java/com/goafanti/patent/bo/PatentRecieveSendBo.java

@@ -4,6 +4,8 @@ import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
+import com.goafanti.common.constant.AFTConstants;
+
 public class PatentRecieveSendBo {
 	private String	uid;
 
@@ -234,7 +236,7 @@ public class PatentRecieveSendBo {
 		if (this.acceptanceReceiveTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getAcceptanceReceiveTime(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getAcceptanceReceiveTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 	
@@ -247,7 +249,7 @@ public class PatentRecieveSendBo {
 		if (this.acceptanceIssueTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getAcceptanceIssueTime(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getAcceptanceIssueTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 	
@@ -260,7 +262,7 @@ public class PatentRecieveSendBo {
 		if (this.authorizationReceiveTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getAuthorizationReceiveTime(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getAuthorizationReceiveTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 	
@@ -273,7 +275,7 @@ public class PatentRecieveSendBo {
 		if (this.authorizationIssueTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getAuthorizationIssueTime(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getAuthorizationIssueTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 	
@@ -286,7 +288,7 @@ public class PatentRecieveSendBo {
 		if (this.certificateRecieveTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCertificateRecieveTime(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getCertificateRecieveTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 	
@@ -299,7 +301,7 @@ public class PatentRecieveSendBo {
 		if (this.certificateIssueTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCertificateIssueTime(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getCertificateIssueTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 	

+ 1 - 1
src/main/java/com/goafanti/patent/controller/PatentApiController.java

@@ -44,7 +44,7 @@ import com.goafanti.user.service.OrganizationIdentityService;
 import com.goafanti.user.service.UserService;
 
 @Controller
-@RequestMapping(value = "/techservice/patent")
+@RequestMapping(value = "/api/user/patent")
 public class PatentApiController extends CertifyApiController {
 	@Resource
 	private PatentInfoService				patentInfoService;

+ 2 - 2
src/main/java/com/goafanti/patent/service/impl/PatentCostServiceImpl.java

@@ -42,9 +42,9 @@ public class PatentCostServiceImpl extends BaseMybatisDao<PatentCostMapper> impl
 		}
 
 		if (pDate != null && pDate.length > 0) {
-			pStart = StringUtils.isBlank(pDate[0]) ? null : DateUtils.parseDate(pDate[0], "yyyy-MM-dd");
+			pStart = StringUtils.isBlank(pDate[0]) ? null : DateUtils.parseDate(pDate[0], AFTConstants.YYYYMMDD);
 			pEnd = StringUtils.isBlank(pDate[1]) ? null
-					: DateUtils.addDays(DateUtils.parseDate(pDate[1], "yyyy-MM-dd"), 1);
+					: DateUtils.addDays(DateUtils.parseDate(pDate[1], AFTConstants.YYYYMMDD), 1);
 		}
 
 		if (pStart != null) {

+ 4 - 4
src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java

@@ -129,17 +129,17 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 
 		if (cDate != null && cDate.length > 0) {
 			try {
-				cStart = StringUtils.isBlank(cDate[0]) ? null : DateUtils.parseDate(cDate[0], "yyyy-MM-dd");
+				cStart = StringUtils.isBlank(cDate[0]) ? null : DateUtils.parseDate(cDate[0], AFTConstants.YYYYMMDD);
 				cEnd = StringUtils.isBlank(cDate[1]) ? null
-						: DateUtils.addDays(DateUtils.parseDate(cDate[1], "yyyy-MM-dd"), 1);
+						: DateUtils.addDays(DateUtils.parseDate(cDate[1], AFTConstants.YYYYMMDD), 1);
 			} catch (ParseException e) {
 			}
 		}
 		if (pDate != null && pDate.length > 0) {
 			try {
-				pStart = StringUtils.isBlank(pDate[0]) ? null : DateUtils.parseDate(pDate[0], "yyyy-MM-dd");
+				pStart = StringUtils.isBlank(pDate[0]) ? null : DateUtils.parseDate(pDate[0], AFTConstants.YYYYMMDD);
 				pEnd = StringUtils.isBlank(pDate[1]) ? null
-						: DateUtils.addDays(DateUtils.parseDate(pDate[1], "yyyy-MM-dd"), 1);
+						: DateUtils.addDays(DateUtils.parseDate(pDate[1], AFTConstants.YYYYMMDD), 1);
 			} catch (ParseException e) {
 			}
 

+ 5 - 3
src/main/java/com/goafanti/techproject/bo/TechProjectClientListBo.java

@@ -3,6 +3,8 @@ package com.goafanti.techproject.bo;
 import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
+
+import com.goafanti.common.constant.AFTConstants;
 /**
  * 用户科技申报项目列表
  */
@@ -185,7 +187,7 @@ public class TechProjectClientListBo {
 		if (this.createTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCreateTime(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 	
@@ -197,7 +199,7 @@ public class TechProjectClientListBo {
 		if (this.acceptDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getAcceptDate(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getAcceptDate(), AFTConstants.YYYYMMDD);
 		}
 	}
 	
@@ -209,7 +211,7 @@ public class TechProjectClientListBo {
 		if (this.approvedDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getApprovedDate(), "yyyy-MM-dd");
+			return DateFormatUtils.format(this.getApprovedDate(), AFTConstants.YYYYMMDD);
 		}
 	}
 	

+ 1 - 1
src/main/java/com/goafanti/techproject/controller/TechProjectApiController.java

@@ -31,7 +31,7 @@ import com.goafanti.techproject.service.TechProjectService;
 import com.goafanti.techproject.service.TechWebsiteService;
 
 @Controller
-@RequestMapping(value = "/api/techproject")
+@RequestMapping(value = "/api/user/techproject")
 public class TechProjectApiController extends CertifyApiController {
 	@Resource
 	private TechProjectService		techProjectService;

+ 3 - 1
src/main/java/com/goafanti/user/bo/OrgListBo.java

@@ -4,6 +4,8 @@ import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
+import com.goafanti.common.constant.AFTConstants;
+
 public class OrgListBo {
     private String id;
 	
@@ -102,7 +104,7 @@ public class OrgListBo {
 		if (this.createTime == null) {
 			 return null;
 		   } else {
-			 return DateFormatUtils.format(this.getCreateTime(), "yyyy-MM-dd");
+			 return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
 		   }
 	}
 			

+ 3 - 1
src/main/java/com/goafanti/user/bo/UserListBo.java

@@ -4,6 +4,8 @@ import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
+import com.goafanti.common.constant.AFTConstants;
+
 
 public class UserListBo {
 	
@@ -94,7 +96,7 @@ public class UserListBo {
 		if (this.createTime == null) {
 			 return null;
 		   } else {
-			 return DateFormatUtils.format(this.getCreateTime(), "yyyy-MM-dd");
+			 return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
 		   }
 	}
 		

+ 2 - 1
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.goafanti.cognizance.service.OrgRatepayService;
 import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.enums.UserIdentityFields;
@@ -799,7 +800,7 @@ public class UserApiController extends BaseApiController {
 				return res;
 			}
 			if (!StringUtils.isBlank(listedDateFormattedDate)){
-				orgIdentity.setListedDate(DateUtils.parseDate(listedDateFormattedDate, "yyyy-MM-dd"));
+				orgIdentity.setListedDate(DateUtils.parseDate(listedDateFormattedDate, AFTConstants.YYYYMMDD));
 			}
 			/*res.setData(organizationIdentityService.saveLastYearTaxReprotUrl(orgIdentity, TokenManager.getUserId()));
 			return res;*/

+ 3 - 3
src/main/java/com/goafanti/user/controller/UserRegisterController.java

@@ -44,15 +44,15 @@ public class UserRegisterController extends BaseController {
 	 */
 	@RequestMapping(value = "/register", method = RequestMethod.POST)
 	@ResponseBody
-	public Result register(User user, String companyName, String verificationCode, String contacts, String mobileCode,
+	public Result register(User user, String companyName, String contacts, String mobileCode,
 			BindingResult bindingResult) {
 		Result res = new Result();
-		String sessVCode = (String) TokenManager.getSession().getAttribute(VerifyCodeUtils.V_CODE);
+		/*String sessVCode = (String) TokenManager.getSession().getAttribute(VerifyCodeUtils.V_CODE);
 		if (sessVCode == null || !sessVCode.equalsIgnoreCase(verificationCode)) {
 			logger.info("input vcode:" + verificationCode + "| sess vcode:" + sessVCode);
 			res.getError().add(buildError(ErrorConstants.VCODE_ERROR, "验证码错误"));
 			return res;
-		}
+		}*/
 		// 验证码15分钟有效
 		if (TimeUtils.checkOverTime("register")) {
 			res.getError().add(buildError(ErrorConstants.MCODE_OVERTIME_ERROR, "手机验证码超时失效"));

+ 7 - 6
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -10,6 +10,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.OrganizationInfoMapper;
 import com.goafanti.common.dao.UserMapper;
@@ -103,9 +104,9 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 		Date pEnd = null;
 		
 		if (null != pDate ){
-			pStart = DateUtils.parseDate(pDate[0], "yyyy-MM-dd");
+			pStart = DateUtils.parseDate(pDate[0], AFTConstants.YYYYMMDD);
 			if (pDate.length == 2){
-				pEnd = DateUtils.addDays(DateUtils.parseDate(pDate[1], "yyyy-MM-dd"), 1);
+				pEnd = DateUtils.addDays(DateUtils.parseDate(pDate[1], AFTConstants.YYYYMMDD), 1);
 			}
 		}
 		 
@@ -157,12 +158,12 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 		Date pEnd = null;
 		
 		if (null != pDate && pDate.length > 0){
-			pStart = StringUtils.isBlank(pDate[0]) ? null : DateUtils.parseDate(pDate[0], "yyyy-MM-dd");
-			pEnd = StringUtils.isBlank(pDate[1]) ? null : DateUtils.addDays(DateUtils.parseDate(pDate[1], "yyyy-MM-dd"), 1);
+			pStart = StringUtils.isBlank(pDate[0]) ? null : DateUtils.parseDate(pDate[0], AFTConstants.YYYYMMDD);
+			pEnd = StringUtils.isBlank(pDate[1]) ? null : DateUtils.addDays(DateUtils.parseDate(pDate[1], AFTConstants.YYYYMMDD), 1);
 			
-			pStart = DateUtils.parseDate(pDate[0], "yyyy-MM-dd");
+			pStart = DateUtils.parseDate(pDate[0], AFTConstants.YYYYMMDD);
 			if (pDate.length == 2){
-				pEnd = DateUtils.addDays(DateUtils.parseDate(pDate[1], "yyyy-MM-dd"), 1);
+				pEnd = DateUtils.addDays(DateUtils.parseDate(pDate[1], AFTConstants.YYYYMMDD), 1);
 			}
 		}
 		 

+ 0 - 2
src/main/resources/shiro_base_auth.ini

@@ -8,6 +8,4 @@
 /static/**=anon
 /api/admin/**=login,permission
 /api/user/**=login
-/api/techproject/**=login
-/techservice/**=login
 /**=anon