feat: 0.2.0

Add 1 year ago

Author: chuuuevi

Dockerfile

@@ -14,6 +14,8 @@ RUN mvn -DskipTests package
 
 FROM amazoncorretto:17-alpine3.17
 
+LABEL org.opencontainers.image.source = "https://github.com/chuuuevi/git-stat"
+
 MAINTAINER "chuuuevi <[email protected]>"
 
 ARG TIME_ZONE=Asia/Shanghai

README.md

@@ -17,8 +17,8 @@ docker pull ghcr.io/chuuuevi/git-stat
 ```
 
 ```bash
-docker run --rm -it \
+docker run --rm -it -d \
  -p 8080:8080 \
- -v $YOUR_REPO_DIR:/repo \ 
-ghcr.io/chuuuevi/git-stat 
+ -v ./:/repo \
+ghcr.io/chuuuevi/git-stat:0.1.0
 ```

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>io.github.chuuuevi</groupId>
     <artifactId>git-stat</artifactId>
-    <version>0.1.0</version>
+    <version>0.2.0</version>
     <name>git-stat</name>
     <description>git-stat</description>
     <properties>

src/main/java/io/github/chuuuevi/gitstat/modules/action/GitController.java

@@ -31,7 +31,7 @@ public String index() {
 
     @RequestMapping("/git/stat")
     @ResponseBody
-    public Result<List<StatData>> statGit(@Valid @RequestParam(value = "method", required = true) @Min(0) @Max(3) Integer method,
+    public Result<List<StatData>> statGit(@Valid @RequestParam(value = "method", required = true) @Min(0) @Max(4) Integer method,
                                           @RequestParam(value = "startDate", required = false) String startDate,
                                           @RequestParam(value = "endDate", required = false) String endDate,
                                           @RequestParam(value = "name", required = false) String name,

src/main/java/io/github/chuuuevi/gitstat/modules/stat/constant/Constants.java

@@ -14,6 +14,7 @@ interface GitConstants {
         int STAT_METHOD_DAY = 1;
         int STAT_METHOD_WEEK = 2;
         int STAT_METHOD_MONTH = 3;
+        int STAT_METHOD_YEAR = 4;
         int STAT_METHOD_CUSTOM = 0;
     }
 }

src/main/java/io/github/chuuuevi/gitstat/modules/stat/service/GitStatService.java

@@ -8,6 +8,6 @@
  * Created by Jacky on 2015/7/14.
  */
 public interface GitStatService {
-    List<StatData> stat(Integer method, String startDate,
+    List<StatData> stat(int method, String startDate,
                         String endDate, String author, String gitRoot) throws Exception;
 }

src/main/java/io/github/chuuuevi/gitstat/modules/stat/service/impl/GitStatServiceImpl.java

@@ -30,7 +30,7 @@ public class GitStatServiceImpl implements GitStatService {
     private final Pattern pat = Pattern.compile("(\\d+)\\s(\\d+)\\s");
 
     @Override
-    public List<StatData> stat(Integer method, String startDate,
+    public List<StatData> stat(int method, String startDate,
                                String endDate, String author, String gitRoot) throws Exception {
 
         Stack<String> result = multiCmdExec(method, startDate, endDate, author, gitRoot);
@@ -124,12 +124,17 @@ private StatParam calcDays(int method, String startDate, String endDate) throws
                 days = 7;
             }
             case Constants.GitConstants.STAT_METHOD_MONTH -> {
-                Date today = new Date();
                 lastTime = cur.getTime();
                 cur.add(Calendar.MONTH, -1);
                 startTime = cur.getTime();
                 days = (lastTime.getTime() - startTime.getTime()) / Constants.StaticParam.DAY_MILLIONSECOND;
             }
+            case Constants.GitConstants.STAT_METHOD_YEAR -> {
+                lastTime = cur.getTime();
+                cur.add(Calendar.YEAR, -1);
+                startTime = cur.getTime();
+                days = (lastTime.getTime() - startTime.getTime()) / Constants.StaticParam.DAY_MILLIONSECOND;
+            }
             default -> {
             }
         }
@@ -167,6 +172,7 @@ private Stack<String> multiCmdExec(int method,
             case Constants.GitConstants.STAT_METHOD_DAY -> since = "1.day.ago";
             case Constants.GitConstants.STAT_METHOD_WEEK -> since = "1.week.ago";
             case Constants.GitConstants.STAT_METHOD_MONTH -> since = "1.month.ago";
+            case Constants.GitConstants.STAT_METHOD_YEAR -> since = "1.year.ago";
             default -> {
             }
         }

src/main/resources/static/stat/gitstat.html

@@ -23,6 +23,7 @@
         <option value="1">Today</option>
         <option value="2">This Week</option>
         <option value="3">This Month</option>
+        <option value="4">This Year</option>
         <option value="0">Customer</option>
     </select>
     <input id="startDate" type="date" disabled="false">