细节整理

src/main/java/cn/timer/api/controller/LoginController.java

@@ -3,12 +3,9 @@ package cn.timer.api.controller;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Stream;
 
-import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
@@ -16,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -62,82 +58,58 @@ public class LoginController {
 	@Value("${config-8timer.register-free-time}")
 	public Integer offset; // 系统赠送时间
 
-	@Value("${config-8timer.Aliyun.PROJECT_NAME}")
-	private String PROJECT_NAME;
-
-	@Value("${config-8timer.Aliyun.REGION_ID}")
-	private String REGION_ID;
-
-	@Value("${config-8timer.Aliyun.ACCESSKEY_ID}")
-	private String ACCESSKEY_ID;
-
-	@Value("${config-8timer.Aliyun.SECRET}")
-	private String SECRET;
-
-	public static String host;
-	public static String PROJECT_ID;
-	public static String PROJECT_SECRET;
-	@Value("${config-8timer.esign.host}")
-	private String host_s;
-	@Value("${config-8timer.esign.PROJECT_ID}")
-	private String PROJECT_ID_s;
-	@Value("${config-8timer.esign.PROJECT_SECRET}")
-	private String PROJECT_SECRET_s;
-
-	@PostConstruct
-	public void init() {
-		host = host_s;
-		PROJECT_ID = PROJECT_ID_s;
-		PROJECT_SECRET = PROJECT_SECRET_s;
-	}
-	
-	@Value("${config-8timer.Aliyun.PROJECT_NAME}")
-	private String endpoint;
-
-	@Value("${config-8timer.Aliyun.ACCESSKEY_ID}")
-	private String accessKeyId;
-	
-	@Value("${config-8timer.Aliyun.SECRET}")
-	private String accessKeySecret;
-	
-	@Value("${config-8timer.Aliyun.bucketName}")
-	private String bucketName;
-	
-	@Value("${config-8timer.Aliyun.bucketName_pri}")
-	private String bucketName_pri;
-	
-	@Value("${config-8timer.Aliyun.project_package}")
-	private String project_package;
-	
-	@Value("${config-8timer.Aliyun.expirationTime}")
-	private String expirationTime;
-	
-	@Value("${config-8timer.Aliyun.expirationTime_pri}")
-	private String expirationTime_pri;
-
-	@GetMapping(value = "/test")
-	public Map<String, Object> test() {
-		Map<String, Object> map = new HashMap<String, Object>();
-		map.put("1", offset);
-		map.put("2", PROJECT_NAME);
-		map.put("3", REGION_ID);
-		map.put("4", ACCESSKEY_ID);
-		map.put("5", SECRET);
-		map.put("6", host);
-		map.put("7", PROJECT_ID);
-		map.put("8", PROJECT_SECRET);
-		map.put("9", endpoint);
-		map.put("10", accessKeyId);
-		map.put("11", accessKeySecret);
-		map.put("12", bucketName);
-		map.put("13", bucketName_pri);
-		map.put("14", project_package);
-		map.put("15", expirationTime);
-		map.put("16", expirationTime_pri);
-		
-		
-		return map;
-	}
+	/*
+	 * @Value("${config-8timer.Aliyun.PROJECT_NAME}") private String PROJECT_NAME;
+	 * 
+	 * @Value("${config-8timer.Aliyun.REGION_ID}") private String REGION_ID;
+	 * 
+	 * @Value("${config-8timer.Aliyun.ACCESSKEY_ID}") private String ACCESSKEY_ID;
+	 * 
+	 * @Value("${config-8timer.Aliyun.SECRET}") private String SECRET;
+	 * 
+	 * public static String host; public static String PROJECT_ID; public static
+	 * String PROJECT_SECRET;
+	 * 
+	 * @Value("${config-8timer.esign.host}") private String host_s;
+	 * 
+	 * @Value("${config-8timer.esign.PROJECT_ID}") private String PROJECT_ID_s;
+	 * 
+	 * @Value("${config-8timer.esign.PROJECT_SECRET}") private String
+	 * PROJECT_SECRET_s;
+	 * 
+	 * @PostConstruct public void init() { host = host_s; PROJECT_ID = PROJECT_ID_s;
+	 * PROJECT_SECRET = PROJECT_SECRET_s; }
+	 * 
+	 * @Value("${config-8timer.Aliyun.PROJECT_NAME}") private String endpoint;
+	 * 
+	 * @Value("${config-8timer.Aliyun.ACCESSKEY_ID}") private String accessKeyId;
+	 * 
+	 * @Value("${config-8timer.Aliyun.SECRET}") private String accessKeySecret;
+	 * 
+	 * @Value("${config-8timer.Aliyun.bucketName}") private String bucketName;
+	 * 
+	 * @Value("${config-8timer.Aliyun.bucketName_pri}") private String
+	 * bucketName_pri;
+	 * 
+	 * @Value("${config-8timer.Aliyun.project_package}") private String
+	 * project_package;
+	 * 
+	 * @Value("${config-8timer.Aliyun.expirationTime}") private String
+	 * expirationTime;
+	 * 
+	 * @Value("${config-8timer.Aliyun.expirationTime_pri}") private String
+	 * expirationTime_pri;
+	 * 
+	 * @GetMapping(value = "/test") public Map<String, Object> test() { Map<String,
+	 * Object> map = new HashMap<String, Object>(); map.put("1", offset);
+	 * map.put("2", PROJECT_NAME); map.put("3", REGION_ID); map.put("4",
+	 * ACCESSKEY_ID); map.put("5", SECRET); map.put("6", host); map.put("7",
+	 * PROJECT_ID); map.put("8", PROJECT_SECRET); map.put("9", endpoint);
+	 * map.put("10", accessKeyId); map.put("11", accessKeySecret); map.put("12",
+	 * bucketName); map.put("13", bucketName_pri); map.put("14", project_package);
+	 * map.put("15", expirationTime); map.put("16", expirationTime_pri); return map;
+	 * }
+	 */
 
 	@Autowired
 	private HttpSession session;

src/main/java/cn/timer/api/controller/oss/OSSController.java

@@ -34,8 +34,6 @@ public class OSSController {
 	 * 
 	 * @param userBean
 	 * @param moudle
-	 * 
-	 * @param moudle
 	 */
 	@PostMapping(value = "/upload")
 	@ApiOperation(value = "上传普通文件", httpMethod = "POST", notes = "接口发布说明")