Skip to content

8
8timerapiv200
Commit 13db0527 by 邓实川 Committed by chenzg
Options

细节整理

parent 363b252e
Showing with 75 additions and 105 deletions
src/main/java/cn/timer/api/controller/LoginController.java
...@@ -3,12 +3,9 @@ package cn.timer.api.controller; ...@@ -3,12 +3,9 @@ package cn.timer.api.controller;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.annotation.PostConstruct;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
...@@ -16,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -16,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport; 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.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -62,82 +58,58 @@ public class LoginController { ...@@ -62,82 +58,58 @@ public class LoginController {
@Value("${config-8timer.register-free-time}") @Value("${config-8timer.register-free-time}")
public Integer offset; // 系统赠送时间 public Integer offset; // 系统赠送时间
@Value("${config-8timer.Aliyun.PROJECT_NAME}") /*
private String PROJECT_NAME; * @Value("${config-8timer.Aliyun.PROJECT_NAME}") private String PROJECT_NAME;
*
@Value("${config-8timer.Aliyun.REGION_ID}") * @Value("${config-8timer.Aliyun.REGION_ID}") private String REGION_ID;
private String REGION_ID; *
* @Value("${config-8timer.Aliyun.ACCESSKEY_ID}") private String ACCESSKEY_ID;
@Value("${config-8timer.Aliyun.ACCESSKEY_ID}") *
private String ACCESSKEY_ID; * @Value("${config-8timer.Aliyun.SECRET}") private String SECRET;
*
@Value("${config-8timer.Aliyun.SECRET}") * public static String host; public static String PROJECT_ID; public static
private String SECRET; * String PROJECT_SECRET;
*
public static String host; * @Value("${config-8timer.esign.host}") private String host_s;
public static String PROJECT_ID; *
public static String PROJECT_SECRET; * @Value("${config-8timer.esign.PROJECT_ID}") private String PROJECT_ID_s;
@Value("${config-8timer.esign.host}") *
private String host_s; * @Value("${config-8timer.esign.PROJECT_SECRET}") private String
@Value("${config-8timer.esign.PROJECT_ID}") * PROJECT_SECRET_s;
private String PROJECT_ID_s; *
@Value("${config-8timer.esign.PROJECT_SECRET}") * @PostConstruct public void init() { host = host_s; PROJECT_ID = PROJECT_ID_s;
private String PROJECT_SECRET_s; * PROJECT_SECRET = PROJECT_SECRET_s; }
*
@PostConstruct * @Value("${config-8timer.Aliyun.PROJECT_NAME}") private String endpoint;
public void init() { *
host = host_s; * @Value("${config-8timer.Aliyun.ACCESSKEY_ID}") private String accessKeyId;
PROJECT_ID = PROJECT_ID_s; *
PROJECT_SECRET = PROJECT_SECRET_s; * @Value("${config-8timer.Aliyun.SECRET}") private String accessKeySecret;
} *
* @Value("${config-8timer.Aliyun.bucketName}") private String bucketName;
@Value("${config-8timer.Aliyun.PROJECT_NAME}") *
private String endpoint; * @Value("${config-8timer.Aliyun.bucketName_pri}") private String
* bucketName_pri;
@Value("${config-8timer.Aliyun.ACCESSKEY_ID}") *
private String accessKeyId; * @Value("${config-8timer.Aliyun.project_package}") private String
* project_package;
@Value("${config-8timer.Aliyun.SECRET}") *
private String accessKeySecret; * @Value("${config-8timer.Aliyun.expirationTime}") private String
* expirationTime;
@Value("${config-8timer.Aliyun.bucketName}") *
private String bucketName; * @Value("${config-8timer.Aliyun.expirationTime_pri}") private String
* expirationTime_pri;
@Value("${config-8timer.Aliyun.bucketName_pri}") *
private String bucketName_pri; * @GetMapping(value = "/test") public Map<String, Object> test() { Map<String,
* Object> map = new HashMap<String, Object>(); map.put("1", offset);
@Value("${config-8timer.Aliyun.project_package}") * map.put("2", PROJECT_NAME); map.put("3", REGION_ID); map.put("4",
private String project_package; * ACCESSKEY_ID); map.put("5", SECRET); map.put("6", host); map.put("7",
* PROJECT_ID); map.put("8", PROJECT_SECRET); map.put("9", endpoint);
@Value("${config-8timer.Aliyun.expirationTime}") * map.put("10", accessKeyId); map.put("11", accessKeySecret); map.put("12",
private String expirationTime; * 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.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 @Autowired
private HttpSession session; private HttpSession session;
......
src/main/java/cn/timer/api/controller/oss/OSSController.java
...@@ -34,8 +34,6 @@ public class OSSController { ...@@ -34,8 +34,6 @@ public class OSSController {
* *
* @param userBean * @param userBean
* @param moudle * @param moudle
*
* @param moudle
*/ */
@PostMapping(value = "/upload") @PostMapping(value = "/upload")
@ApiOperation(value = "上传普通文件", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "上传普通文件", httpMethod = "POST", notes = "接口发布说明")
......
src/main/resources/application-dev.yml
...@@ -152,24 +152,24 @@ logging: ...@@ -152,24 +152,24 @@ logging:
config-8timer: config-8timer:
register-free-time: 90 #系统赠送时间 register-free-time: 90 #系统赠送时间
Aliyun: # 阿里云 Aliyun: # 阿里云
PROJECT_NAME: 8小时人事管家 PROJECT_NAME: 8小时人事管家
REGION_ID: cn-shenzhen REGION_ID: cn-shenzhen
ACCESSKEY_ID: LTAI4FuaShJWQ1dggsFWG5CC ACCESSKEY_ID: LTAI4FuaShJWQ1dggsFWG5CC
SECRET: EJ6qToT4T4u0B5Rb6qrta9WkyGHvGR SECRET: EJ6qToT4T4u0B5Rb6qrta9WkyGHvGR
endpoint: http://oss-cn-shenzhen.aliyuncs.com endpoint: http://oss-cn-shenzhen.aliyuncs.com
# accessKeyId: LTAI4FuaShJWQ1dggsFWG5CC # accessKeyId: LTAI4FuaShJWQ1dggsFWG5CC
# accessKeySecret: EJ6qToT4T4u0B5Rb6qrta9WkyGHvGR # accessKeySecret: EJ6qToT4T4u0B5Rb6qrta9WkyGHvGR
bucketName: 8time-v2 bucketName: 8time-v2
bucketName_pri: 8time-v2-private bucketName_pri: 8time-v2-private
project_package: 8timer2.0/ project_package: 8timer2.0/
expirationTime: 3153600000000L expirationTime: 3153600000000L
expirationTime_pri: 600000L expirationTime_pri: 600000L
esign: # e签宝 esign: # e签宝
host: https://smlopenapi.esign.cn host: https://smlopenapi.esign.cn
# test: https://smlopenapi.esign.cn # test: https://smlopenapi.esign.cn
# pro: https://openapi.esign.cn # pro: https://openapi.esign.cn
PROJECT_ID: 4438775940 PROJECT_ID: 4438775940
PROJECT_SECRET: 7b100813cca2746081c57837855ac5af PROJECT_SECRET: 7b100813cca2746081c57837855ac5af
......
src/main/resources/application-pro.yml
...@@ -139,6 +139,6 @@ config-8timer: ...@@ -139,6 +139,6 @@ config-8timer:
expirationTime: 3153600000000L expirationTime: 3153600000000L
expirationTime_pri: 600000L expirationTime_pri: 600000L
esign: # e签宝 esign: # e签宝
host: https://openapi.esign.cn host: https://openapi.esign.cn
PROJECT_ID: 4438775940 PROJECT_ID: 4438775940
PROJECT_SECRET: 7b100813cca2746081c57837855ac5af PROJECT_SECRET: 7b100813cca2746081c57837855ac5af
\ No newline at end of file \ No newline at end of file
src/main/resources/application-test.yml
...@@ -139,6 +139,6 @@ config-8timer: ...@@ -139,6 +139,6 @@ config-8timer:
expirationTime: 3153600000000L expirationTime: 3153600000000L
expirationTime_pri: 600000L expirationTime_pri: 600000L
esign: # e签宝 esign: # e签宝
host: https://smlopenapi.esign.cn host: https://smlopenapi.esign.cn
PROJECT_ID: 4438775940 PROJECT_ID: 4438775940
PROJECT_SECRET: 7b100813cca2746081c57837855ac5af PROJECT_SECRET: 7b100813cca2746081c57837855ac5af
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment