计划中的 v1.3 版本内容

1、统计数据页面扩展显示短链接的备注信息 2、访问日志页面扩展功能,支持导出访问日志
barats · Apr 28, 2022 · 78f59f8 · 78f59f8
1 parent aa732f4
commit 78f59f8
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 15 deletions.
diff --git a/assets/admin.js b/assets/admin.js
@@ -177,7 +177,7 @@ function sign_out_config() {
 function export_accesslog() {
   $('body').modal('confirm','温馨提示','确认导出访问日志?', function(choice){
     if (choice) {
-      $("#form-export-logs-btn").click()
+      $("#form-export-logs").submit();
     }
   });
 }
diff --git a/controller/admin_controller.go b/controller/admin_controller.go
@@ -233,6 +233,7 @@ func AccessLogsPage(c *gin.Context) {
 func AccessLogsExport(c *gin.Context) {
 	url := c.PostForm("url")
 	logs, err := service.GetAllAccessLogs(strings.TrimSpace(url))
+
 	if err != nil {
 		c.HTML(http.StatusOK, "access_logs.html", gin.H{
 			"title":       "访问日志查询 - ohUrlShortener",
@@ -243,6 +244,7 @@ func AccessLogsExport(c *gin.Context) {
 		})
 		return
 	}
+
 	fileContent, err := export.AccessLogToExcel(logs)
 	if err != nil {
 		c.HTML(http.StatusOK, "access_logs.html", gin.H{

diff --git a/docker/admin.Dockerfile b/docker/admin.Dockerfile
@@ -7,9 +7,6 @@ ENV GOPROXY=https://proxy.golang.com.cn,direct
 ADD . /app
 WORKDIR /app
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o ohurlshortener
-RUN apk add upx && \
-    mv ohurlshortener ohurlshortener_tmp && \
-    upx --best -o ohurlshortener ohurlshortener_tmp
 
 ##
 ## Deploy

diff --git a/docker/local_build.yml b/docker/local_build.yml
@@ -55,7 +55,9 @@ services:
       test: [ "CMD", "psql", "-U","${PG_SUPER_USER}","-d","oh_url_shortener" ]
       timeout: 10s
       interval: 3s
-      retries: 10     
+      retries: 10   
+    ports:
+      - ${PG_LOCAL_PORT}:5432        
     networks:
       - ohurlshortener      
 
@@ -68,6 +70,8 @@ services:
       timeout: 10s
       interval: 3s
       retries: 10
+    ports:
+      - ${RD_LOCAL_PORT}:6379      
     networks:
       - ohurlshortener 
 

diff --git a/docker/portal.Dockerfile b/docker/portal.Dockerfile
@@ -7,9 +7,6 @@ ENV GOPROXY=https://proxy.golang.com.cn,direct
 ADD . /app
 WORKDIR /app
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o ohurlshortener
-RUN apk add upx && \
-    mv ohurlshortener ohurlshortener_tmp && \
-    upx --best -o ohurlshortener ohurlshortener_tmp
 
 ##
 ## Deploy

diff --git a/docker/vars.env b/docker/vars.env
@@ -2,20 +2,22 @@
 
 # ohUrlShortenerAdmin
 OH_ADMIN_PORT=9092
-OH_ADMIN_VERSION=1.2
+OH_ADMIN_VERSION=1.3
 OH_ADMIN_CONTAINER_NAME=ohurlshortener_admin
 
 # ohUrlShortenerPortal
 OH_PORTAL_PORT=9091
-OH_PORTAL_VERSION=1.2
+OH_PORTAL_VERSION=1.3
 OH_PORTAL_CONTAINER_NAME=ohurlshortener_portal
 
 # Postgresql Vars
 PG_VERSION=9.6
 PG_CONTAINER_NAME=ohurlshortener_pg
 PG_SUPER_USER=postgres
 PG_SUPER_PWD=0DePm!oG_12Cz^kd_m
+PG_LOCAL_PORT=55432
 
 #Redis Vars
 RD_VERSION=6.2.6
 RD_CONTAINER_NAME=ohurlshortener_redis
+RD_LOCAL_PORT=56379
diff --git a/templates/admin/access_logs.html b/templates/admin/access_logs.html
@@ -21,8 +21,7 @@
               <a class="ui teal right labeled icon button" href="javascript:export_accesslog()"><i class="download icon"></i>导出</a>                        
             </form>
             <form id="form-export-logs" action="/admin/access_logs_export" method="post">
-              <input name="url" type="hidden" value="{{.url}}">
-              <button id="form-export-logs-btn" type="submit"></button>
+              <input name="url" type="hidden" value="{{.url}}">              
             </form>
             </th>
           </tr>

diff --git a/templates/admin/stats.html b/templates/admin/stats.html
@@ -10,7 +10,7 @@
       <table class="ui celled striped table">
         <thead>
           <tr>
-            <th colspan="13">
+            <th colspan="14">
               <form id="form-search-url" action="/admin/stats" method="get">
                 <div class="ui labeled action input">
                   <div class="ui label">{{.prefix}}</div>
@@ -23,7 +23,8 @@
           </tr>
           <tr>            
             <th>短链接</th>
-            <th>生成时间</th>
+            <th class="center aligned">生成时间</th>
+            <th class="center aligned">备注</th>
             <th>今日点击量</th>  
             <th>今日独立IP数</th>  
             <th>昨日点击量</th>  
@@ -42,6 +43,7 @@
           <tr {{if not .Valid}}class="negative"{{end}}>
             <td class="collapsing"><a href="{{$.prefix}}{{.ShortUrl.ShortUrl}}" target="_blank">{{.ShortUrl.ShortUrl}}</a></td>
             <td class="center aligned collapsing">{{.CreatedAt | date "2006-01-02 15:04:05"}}</td>
+            <td>{{if .ShortUrl.Memo.Valid}}{{.ShortUrl.Memo.String}}{{else}}--{{end}}</td>
             <td>{{.TodayCount}}</td>  
             <td>{{.DistinctTodayCount}}</td>  
             <td>{{.YesterdayCount}}</td>  
@@ -58,7 +60,7 @@
         </tbody>
         <tfoot>
           <tr>            
-            <th colspan="13" class="center aligned">
+            <th colspan="14" class="center aligned">
               {{if not .first_page}}
               <a class="ui small labeled icon button" href="/admin/stats?url={{.url}}&page={{sub .page 1}}"><i class="arrow alternate circle left outline icon"></i>上一页</a>
               {{end}}