refactor: 优化提醒。

Author: msojocs

pom.xml

@@ -8,7 +8,7 @@
   <artifactId>OmenChallengeHelper</artifactId>
   <version>1.0.1</version>
 
-  <name>OmenChallengeCrack</name>
+  <name>OmenChallengeHelper</name>
   <!-- FIXME change it to the project's website -->
   <url>http://www.example.com</url>
 

src/main/java/org/omenhelper/App.java

@@ -17,9 +17,10 @@ public static void main( String[] args ) throws Exception {
 
         Scanner scanner = new Scanner(System.in);
         // 输入SESSION
-        // String sessionToken = System.getenv("SESSION");
+        String sessionToken;
         System.out.print("请输入SESSION：");
-        String sessionToken = scanner.next();
+        sessionToken = System.getenv("SESSION");
+        sessionToken = scanner.next();
 
         // 生成数据
         String applicationId = "6589915c-6aa7-4f1b-9ef5-32fa2220c844";
@@ -38,12 +39,21 @@ public static void main( String[] args ) throws Exception {
         log.info("待完成任务数：{}", eventList.size());
         System.out.println("注意，时间设置细节：\n要小于等于当前时间减去上一次提交任务的时间");
         eventList.forEach(en-> {
+            System.out.println("");
             log.info("当前执行任务：{} - {}%", en.get("eventName"), en.get("progress"));
             System.out.print("请输入玩的时间（分钟）：");
-            int time = scanner.nextInt();
+            String str = scanner.nextLine();
+            int time;
+            try{
+                time = Integer.parseInt(str);
+            }catch (NumberFormatException e){
+                System.out.println("输入字符非法，使用45作为默认值");
+                // 默认值
+                time = 45;
+            }
             Map<String, Object> result = challenge.doIt((String) en.get("eventName"), time);
             if((int)result.get("progress") == (int)en.get("progress")){
-                System.out.println("进度没有变化，你设置的时间不合理！");
+                System.out.println("进度没有变化，你设置的时间不合理！(时间要小于等于当前时间减去上一次提交任务的时间)");
             }
         });
 

src/main/java/org/omenhelper/Omen/Challenge.java

@@ -137,7 +137,10 @@ private HttpUtilEntity request(Map<String, Object> body) {
             );
             int code = ret.getStatusCode();
             if(code == 400){
-                log.info("SESSION过期，请更新-响应码：{}, {}", ret.getStatusCode(), ret);
+                Map result = JsonUtil.string2Obj(ret.getBody(), Map.class);
+                Map<String, Object> error = (Map<String, Object>) result.get("error");
+                log.info("SESSION过期，请更新 - 响应码：{}, {}", ret.getStatusCode(), error.get("message"));
+                System.exit(-1);
                 return null;
             }else if (code != 200) {
                 log.info("响应异常-响应码：{}, {}", ret.getStatusCode(), ret);

src/main/resources/json/SessionInvalid.json

@@ -0,0 +1,11 @@
+{
+  "error": {
+    "code": 603,
+    "data": {
+      "detail": "Session is not valid"
+    },
+    "message": "Session is not valid"
+  },
+  "id": "6589915c-6aa7-4f1b-9ef5-32fa2220c844",
+  "jsonrpc": "2.0"
+}