|
|
@@ -79,7 +79,7 @@ public class PublicController extends CertifyApiController {
|
|
|
|
|
|
@Value(value = "${mobileCodeTemplate}")
|
|
|
private String mobileCodeTemplate = null;
|
|
|
-
|
|
|
+
|
|
|
@Value(value = "${mobileRemindCodeTemplate}")
|
|
|
private String mobileRemindCodeTemplate = null;
|
|
|
@Value(value = "${wx.clockInRange}")
|
|
|
@@ -92,7 +92,7 @@ public class PublicController extends CertifyApiController {
|
|
|
private AttachmentService aftFileService;
|
|
|
@Resource
|
|
|
private AdminService adminService;
|
|
|
-
|
|
|
+
|
|
|
@Resource
|
|
|
private FieldGlossoryService fieldGlossoryService;
|
|
|
|
|
|
@@ -108,7 +108,7 @@ public class PublicController extends CertifyApiController {
|
|
|
@Resource(name = "passwordUtil")
|
|
|
private PasswordUtil passwordUtil;
|
|
|
|
|
|
-
|
|
|
+
|
|
|
/** 上传图片 **/
|
|
|
@RequestMapping(value = "/upload", method = RequestMethod.POST)
|
|
|
public Result uploadOrderInvoiceFile(HttpServletRequest req){
|
|
|
@@ -119,7 +119,7 @@ public class PublicController extends CertifyApiController {
|
|
|
|
|
|
/**
|
|
|
* 获取验证码
|
|
|
- *
|
|
|
+ *
|
|
|
* @param response
|
|
|
*/
|
|
|
@RequestMapping(value = "/getVCode", method = RequestMethod.GET)
|
|
|
@@ -129,7 +129,6 @@ public class PublicController extends CertifyApiController {
|
|
|
response.setHeader("Cache-Control", "no-cache");
|
|
|
response.setDateHeader("Expires", 0);
|
|
|
response.setContentType("image/jpg");
|
|
|
-
|
|
|
// 生成随机字串
|
|
|
String verifyCode = VerifyCodeUtils.generateVerifyCode(4);
|
|
|
// 存入Shiro会话session
|
|
|
@@ -144,7 +143,7 @@ public class PublicController extends CertifyApiController {
|
|
|
|
|
|
/**
|
|
|
* 手机验证码
|
|
|
- *
|
|
|
+ *
|
|
|
* @param mobile
|
|
|
* @param sign
|
|
|
* 是否用与找回密码
|
|
|
@@ -189,7 +188,7 @@ public class PublicController extends CertifyApiController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- *
|
|
|
+ *
|
|
|
* @param mobile
|
|
|
* @param res
|
|
|
* @return
|
|
|
@@ -213,7 +212,7 @@ public class PublicController extends CertifyApiController {
|
|
|
|
|
|
/**
|
|
|
* 下载图片
|
|
|
- *
|
|
|
+ *
|
|
|
* @param response
|
|
|
* @param path
|
|
|
* @param request
|
|
|
@@ -268,7 +267,7 @@ public class PublicController extends CertifyApiController {
|
|
|
|
|
|
/**
|
|
|
* 删除图片文件(public图片)
|
|
|
- *
|
|
|
+ *
|
|
|
* @param path
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -300,7 +299,7 @@ public class PublicController extends CertifyApiController {
|
|
|
|
|
|
/**
|
|
|
* 下载文件
|
|
|
- *
|
|
|
+ *
|
|
|
* @param fileName
|
|
|
* @param response
|
|
|
* @param path
|
|
|
@@ -314,7 +313,7 @@ public class PublicController extends CertifyApiController {
|
|
|
|
|
|
/**
|
|
|
* 下载模版文件
|
|
|
- *
|
|
|
+ *
|
|
|
* @param response
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -408,7 +407,7 @@ public class PublicController extends CertifyApiController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- *
|
|
|
+ *
|
|
|
* @param mobileCode
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -444,7 +443,7 @@ public class PublicController extends CertifyApiController {
|
|
|
|
|
|
/**
|
|
|
* 重置密码
|
|
|
- *
|
|
|
+ *
|
|
|
* @param resetCode
|
|
|
* @param mobile
|
|
|
* @param type
|
|
|
@@ -503,7 +502,7 @@ public class PublicController extends CertifyApiController {
|
|
|
VerifyCodeUtils.clearMobileCode();
|
|
|
VerifyCodeUtils.clearMobileCodeTime();
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/getRegisterMCode", method = RequestMethod.GET )
|
|
|
@ResponseBody
|
|
|
public Result getRegisterMCode(String mobile){
|
|
|
@@ -520,7 +519,7 @@ public class PublicController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/getResetMCode", method = RequestMethod.GET )
|
|
|
@ResponseBody
|
|
|
public Result getResetMCode(String mobile, Integer type) {
|
|
|
@@ -541,7 +540,7 @@ public class PublicController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/** 省市区查询 **/
|
|
|
@RequestMapping(value = "/listAllProvince" , method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
|
@@ -557,8 +556,8 @@ public class PublicController extends CertifyApiController {
|
|
|
res.setData(adminService.getListDefaultPassword(depId));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
/** 省市区查询 **/
|
|
|
@RequestMapping(value = "/sendWeb" , method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
|
@@ -570,8 +569,8 @@ public class PublicController extends CertifyApiController {
|
|
|
res.setData(1);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 导入流水
|
|
|
* @param file
|
|
|
@@ -692,10 +691,10 @@ public class PublicController extends CertifyApiController {
|
|
|
}
|
|
|
return cellValue;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 通用下载请求
|
|
|
- *
|
|
|
+ *
|
|
|
* @param fileName 文件名称
|
|
|
* @param delete 是否删除
|
|
|
*/
|
|
|
@@ -725,8 +724,8 @@ public class PublicController extends CertifyApiController {
|
|
|
{
|
|
|
LoggerUtils.error(PublicController.class,"下载文件失败", e);
|
|
|
}
|
|
|
- }
|
|
|
-
|
|
|
+ }
|
|
|
+
|
|
|
@RequestMapping("/getWxConfig")
|
|
|
public Result getWxConfig() {
|
|
|
Result res =new Result();
|
|
|
@@ -735,7 +734,7 @@ public class PublicController extends CertifyApiController {
|
|
|
res.data(config);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping("/getUser")
|
|
|
public Result getUser() {
|
|
|
List<OutUser> list=userService.getuser();
|