Skip to content

Commit 48e9899

Browse files
ZhangSetSailZhangSetSail
committed
perf: some minor detail fixes during development
1 parent c5f041d commit 48e9899

File tree

7 files changed

+31
-8
lines changed

7 files changed

+31
-8
lines changed

‎api/api/api_interface.go

+1
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ type AppInterface interface {
215215
UploadID(w http.ResponseWriter, r *http.Request)
216216
}
217217

218+
// LongVersionInterface long version interface
218219
type LongVersionInterface interface {
219220
UploadLongVersion(w http.ResponseWriter, r *http.Request)
220221
OptionLongVersion(w http.ResponseWriter, r *http.Request)

‎api/controller/cluster.go

-7
Original file line numberDiff line numberDiff line change
@@ -473,13 +473,6 @@ func (c *ClusterController) GetLangVersion(w http.ResponseWriter, r *http.Reques
473473
httputil.ReturnBcodeError(r, w, fmt.Errorf("update lang version failure: %v", err))
474474
return
475475
}
476-
//if versions != nil && len(versions) == 0 {
477-
// versions, err = db.GetManager().LongVersionDao().InitLanguageVersion(language)
478-
// if err != nil {
479-
// httputil.ReturnBcodeError(r, w, fmt.Errorf("failed to get language pack version"))
480-
// return
481-
// }
482-
//}
483476
httputil.ReturnSuccess(r, w, versions)
484477
}
485478

‎api/controller/lg_pack.go

