diff --git a/org-ccalm-main.yml b/org-ccalm-main.yml
index f49dccd..74cf477 100644
--- a/org-ccalm-main.yml
+++ b/org-ccalm-main.yml
@@ -10,8 +10,8 @@ spring:
application:
name: org-ccalm-main
datasource:
- url: jdbc:postgresql://10.0.0.1:5432/CCALM?ApplicationName=org_ccalm_main&connectTimeout=10000&socketTimeout=30000
- #url: jdbc:postgresql://ccalm.org:5432/CCALM?ApplicationName=org_ccalm_main&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000
+ #url: jdbc:postgresql://10.0.0.1:5432/CCALM?ApplicationName=org_ccalm_main&connectTimeout=10000&socketTimeout=30000
+ url: jdbc:postgresql://ccalm.org:5432/CCALM?ApplicationName=org_ccalm_main&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000
#url: jdbc:postgresql://127.0.0.1:5432/CCALM?ApplicationName=org_ccalm_main&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000
username: postgres
password: 309A86FF65A78FB428F4E38DFE35F730
diff --git a/pom.xml b/pom.xml
index 88e45e9..9c5b654 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
org.ccalm
main
- 1.0.4
+ 1.0.6
main
main
diff --git a/src/main/java/org/ccalm/main/AcceptASDCController.java b/src/main/java/org/ccalm/main/AcceptASDCController.java
index 0216af1..498f6ba 100644
--- a/src/main/java/org/ccalm/main/AcceptASDCController.java
+++ b/src/main/java/org/ccalm/main/AcceptASDCController.java
@@ -2508,6 +2508,9 @@ public class AcceptASDCController implements ServletContextAware {
}
return result;
}
+ /**
+ * reqS - Миллисекунд сначала 1970 года
+ * */
@RequestMapping(value = {"/get/", "/api/locust/v01/get/"},params = {"fn"},method = { RequestMethod.GET, RequestMethod.POST })
@ResponseBody
public Object uploadFILE(HttpServletResponse response,@RequestHeader(required=false,name="Content-Type") String contentType,@RequestBody(required=false) String reqData,@RequestParam(required=false,name="file") MultipartFile file,@RequestParam(required=false,name="fn") String fn,@RequestParam(required=false,name="r") String reqR,@RequestParam(required=false,name="n") String reqN,@RequestParam(required=false,name="s") String reqS,@RequestParam(required=false,name="l") String reqL,@RequestParam(required=false,name="days",defaultValue = "0") int days,@RequestParam(required=false,name="country_id",defaultValue = "0") int country_id,@RequestParam(required=false,name="android_id",defaultValue = "") String device_id) {
@@ -2562,7 +2565,13 @@ public class AcceptASDCController implements ServletContextAware {
//if(val!=null) pR=Integer.parseInt(val);
pN = reqN;
val = reqS;
- if(val!=null) pS=Long.parseLong(val);
+ if(val!=null && !val.isEmpty()) {
+ try {
+ pS = Long.parseLong(val);
+ } catch (Exception ex) {
+ logger.error(UUID.randomUUID().toString(), ex.getMessage()+" val="+val, ex);
+ }
+ }
val = reqL;
//if(val!=null) pL=100;