参数校验逻辑调整.

neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/ExceptionConstant.java

@@ -33,8 +33,9 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum ExceptionConstant {
 	SUCCESS(0, "成功"),
-	PARAMS_INVALID(1, "参数不正确"),
-	USER_NOT_LOGIN(2, "用户未登录"),
+	USER_NOT_LOGIN(1, "用户未登录"),
+	PARAMS_INVALID(2, "参数不正确"),
+	PARAMS_NOT_NULL(3, "参数[%s]不能为空"),
 	SYSTEM_ERROR(500, "系统异常");
 
 	private int code;

neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/ServiceException.java

@@ -41,9 +41,16 @@ public class ServiceException extends RuntimeException {
 
 	public ServiceException(int code, String msg) {
 		this.code = code;
+		this.msg = msg;
 	}
 
 	public static ServiceException create(ExceptionConstant constant) {
 		return new ServiceException(constant.getCode(), constant.getMsg());
 	}
+
+	public static ServiceException create(ExceptionConstant constant, Object... params) {
+		int code = constant.getCode();
+		String msg = String.format(constant.getMsg(), params);
+		return new ServiceException(code, msg);
+	}
 }

neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/IndexController.java

@@ -26,10 +26,9 @@ import fun.asgc.neutrino.core.web.annotation.PostMapping;
 import fun.asgc.neutrino.core.web.annotation.RequestBody;
 import fun.asgc.neutrino.core.web.annotation.RequestMapping;
 import fun.asgc.neutrino.core.web.annotation.RestController;
-import fun.asgc.neutrino.proxy.server.base.rest.ExceptionConstant;
-import fun.asgc.neutrino.proxy.server.base.rest.ServiceException;
 import fun.asgc.neutrino.proxy.server.controller.req.LoginReq;
 import fun.asgc.neutrino.proxy.server.controller.res.LoginRes;
+import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil;
 
 /**
  *
@@ -43,9 +42,9 @@ public class IndexController {
 
 	@PostMapping("login")
 	public LoginRes login(@RequestBody LoginReq req) {
-		if (null == req) {
-			throw ServiceException.create(ExceptionConstant.PARAMS_INVALID);
-		}
+		ParamCheckUtil.checkNotEmpty(req.getLoginName(), "loginName");
+		ParamCheckUtil.checkNotEmpty(req.getLoginPassword(), "loginPassword");
+
 		return new LoginRes()
 			.setToken("1111")
 			.setUserId(1)

neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ParamCheckUtil.java

@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.util;
+
+import fun.asgc.neutrino.core.util.StringUtil;
+import fun.asgc.neutrino.proxy.server.base.rest.ExceptionConstant;
+import fun.asgc.neutrino.proxy.server.base.rest.ServiceException;
+
+/**
+ *
+ * @author: aoshiguchen
+ * @date: 2022/8/1
+ */
+public class ParamCheckUtil {
+
+	public static void checkNotEmpty(Object obj, String name) {
+		if (obj == null) {
+			throw ServiceException.create(ExceptionConstant.PARAMS_NOT_NULL, name);
+		}
+		if (obj instanceof String && StringUtil.isEmpty((String) obj)) {
+			throw ServiceException.create(ExceptionConstant.PARAMS_NOT_NULL, name);
+		}
+	}
+}