Skip to content

D
doc-service
Commit 0c3b3213 authored by Bess严根旺's avatar Bess严根旺
Browse files
Options

feat：修改

parent c710ec4e
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 138 deletions
controllers/apiController.go
View file @ 0c3b3213
...@@ -2,10 +2,8 @@ package controllers ...@@ -2,10 +2,8 @@ package controllers
import ( import (
service "doc-service/Service" service "doc-service/Service"
"doc-service/common/log"
models "doc-service/modes" models "doc-service/modes"
"doc-service/modes/db" "doc-service/modes/db"
"doc-service/modes/db/project"
"github.com/gin-contrib/sessions" "github.com/gin-contrib/sessions"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"net/http" "net/http"
...@@ -83,14 +81,7 @@ func (con ApiController) Conversion(c *gin.Context) { ...@@ -83,14 +81,7 @@ func (con ApiController) Conversion(c *gin.Context) {
insertProject.AppId = 1 insertProject.AppId = 1
insertProject.CreatedAt = models.GetDate() insertProject.CreatedAt = models.GetDate()
insertProject.TaskId = result insertProject.TaskId = result
createErr, projectId := project.SaveOrUpdate(insertProject) models.DB.Create(insertProject)
log.Info("%+v", projectId)
if createErr != nil {
log.Error("错误信息:%+v", createErr)
}
ret["id"] = projectId
res(c, http.StatusOK, "成功", ret) res(c, http.StatusOK, "成功", ret)
} }
......
log/doc-server.log.20240823
View file @ 0c3b3213
...@@ -3,3 +3,38 @@ ...@@ -3,3 +3,38 @@
[ INFO ] 09:27:04.466260 conversionService.go:149: DoConversion result返回：map[body:map[EventId:37B-1uJGkkhpFx38IVbl3SAAOpbSFlO RequestId:47FB3386-906C-5C16-927D-EB62D662A352 TaskId:OfficeConversion-dab5cb01-6497-4575-ba72-1bffdcec94e2] headers:map[access-control-allow-origin:* access-control-expose-headers:* connection:keep-alive content-length:161 content-type:application/json;charset=utf-8 date:Fri, 23 Aug 2024 01:27:03 GMT etag:10uRBcOCFVVvkIHdbNSqmJA1 keep-alive:timeout=25 x-acs-request-id:47FB3386-906C-5C16-927D-EB62D662A352 x-acs-trace-id:72f85f5697c7b2d8f9af662f0d7bd4ed] statusCode:200] [ INFO ] 09:27:04.466260 conversionService.go:149: DoConversion result返回：map[body:map[EventId:37B-1uJGkkhpFx38IVbl3SAAOpbSFlO RequestId:47FB3386-906C-5C16-927D-EB62D662A352 TaskId:OfficeConversion-dab5cb01-6497-4575-ba72-1bffdcec94e2] headers:map[access-control-allow-origin:* access-control-expose-headers:* connection:keep-alive content-length:161 content-type:application/json;charset=utf-8 date:Fri, 23 Aug 2024 01:27:03 GMT etag:10uRBcOCFVVvkIHdbNSqmJA1 keep-alive:timeout=25 x-acs-request-id:47FB3386-906C-5C16-927D-EB62D662A352 x-acs-trace-id:72f85f5697c7b2d8f9af662f0d7bd4ed] statusCode:200]
[ INFO ] 09:27:04.468429 conversionService.go:159: 返回的task_id ：OfficeConversion-dab5cb01-6497-4575-ba72-1bffdcec94e2 [ INFO ] 09:27:04.468429 conversionService.go:159: 返回的task_id ：OfficeConversion-dab5cb01-6497-4575-ba72-1bffdcec94e2
[ INFO ] 09:27:04.488380 apiController.go:87: 3 [ INFO ] 09:27:04.488380 apiController.go:87: 3
[ ERROR ] 11:14:38.398521 conversionService.go:216: 创建项目出现异常ResourceAlreadyExists
[ INFO ] 11:14:38.399028 conversionService.go:146: 转换请求参数: map[ProjectName:DOC_TO_PDF SourceType:docx SourceURI:oss://test-bucket-v1-pub/5000000/2983767665818242051120240605155236.docx TargetType:pdf TargetURI:oss://test-bucket-v1-pub/5000000/test1756.pdf]
[ INFO ] 11:14:38.513478 conversionService.go:149: DoConversion result返回：map[body:map[EventId:1B4-1uJTpog9pyEepcQWj4ctJqjOomd RequestId:62B78A13-5C2C-50DB-9CFE-3AC45F8D228B TaskId:OfficeConversion-86958b1e-7632-49cf-ac68-3529a84f41b8] headers:map[access-control-allow-origin:* access-control-expose-headers:* connection:keep-alive content-length:161 content-type:application/json;charset=utf-8 date:Fri, 23 Aug 2024 03:14:37 GMT etag:1vvE2VXwsTrKsdiVAtfSXew1 keep-alive:timeout=25 x-acs-request-id:62B78A13-5C2C-50DB-9CFE-3AC45F8D228B x-acs-trace-id:7c6556bd2920afc74abe1d9012b550a8] statusCode:200]
[ INFO ] 11:14:38.513986 conversionService.go:159: 返回的task_id ：OfficeConversion-86958b1e-7632-49cf-ac68-3529a84f41b8
[ INFO ] 11:14:38.522930 apiController.go:93: 添加数据&{Config:0xc00017e630 Error:<nil> RowsAffected:1 Statement:0xc0000ba540 clone:0}
[ ERROR ] 11:21:19.292703 conversionService.go:216: 创建项目出现异常ResourceAlreadyExists
[ INFO ] 11:21:19.293207 conversionService.go:146: 转换请求参数: map[ProjectName:DOC_TO_PDF SourceType:docx SourceURI:oss://test-bucket-v1-pub/5000000/2983767665818242051120240605155236.docx TargetType:pdf TargetURI:oss://test-bucket-v1-pub/5000000/test1756.pdf]
[ INFO ] 11:21:19.378069 conversionService.go:149: DoConversion result返回：map[body:map[EventId:0AB-1uJUeD1G9l1WGX62GlKg1Z3Fgcc RequestId:68D5953C-BC11-52F6-BD70-955F31B78EE2 TaskId:OfficeConversion-5fde13f5-2201-441e-9fac-cc28bb4a7006] headers:map[access-control-allow-origin:* access-control-expose-headers:* connection:keep-alive content-length:161 content-type:application/json;charset=utf-8 date:Fri, 23 Aug 2024 03:21:18 GMT etag:1boRI6xTP5hz583t353azZA1 keep-alive:timeout=25 x-acs-request-id:68D5953C-BC11-52F6-BD70-955F31B78EE2 x-acs-trace-id:9aaef87850b4808bf440622a9eb57979] statusCode:200]
[ INFO ] 11:21:19.378069 conversionService.go:159: 返回的task_id ：OfficeConversion-5fde13f5-2201-441e-9fac-cc28bb4a7006
[ INFO ] 11:21:19.388384 apiController.go:86: 添加数据&{Config:0xc00017c6c0 Error:<nil> RowsAffected:1 Statement:0xc0003daa80 clone:0}
[ ERROR ] 11:22:09.473336 conversionService.go:216: 创建项目出现异常ResourceAlreadyExists
[ INFO ] 11:22:09.474366 conversionService.go:146: 转换请求参数: map[ProjectName:DOC_TO_PDF SourceType:docx SourceURI:oss://test-bucket-v1-pub/5000000/2983767665818242051120240605155236.docx TargetType:pdf TargetURI:oss://test-bucket-v1-pub/5000000/test1756.pdf]
[ INFO ] 11:22:09.543020 conversionService.go:149: DoConversion result返回：map[body:map[EventId:033-1uJUkUaVwSDKgTM7FXhZlplHKJE RequestId:AFB9FAEC-2382-5CBF-AAE4-9A15E15689A7 TaskId:OfficeConversion-2a282ba9-ba41-4868-9fdb-e234617ecdd8] headers:map[access-control-allow-origin:* access-control-expose-headers:* connection:keep-alive content-length:161 content-type:application/json;charset=utf-8 date:Fri, 23 Aug 2024 03:22:08 GMT etag:1UoWJzsjvDcSPNOziMg6CHA1 keep-alive:timeout=25 x-acs-request-id:AFB9FAEC-2382-5CBF-AAE4-9A15E15689A7 x-acs-trace-id:a0adaa95317be36e325e0fc0df7daa2a] statusCode:200]
[ INFO ] 11:22:09.543524 conversionService.go:159: 返回的task_id ：OfficeConversion-2a282ba9-ba41-4868-9fdb-e234617ecdd8
[ INFO ] 11:22:28.982792 apiController.go:86: 添加数据&{Config:0xc0001806c0 Error:<nil> RowsAffected:1 Statement:0xc0003aaa80 clone:0}
[ ERROR ] 11:23:15.998932 conversionService.go:216: 创建项目出现异常ResourceAlreadyExists
[ INFO ] 11:23:16.001717 conversionService.go:146: 转换请求参数: map[ProjectName:DOC_TO_PDF SourceType:docx SourceURI:oss://test-bucket-v1-pub/5000000/2983767665818242051120240605155236.docx TargetType:pdf TargetURI:oss://test-bucket-v1-pub/5000000/test1756.pdf]
[ INFO ] 11:23:16.062970 conversionService.go:149: DoConversion result返回：map[body:map[EventId:064-1uJUsubsKmtCbVnPoqvTNSaj6zv RequestId:033B1C64-D44F-5A70-A25D-C21F87123502 TaskId:OfficeConversion-365e8119-1756-4591-bbcd-3205b910ee4a] headers:map[access-control-allow-origin:* access-control-expose-headers:* connection:keep-alive content-length:161 content-type:application/json;charset=utf-8 date:Fri, 23 Aug 2024 03:23:15 GMT etag:1zOKtEJ3/PrLxcjyCnqXnRg1 keep-alive:timeout=25 x-acs-request-id:033B1C64-D44F-5A70-A25D-C21F87123502 x-acs-trace-id:4193e6dbeb239b184a0b555414c0a82c] statusCode:200]
[ INFO ] 11:23:16.062970 conversionService.go:159: 返回的task_id ：OfficeConversion-365e8119-1756-4591-bbcd-3205b910ee4a
[ INFO ] 11:25:06.379963 apiController.go:86: 添加数据&{Config:0xc000180510 Error:<nil> RowsAffected:1 Statement:0xc0000bc1c0 clone:0}
[ ERROR ] 11:25:27.689003 conversionService.go:216: 创建项目出现异常ResourceAlreadyExists
[ INFO ] 11:25:27.691501 conversionService.go:146: 转换请求参数: map[ProjectName:DOC_TO_PDF SourceType:docx SourceURI:oss://test-bucket-v1-pub/5000000/2983767665818242051120240605155236.docx TargetType:pdf TargetURI:oss://test-bucket-v1-pub/5000000/test1756.pdf]
[ INFO ] 11:25:27.758370 conversionService.go:149: DoConversion result返回：map[body:map[EventId:23B-1uJV9V4T31iEGfbJRqMO3uyonuW RequestId:812D46BB-225F-5F22-9325-520BC1D759FC TaskId:OfficeConversion-e4c2090d-8711-42c0-95a9-6515e94609f9] headers:map[access-control-allow-origin:* access-control-expose-headers:* connection:keep-alive content-length:161 content-type:application/json;charset=utf-8 date:Fri, 23 Aug 2024 03:25:27 GMT etag:10pELcRscBBZyjZjeOXt1bQ1 keep-alive:timeout=25 x-acs-request-id:812D46BB-225F-5F22-9325-520BC1D759FC x-acs-trace-id:35ffa8128361785fd25b2474ec02c8da] statusCode:200]
[ INFO ] 11:25:27.758370 conversionService.go:159: 返回的task_id ：OfficeConversion-e4c2090d-8711-42c0-95a9-6515e94609f9
[ INFO ] 11:25:27.767395 apiController.go:86: 添加数据1
[ ERROR ] 11:28:06.306096 conversionService.go:216: 创建项目出现异常ResourceAlreadyExists
[ INFO ] 11:28:06.306600 conversionService.go:146: 转换请求参数: map[ProjectName:DOC_TO_PDF SourceType:docx SourceURI:oss://test-bucket-v1-pub/5000000/2983767665818242051120240605155236.docx TargetType:pdf TargetURI:oss://test-bucket-v1-pub/5000000/test1756.pdf]
[ INFO ] 11:28:06.395914 conversionService.go:149: DoConversion result返回：map[body:map[EventId:1BF-1uJVTP1cgU4JYsdqsyy3RsmBfcL RequestId:68559329-7CED-54BA-B370-CD9DBC5EB2F1 TaskId:OfficeConversion-e83dadf0-9a87-42bc-b10e-262490524b2f] headers:map[access-control-allow-origin:* access-control-expose-headers:* connection:keep-alive content-length:161 content-type:application/json;charset=utf-8 date:Fri, 23 Aug 2024 03:28:05 GMT etag:1j3amIyMIuHyLNQ03pKqPMQ1 keep-alive:timeout=25 x-acs-request-id:68559329-7CED-54BA-B370-CD9DBC5EB2F1 x-acs-trace-id:5f5dfc9c89376d80b551f42512132135] statusCode:200]
[ INFO ] 11:28:06.396418 conversionService.go:159: 返回的task_id ：OfficeConversion-e83dadf0-9a87-42bc-b10e-262490524b2f
[ INFO ] 11:28:06.402444 apiController.go:86: 添加数据map[]
[ ERROR ] 11:30:04.721851 conversionService.go:216: 创建项目出现异常ResourceAlreadyExists
[ INFO ] 11:30:04.724129 conversionService.go:146: 转换请求参数: map[ProjectName:DOC_TO_PDF SourceType:docx SourceURI:oss://test-bucket-v1-pub/5000000/2983767665818242051120240605155236.docx TargetType:pdf TargetURI:oss://test-bucket-v1-pub/5000000/test1756.pdf]
[ INFO ] 11:30:04.879566 conversionService.go:149: DoConversion result返回：map[body:map[EventId:18B-1uJViIpGozEiW54l285R2h2eeVA RequestId:8383F7AF-4078-5AF3-9FB7-016D138E30C9 TaskId:OfficeConversion-bb6e38e8-817e-4a72-af2e-fbb2cccca635] headers:map[access-control-allow-origin:* access-control-expose-headers:* connection:keep-alive content-length:161 content-type:application/json;charset=utf-8 date:Fri, 23 Aug 2024 03:30:04 GMT etag:1QOMAEcVYGLjrTUlml5IM/A1 keep-alive:timeout=25 x-acs-request-id:8383F7AF-4078-5AF3-9FB7-016D138E30C9 x-acs-trace-id:505fb64a4e036bebb45a79de36676b1a] statusCode:200]
[ INFO ] 11:30:04.880071 conversionService.go:159: 返回的task_id ：OfficeConversion-bb6e38e8-817e-4a72-af2e-fbb2cccca635
[ INFO ] 11:30:04.893978 apiController.go:86: 添加数据&{Config:0xc00009c900 Error:sql: expected 10 destination arguments in Scan, not 1 RowsAffected:0 Statement:0xc0003d2a80 clone:0}
modes/db/admin.go deleted 100644 → 0
View file @ c710ec4e
package db
type Admin struct {
Id int
UserName string
Password string
}
func (a Admin) TableName() string {
return "admin"
}
modes/db/doc_server_project.go
View file @ 0c3b3213
package db package db
type DocServerProject struct { type DocServerProject struct {
Id int `db:"id"` Id int `db:"id" gorm:"primaryKey"`
ProjectName string `db:"project_name"` ProjectName string `db:"project_name"`
SourceType string `db:"source_type"` SourceType string `db:"source_type"`
TargetType string `db:"target_type"` TargetType string `db:"target_type"`
......
modes/db/project/save_or_update.go deleted 100644 → 0
View file @ c710ec4e
package project
import (
"doc-service/common/log"
models "doc-service/modes"
"doc-service/modes/db"
"errors"
)
const sqlSaveOrUpdate = `
insert into doc_server_project (
project_name, source_type, target_type, source_url, target_url, task_id,app_id,status,created_at
) value (
?, ?, ?, ?, ?, ?,?,?,?
)
on duplicate key update task_id = values(task_id), created_at = values(created_at)
`
// 保存或者更新数据
func SaveOrUpdate(project *db.DocServerProject) (error, int) {
if nil == project {
return errors.New("project 不能为空"), 0
}
stmt, err := models.MysqlDB.Prepare(sqlSaveOrUpdate)
if nil != err {
log.Error("%+v", err)
return err, 0
}
result, err1 := stmt.Exec(
//project.Id,
project.ProjectName,
project.SourceType,
project.TargetType,
project.SourceUrl,
project.TargetUrl,
project.TaskId,
project.AppId,
project.Status,
project.CreatedAt,
)
if nil != err1 {
log.Error("%+v", err1)
return err1, 0
}
rowId, err2 := result.LastInsertId()
if nil != err2 {
log.Error("%+v", err2)
return err2, 0
}
project.Id = int(rowId)
return nil, project.Id
}
modes/db/role.go deleted 100644 → 0
View file @ c710ec4e
package db
type Role struct {
Id int
Title string
Description string
Status int
AddTime int
}
func (Role) TableName() string {
return "role"
}
modes/mysql_db.go deleted 100644 → 0
View file @ c710ec4e
package models
import (
"database/sql"
commonLog "doc-service/common/log"
"fmt"
"gopkg.in/ini.v1"
"os"
"time"
)
import _ "github.com/go-sql-driver/mysql"
var MysqlDB *sql.DB
func init() {
var mysqlErr error
config, iniErr := ini.Load("./conf/app.ini")
if iniErr != nil {
commonLog.Error("读取配置文件出错%s", iniErr)
os.Exit(1)
}
ip := config.Section("mysql").Key("ip").String()
port := config.Section("mysql").Key("port").String()
user := config.Section("mysql").Key("user").String()
password := config.Section("mysql").Key("password").String()
database := config.Section("mysql").Key("database").String()
dsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=True&loc=Local", user, password, ip, port, database)
MysqlDB, mysqlErr = sql.Open("mysql", dsn)
if nil != mysqlErr {
panic(mysqlErr)
}
MysqlDB.SetMaxOpenConns(128)
MysqlDB.SetMaxIdleConns(16)
MysqlDB.SetConnMaxLifetime(2 * time.Minute)
if mysqlErr = MysqlDB.Ping(); nil != mysqlErr {
panic(mysqlErr)
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment