Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/OpenapiBizTokenController.java

 package com.yeejoin.amos.api.openapi.controller;
 
+import com.yeejoin.amos.api.common.restful.utils.ResponseHelper;
+import com.yeejoin.amos.api.common.restful.utils.ResponseModel;
+import com.yeejoin.amos.api.openapi.face.service.OpenapiBizTokenService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -10,15 +16,9 @@ import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
-import com.yeejoin.amos.api.common.restful.utils.ResponseHelper;
-import com.yeejoin.amos.api.common.restful.utils.ResponseModel;
-import com.yeejoin.amos.api.openapi.face.service.OpenapiBizTokenService;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import javax.validation.constraints.NotBlank;
 
 /**
- * 
  * <pre>
  *  企业数据对接票据管理
  * </pre>
@@ -29,8 +29,8 @@ import io.swagger.annotations.ApiOperation;
 @RestController
 @RequestMapping(value = "/bizToken")
 @Api(tags = "bizToken-企业数据对接票据管理")
-public class OpenapiBizTokenController
-{
+@Validated
+public class OpenapiBizTokenController {
     private static final Logger logger = LogManager.getLogger(OpenapiBizTokenController.class);
 
     @Autowired
@@ -39,24 +39,11 @@ public class OpenapiBizTokenController
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(value = "申请登录令牌")
     @GetMapping(value = "/applyToken")
-	public ResponseModel<String> applyToken (
-			@RequestParam String appId) throws Exception 
-	{
-		logger.info("appId信息：",appId);
+    public ResponseModel<String> applyToken(
+            @NotBlank(message = "appId不能为空") @RequestParam String appId) {
+        logger.info("appId信息：{}", appId);
         String appToken = openapiBizTokenService.getByAppId(appId);
-		logger.info("appToken信息：",appToken);		
+        logger.info("appToken信息：{}", appToken);
         return ResponseHelper.buildResponse(appToken);
     }
-	
-//	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-//	@ApiOperation(value = "获取APPID")
-//	@GetMapping(value = "/getAppId")
-//	public ResponseModel<String> getAppId (
-//			@RequestParam String companyCode) throws Exception 
-//	{
-//		String appId = DesUtil.encode(companyCode, Constant.SECRETKEY);
-//		logger.info("appId信息：",appId);
-//		return ResponseHelper.buildResponse(appId);
-//	}
-//	
 }