diff --git a/src/recommend/src/main/java/com/example/recommend/RecommendApplication.java b/src/recommend/src/main/java/com/example/recommend/RecommendApplication.java index 50415e72..eaf699a9 100644 --- a/src/recommend/src/main/java/com/example/recommend/RecommendApplication.java +++ b/src/recommend/src/main/java/com/example/recommend/RecommendApplication.java @@ -9,9 +9,7 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy; @MapperScan("com.example.recommend.dal") @EnableAspectJAutoProxy(proxyTargetClass = true) public class RecommendApplication { - public static void main(String[] args) { SpringApplication.run(RecommendApplication.class, args); } - } diff --git a/src/recommend/src/main/java/com/example/recommend/common/CommonRes.java b/src/recommend/src/main/java/com/example/recommend/common/CommonRes.java index f8041a04..4969e8cd 100644 --- a/src/recommend/src/main/java/com/example/recommend/common/CommonRes.java +++ b/src/recommend/src/main/java/com/example/recommend/common/CommonRes.java @@ -4,8 +4,10 @@ public class CommonRes { //表明读经请求的返回处理结果，"success"或"fail" private String status; - //若status=success时，表明对应的返回的json类数据 - //若status=fail时，则data内将使用通用的错误码对应的格式 + /* + 若status = success时，表明对应的返回的json类数据 + 若status = fail时，则data内将使用通用的错误码对应的格式 + */ private Object data; //定义一个通用的创建返回对象的方法 diff --git a/src/recommend/src/main/java/com/example/recommend/common/ControllerAspect.java b/src/recommend/src/main/java/com/example/recommend/common/ControllerAspect.java index f73535af..982bce35 100644 --- a/src/recommend/src/main/java/com/example/recommend/common/ControllerAspect.java +++ b/src/recommend/src/main/java/com/example/recommend/common/ControllerAspect.java @@ -41,7 +41,6 @@ public class ControllerAspect { CommonError commonError = new CommonError(EmBusinessError.ADMIN_SHOULD_LOGIN); return CommonRes.create(commonError, "fail"); } - } else { Object resultObject = joinPoint.proceed(); return resultObject; diff --git a/src/recommend/src/main/java/com/example/recommend/common/EmBusinessError.java b/src/recommend/src/main/java/com/example/recommend/common/EmBusinessError.java index b2145052..48d02343 100644 --- a/src/recommend/src/main/java/com/example/recommend/common/EmBusinessError.java +++ b/src/recommend/src/main/java/com/example/recommend/common/EmBusinessError.java @@ -10,7 +10,6 @@ public enum EmBusinessError { //用户服务相关的错误类型20000开头 REGISTER_DUP_FAIL(20001, "用户已存在"), - LOGIN_FAIL(20002, "手机号或密码错误"), //admin相关错误 diff --git a/src/recommend/src/main/java/com/example/recommend/common/GlobalExceptionHandler.java b/src/recommend/src/main/java/com/example/recommend/common/GlobalExceptionHandler.java index 5b4e30d8..807ec986 100644 --- a/src/recommend/src/main/java/com/example/recommend/common/GlobalExceptionHandler.java +++ b/src/recommend/src/main/java/com/example/recommend/common/GlobalExceptionHandler.java @@ -27,6 +27,5 @@ public class GlobalExceptionHandler { CommonError commonError = new CommonError(EmBusinessError.UNKNOWN_ERROR); return CommonRes.create(commonError, "fail"); } - } } diff --git a/src/recommend/src/main/java/com/example/recommend/controller/admin/AdminController.java b/src/recommend/src/main/java/com/example/recommend/controller/admin/AdminController.java index afba5145..523c4af6 100644 --- a/src/recommend/src/main/java/com/example/recommend/controller/admin/AdminController.java +++ b/src/recommend/src/main/java/com/example/recommend/controller/admin/AdminController.java @@ -29,7 +29,6 @@ public class AdminController { @Value("${admin.email}") private String email; - @Value("${admin.encryptPassword}") private String encrptyPassord; @@ -63,7 +62,6 @@ public class AdminController { return modelAndView; } - @RequestMapping("/loginpage") public ModelAndView loginpage() { ModelAndView modelAndView = new ModelAndView("/admin/admin/login"); @@ -83,7 +81,6 @@ public class AdminController { } else { throw new BusinessException(EmBusinessError.PARAMETER_VALIDATION_ERROR, "用户名密码错误"); } - } private String encodeByMd5(String str) throws NoSuchAlgorithmException, UnsupportedEncodingException { @@ -91,6 +88,5 @@ public class AdminController { MessageDigest messageDigest = MessageDigest.getInstance("MD5"); BASE64Encoder base64Encoder = new BASE64Encoder(); return base64Encoder.encode(messageDigest.digest(str.getBytes("utf-8"))); - } } diff --git a/src/recommend/src/main/java/com/example/recommend/request/CategoryCreateReq.java b/src/recommend/src/main/java/com/example/recommend/request/CategoryCreateReq.java index eb6964ff..1308bdca 100644 --- a/src/recommend/src/main/java/com/example/recommend/request/CategoryCreateReq.java +++ b/src/recommend/src/main/java/com/example/recommend/request/CategoryCreateReq.java @@ -13,8 +13,7 @@ public class CategoryCreateReq { @NotNull(message = "权重不能为空") private Integer sort; - - + public String getName() { return name; } diff --git a/src/recommend/src/main/java/com/example/recommend/request/RegisterReq.java b/src/recommend/src/main/java/com/example/recommend/request/RegisterReq.java index bdb0dfe7..9e781539 100644 --- a/src/recommend/src/main/java/com/example/recommend/request/RegisterReq.java +++ b/src/recommend/src/main/java/com/example/recommend/request/RegisterReq.java @@ -11,7 +11,6 @@ public class RegisterReq { private String password; @NotBlank(message = "昵称不能为空") private String nickName; - @NotNull(message = "性别不能为空") private Integer gender; diff --git a/src/recommend/src/main/java/com/example/recommend/request/ShopCreateReq.java b/src/recommend/src/main/java/com/example/recommend/request/ShopCreateReq.java index 1ce57de3..a9cc4529 100644 --- a/src/recommend/src/main/java/com/example/recommend/request/ShopCreateReq.java +++ b/src/recommend/src/main/java/com/example/recommend/request/ShopCreateReq.java @@ -38,8 +38,7 @@ public class ShopCreateReq { @NotBlank(message = "图标不能为空") private String iconUrl; - - + public String getName() { return name; } diff --git a/src/recommend/src/main/java/com/example/recommend/service/impl/UserServiceImpl.java b/src/recommend/src/main/java/com/example/recommend/service/impl/UserServiceImpl.java index d626adc1..7e4f04de 100644 --- a/src/recommend/src/main/java/com/example/recommend/service/impl/UserServiceImpl.java +++ b/src/recommend/src/main/java/com/example/recommend/service/impl/UserServiceImpl.java @@ -61,6 +61,5 @@ public class UserServiceImpl implements UserService { MessageDigest messageDigest = MessageDigest.getInstance("MD5"); BASE64Encoder base64Encoder = new BASE64Encoder(); return base64Encoder.encode(messageDigest.digest(str.getBytes("utf-8"))); - } } diff --git a/src/recommend/src/main/resources/static/index.html b/src/recommend/src/main/resources/static/index.html index 4101db07..a4bf8872 100644 --- a/src/recommend/src/main/resources/static/index.html +++ b/src/recommend/src/main/resources/static/index.html @@ -4,7 +4,7 @@ - 点评 + 推荐 diff --git a/src/recommend/src/main/resources/templates/admin/category/index.html b/src/recommend/src/main/resources/templates/admin/category/index.html index ce4a8268..ee2eec7f 100644 --- a/src/recommend/src/main/resources/templates/admin/category/index.html +++ b/src/recommend/src/main/resources/templates/admin/category/index.html @@ -5,7 +5,6 @@ Version: 2.0.2 Author: KeenThemes Website: http://www.keenthemes.com/ Contact: support@ke -