+5
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ import (
1717
// LongVersionStruct -
1818
type LongVersionStruct struct{}
1919

20+
// BaseUploadPath lang version base dir
2021
const BaseUploadPath = "/grdata/lang"
2122

23+
// UploadLongVersion -
2224
func (t *LongVersionStruct) UploadLongVersion(w http.ResponseWriter, r *http.Request) {
2325
//从表单中读取文件
2426
file, fileHeader, err := r.FormFile("file")
@@ -69,6 +71,7 @@ func (t *LongVersionStruct) UploadLongVersion(w http.ResponseWriter, r *http.Req
6971
sendResponse(w, http.StatusOK, "successful", long)
7072
}
7173

74+
// DownloadLongVersion -
7275
func (t *LongVersionStruct) DownloadLongVersion(w http.ResponseWriter, r *http.Request) {
7376
language := strings.TrimSpace(chi.URLParam(r, "language"))
7477
version := strings.TrimSpace(chi.URLParam(r, "version"))
@@ -80,6 +83,7 @@ func (t *LongVersionStruct) DownloadLongVersion(w http.ResponseWriter, r *http.R
8083
http.ServeFile(w, r, path.Join(BaseUploadPath, ver.EventID, ver.FileName))
8184
}
8285

86+
// OptionLongVersion -
8387
func (t *LongVersionStruct) OptionLongVersion(w http.ResponseWriter, r *http.Request) {
8488
origin := r.Header.Get("Origin")
8589
w.Header().Add("Access-Control-Allow-Origin", origin)
@@ -102,6 +106,7 @@ func generateRandomString(n int) (string, error) {
102106
return string(bytes), nil
103107
}
104108

109+
// APIResponse =
105110
type APIResponse struct {
106111
Code int `json:"code"`
107112
Message string `json:"message"`

‎api/model/model.go

+1
Original file line numberDiff line numberDiff line change
@@ -2243,6 +2243,7 @@ type UploadChartValueYaml struct {
22432243
Readme string `json:"readme"`
22442244
}
22452245

2246+
// UpdateLangVersion -
22462247
type UpdateLangVersion struct {
22472248
Lang string `json:"lang"`
22482249
Version string `json:"version"`

‎cmd/version.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ func ShowVersion(module string) {
3737

3838
// GetVersion GetVersion
3939
func GetVersion() string {
40-
return "tstt"
40+
return version
4141
}

‎db/mysql/dao/lg_pack.go

+4
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ func (t *LongVersionDaoImpl) ListVersionByLanguage(language string) ([]*model.En
3838
return versions, nil
3939
}
4040

41+
// GetVersionByLanguageAndVersion -
4142
func (t *LongVersionDaoImpl) GetVersionByLanguageAndVersion(language, version string) (*model.EnterpriseLanguageVersion, error) {
4243
ver := new(model.EnterpriseLanguageVersion)
4344
if err := t.DB.Where("lang = ? and version = ?", language, version).Find(ver).Error; err != nil {
@@ -46,6 +47,7 @@ func (t *LongVersionDaoImpl) GetVersionByLanguageAndVersion(language, version st
4647
return ver, nil
4748
}
4849

50+
// DefaultLangVersion -
4951
func (t *LongVersionDaoImpl) DefaultLangVersion(lang string, version string) error {
5052
defaultVersion := new(model.EnterpriseLanguageVersion)
5153
if err := t.DB.Debug().Where("lang = ? AND first_choice = ?", lang, true).Find(defaultVersion).Error; err != nil {
@@ -73,6 +75,7 @@ func (t *LongVersionDaoImpl) DefaultLangVersion(lang string, version string) err
7375
return nil
7476
}
7577

78+
// CreateLangVersion -
7679
func (t *LongVersionDaoImpl) CreateLangVersion(lang, version, eventID, fileName string) error {
7780
ver := new(model.EnterpriseLanguageVersion)
7881
err := t.DB.Where("lang = ? and version = ?", lang, version).Find(ver).Error
@@ -92,6 +95,7 @@ func (t *LongVersionDaoImpl) CreateLangVersion(lang, version, eventID, fileName
9295
return err
9396
}
9497

98+
// DeleteLangVersion -
9599
func (t *LongVersionDaoImpl) DeleteLangVersion(lang, version string) (string, error) {
96100
ver := new(model.EnterpriseLanguageVersion)
97101
if err := t.DB.Where("lang = ? and version = ?", lang, version).Find(ver).Error; err != nil {

‎db/mysql/mysql.go

+19
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ func (m *Manager) initLanguageVersion() {
297297
}
298298
}
299299

300+
// GolangInitVersion -
300301
var GolangInitVersion = []*model.EnterpriseLanguageVersion{
301302
{
302303
Lang: "golang",
@@ -354,6 +355,8 @@ var GolangInitVersion = []*model.EnterpriseLanguageVersion{
354355
FileName: "go1.12.17.tar.gz",
355356
},
356357
}
358+
359+
// OpenJDKInitVersion -
357360
var OpenJDKInitVersion = []*model.EnterpriseLanguageVersion{
358361
{
359362
Lang: "openJDK",
@@ -418,6 +421,8 @@ var OpenJDKInitVersion = []*model.EnterpriseLanguageVersion{
418421
FileName: "OpenJDK1.8.tar.gz",
419422
},
420423
}
424+
425+
// PythonInitVersion -
421426
var PythonInitVersion = []*model.EnterpriseLanguageVersion{
422427
{
423428
Lang: "python",
@@ -457,6 +462,8 @@ var PythonInitVersion = []*model.EnterpriseLanguageVersion{
457462
FileName: "Python2.7.18.tar.gz",
458463
},
459464
}
465+
466+
// MavenInitVersion -
460467
var MavenInitVersion = []*model.EnterpriseLanguageVersion{
461468
{
462469
Lang: "maven",
@@ -502,6 +509,8 @@ var MavenInitVersion = []*model.EnterpriseLanguageVersion{
502509
FileName: "Maven3.1.1.tar.gz",
503510
},
504511
}
512+
513+
// PHPInitVersion -
505514
var PHPInitVersion = []*model.EnterpriseLanguageVersion{
506515
{
507516
Lang: "php",
@@ -517,6 +526,8 @@ var PHPInitVersion = []*model.EnterpriseLanguageVersion{
517526
FileName: "php8.1.18.tar.gz",
518527
},
519528
}
529+
530+
// NodeInitVersion -
520531
var NodeInitVersion = []*model.EnterpriseLanguageVersion{
521532
{
522533
Lang: "node",
@@ -586,6 +597,8 @@ var NodeInitVersion = []*model.EnterpriseLanguageVersion{
586597
FileName: "Node11.15.0.tar.gz",
587598
},
588599
}
600+
601+
// WebCompilerInitVersion -
589602
var WebCompilerInitVersion = []*model.EnterpriseLanguageVersion{
590603
{
591604
Lang: "web_compiler",
@@ -625,6 +638,8 @@ var WebCompilerInitVersion = []*model.EnterpriseLanguageVersion{
625638
FileName: "jetty9.tar.gz",
626639
},
627640
}
641+
642+
// WebRuntimeInitVersion -
628643
var WebRuntimeInitVersion = []*model.EnterpriseLanguageVersion{
629644
{
630645
Lang: "web_runtime",
@@ -640,6 +655,8 @@ var WebRuntimeInitVersion = []*model.EnterpriseLanguageVersion{
640655
FileName: "apache-2.2.19.tar.gz",
641656
},
642657
}
658+
659+
// NetCompilerInitVersion -
643660
var NetCompilerInitVersion = []*model.EnterpriseLanguageVersion{
644661
{
645662
Lang: "net_compiler",
@@ -655,6 +672,8 @@ var NetCompilerInitVersion = []*model.EnterpriseLanguageVersion{
655672
FileName: "mcr.microsoft.com/dotnet/sdk:2.1-sdk-alpine",
656673
},
657674
}
675+
676+
// NetRuntimeInitVersion -
658677
var NetRuntimeInitVersion = []*model.EnterpriseLanguageVersion{
659678
{
660679
Lang: "net_runtime",

0 commit comments

Comments
 (0)