From 7b27141d1f8567d03dc5038b37e091e19b99f872 Mon Sep 17 00:00:00 2001
From: xiangheng <11675084@qq.com>
Date: Tue, 19 Nov 2024 00:06:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/verify/Verify/VerifyPoints.vue |  4 ++
 admin/src/views/error/test.vue                |  8 +--
 admin/src/views/monitor/project/edit.vue      |  8 +--
 .../user_protocol/user_protocol_schema.go     | 62 +++++++++----------
 .../user_protocol/user_protocol_service.go    |  2 +-
 server/core/null_time.go                      | 20 +++---
 server/util/excel2/excel_import.go            | 12 ++--
 x_err_sdk/web/web.ts                          |  2 +-
 8 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/admin/src/components/verify/Verify/VerifyPoints.vue b/admin/src/components/verify/Verify/VerifyPoints.vue
index ef5e7d0..fccf857 100644
--- a/admin/src/components/verify/Verify/VerifyPoints.vue
+++ b/admin/src/components/verify/Verify/VerifyPoints.vue
@@ -207,6 +207,10 @@ export default {
                 captchaType: captchaType.value
             }
             reqGet(data).then((res) => {
+                if (!res) {
+                    text.value = '网络错误'
+                    return
+                }
                 if (res.repCode == '0000') {
                     pointBackImgBase.value =
                         'data:image/png;base64,' + res.repData.originalImageBase64
diff --git a/admin/src/views/error/test.vue b/admin/src/views/error/test.vue
index f5a1dd3..bbefa02 100644
--- a/admin/src/views/error/test.vue
+++ b/admin/src/views/error/test.vue
@@ -1,14 +1,14 @@
 <script setup lang="ts">
 // import { onUnmounted } from 'vue'
-// import { XErr, XErrWeb } from '../../../../x_err_sdk/web/index'
-// // { XErr, XErrWeb }
-// const xErr = new XErr(
+// import { Base, Web } from '../../../../x_err_sdk/web/index'
+// // { XErr, Web }
+// const xErr = new Base(
 //     {
 //         Dns: 'http://localhost:5174/api',
 //         Pid: 'e19e3be20de94f49b68fafb4c30668bc',
 //         Uid: '10'
 //     },
-//     new XErrWeb()
+//     new Web()
 // )
 // onUnmounted(() => {
 // xErr.unListen()
diff --git a/admin/src/views/monitor/project/edit.vue b/admin/src/views/monitor/project/edit.vue
index 1c3be9e..0cae3f7 100644
--- a/admin/src/views/monitor/project/edit.vue
+++ b/admin/src/views/monitor/project/edit.vue
@@ -93,15 +93,15 @@ const formData = reactive({
     Status: null
 })
 const code = computed(() => {
-    return `import { XErr, XErrWeb } from '../../x_err_sdk/web/index'
-new XErr(
+    return `import { Base, Web } from '../../x_err_sdk/web/index'
+new Base(
     {
         Dns: '${location.origin}/api',
         Pid: '${formData.ProjectKey}',
         Uid: ''
     },
-    new XErrWeb({
-        onloadTimeOut: 3000
+    new Web({
+        onloadTimeOut: 8000
     })
 )`
 })
diff --git a/server/admin/user_protocol/user_protocol_schema.go b/server/admin/user_protocol/user_protocol_schema.go
index 25495ae..e3c5e01 100644
--- a/server/admin/user_protocol/user_protocol_schema.go
+++ b/server/admin/user_protocol/user_protocol_schema.go
@@ -1,58 +1,56 @@
 package user_protocol
+
 import (
 	"x_admin/core"
-
 )
 
-//UserProtocolListReq 用户协议列表参数
+// UserProtocolListReq 用户协议列表参数
 type UserProtocolListReq struct {
-            Title *string // 标题
-            Content *string // 协议内容
-            Sort *float64 // 排序
-            CreateTimeStart *string // 开始创建时间
-            CreateTimeEnd *string // 结束创建时间
-            UpdateTimeStart *string // 开始更新时间
-            UpdateTimeEnd *string // 结束更新时间
+	Title           *string  // 标题
+	Content         *string  // 协议内容
+	Sort            *float64 // 排序
+	CreateTimeStart *string  // 开始创建时间
+	CreateTimeEnd   *string  // 结束创建时间
+	UpdateTimeStart *string  // 开始更新时间
+	UpdateTimeEnd   *string  // 结束更新时间
 }
 
-
-
-//UserProtocolAddReq 用户协议新增参数
+// UserProtocolAddReq 用户协议新增参数
 type UserProtocolAddReq struct {
-    Title  *string  // 标题
-    Content  *string  // 协议内容
-    Sort  core.NullFloat  // 排序
+	Title   *string        // 标题
+	Content *string        // 协议内容
+	Sort    core.NullFloat // 排序
 }
 
-//UserProtocolEditReq 用户协议编辑参数
+// UserProtocolEditReq 用户协议编辑参数
 type UserProtocolEditReq struct {
-        Id int // 
-        Title  *string  // 标题
-        Content  *string  // 协议内容
-        Sort  core.NullFloat  // 排序
+	Id      int            //
+	Title   *string        // 标题
+	Content *string        // 协议内容
+	Sort    core.NullFloat // 排序
 }
 
-//UserProtocolDetailReq 用户协议详情参数
+// UserProtocolDetailReq 用户协议详情参数
 type UserProtocolDetailReq struct {
-    Id int // 
+	Id int //
 }
 
-//UserProtocolDelReq 用户协议删除参数
+// UserProtocolDelReq 用户协议删除参数
 type UserProtocolDelReq struct {
-    Id int // 
+	Id int //
 }
 
-//UserProtocolDelReq 用户协议批量删除参数
+// UserProtocolDelReq 用户协议批量删除参数
 type UserProtocolDelBatchReq struct {
 	Ids string
 }
 
-//UserProtocolResp 用户协议返回信息
+// UserProtocolResp 用户协议返回信息
 type UserProtocolResp struct {
-        Id int // 
-        Title string // 标题
-        Content string // 协议内容
-        Sort core.NullFloat // 排序
-        CreateTime core.NullTime // 创建时间
-        UpdateTime core.NullTime // 更新时间
+	Id         int            //
+	Title      string         // 标题
+	Content    string         // 协议内容
+	Sort       core.NullFloat // 排序
+	CreateTime core.NullTime  // 创建时间
+	UpdateTime core.NullTime  // 更新时间
 }
diff --git a/server/admin/user_protocol/user_protocol_service.go b/server/admin/user_protocol/user_protocol_service.go
index b10d78d..f3612c6 100644
--- a/server/admin/user_protocol/user_protocol_service.go
+++ b/server/admin/user_protocol/user_protocol_service.go
@@ -196,7 +196,7 @@ func (service userProtocolService) GetExcelCol() []excel2.Col {
 	var cols = []excel2.Col{
 		{Name: "标题", Key: "Title", Width: 15},
 		{Name: "协议内容", Key: "Content", Width: 15},
-		{Name: "排序", Key: "Sort", Width: 15},
+		{Name: "排序", Key: "Sort", Width: 15, Decode: core.DecodeFloat},
 		{Name: "创建时间", Key: "CreateTime", Width: 15, Decode: util.NullTimeUtil.DecodeTime},
 		{Name: "更新时间", Key: "UpdateTime", Width: 15, Decode: util.NullTimeUtil.DecodeTime},
 	}
diff --git a/server/core/null_time.go b/server/core/null_time.go
index 7ab3d14..c0b5b51 100644
--- a/server/core/null_time.go
+++ b/server/core/null_time.go
@@ -15,9 +15,9 @@ const TimeFormat = "2006-01-02 15:04:05"
 
 // NullTime 自定义时间格式
 type NullTime struct {
-	Time   *time.Time
-	Valid  bool
-	Format string
+	Time  *time.Time
+	Valid bool
+	// Format string
 }
 
 //	func (t *NullTime) IsZero() bool {
@@ -70,25 +70,23 @@ func (t NullTime) Value() (driver.Value, error) {
 
 // 读取数据gorm调用
 func (t *NullTime) Scan(v any) error {
-	// pt, err := time.ParseInLocation("2006-01-02 15:04:05", v.(time.Time).String(), time.Local)
-	if pt, ok := v.(time.Time); ok {
-		tt := pt.Format(TimeFormat)
+	switch val := v.(type) {
+	case time.Time:
+		tt := val.Format(TimeFormat)
 		if tt == "0001-01-01 00:00:00" {
 			*t = NullTime{
-				Time:  &pt,
+				Time:  nil,
 				Valid: false,
 			}
-			return nil
 		} else {
 			*t = NullTime{
-				Time:  &pt,
+				Time:  &val,
 				Valid: true,
 			}
 		}
-
 		return nil
 	}
-	return fmt.Errorf("cant convert %s to time", v)
+	return fmt.Errorf("NullTime cant convert %s", v)
 }
 
 func (t NullTime) String() string {
diff --git a/server/util/excel2/excel_import.go b/server/util/excel2/excel_import.go
index e8fd5d7..cfd4f31 100644
--- a/server/util/excel2/excel_import.go
+++ b/server/util/excel2/excel_import.go
@@ -78,22 +78,22 @@ func importData(f *excelize.File, dst interface{}, sheetName string, startRow in
 			key := col.Key
 			replace := col.Replace
 
-			val := rows[i][j]
+			rowVal := rows[i][j]
 			// 先替换，将val替换为key
-			for replaceKey, v := range replace {
-				if fmt.Sprintf("%v", v) == fmt.Sprintf("%v", val) {
-					val = fmt.Sprintf("%v", replaceKey)
+			for replaceKey, replaceVal := range replace {
+				if fmt.Sprintf("%v", replaceVal) == rowVal {
+					rowVal = replaceKey
 					break
 				}
 			}
 			// 再解码
 			if col.Decode != nil {
-				v, e := col.Decode(val)
+				v, e := col.Decode(rowVal)
 				if e == nil {
 					rowMap[key] = v
 				}
 			} else {
-				rowMap[key] = val
+				rowMap[key] = rowVal
 			}
 		}
 		data = append(data, rowMap)
diff --git a/x_err_sdk/web/web.ts b/x_err_sdk/web/web.ts
index e884429..6cbf027 100644
--- a/x_err_sdk/web/web.ts
+++ b/x_err_sdk/web/web.ts
@@ -149,7 +149,7 @@ class Web implements IErrorEvent {
         this.callback({
           Type: "onloadTime",
           Path: window.location.href,
-          Time:onloadTime
+          Time:Math.floor(onloadTime)
         });
       }
     }