Skip to content

Commit 43c899e

Browse files
songzhibin97songzhibin97
authored
fix:replace the method of abandonment (flipped-aurora#1075)
* fix:replace the method of abandonment
1 parent ec4d257 commit 43c899e

File tree

4 files changed

+28
-20
lines changed

4 files changed

+28
-20
lines changed

‎server/api/v1/system/sys_auto_code.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package system
33
import (
44
"errors"
55
"fmt"
6+
"golang.org/x/text/cases"
7+
"golang.org/x/text/language"
68
"net/url"
79
"os"
810
"strings"
@@ -18,6 +20,8 @@ import (
1820

1921
type AutoCodeApi struct{}
2022

23+
var caser = cases.Title(language.English)
24+
2125
// PreviewTemp
2226
// @Tags AutoCode
2327
// @Summary 预览创建后的代码
@@ -34,7 +38,8 @@ func (autoApi *AutoCodeApi) PreviewTemp(c *gin.Context) {
3438
response.FailWithMessage(err.Error(), c)
3539
return
3640
}
37-
a.PackageT = strings.Title(a.Package)
41+
42+
a.PackageT = caser.String(a.Package)
3843
autoCode, err := autoCodeService.PreviewTemp(a)
3944
if err != nil {
4045
global.GVA_LOG.Error("预览失败!", zap.Error(err))
@@ -71,7 +76,7 @@ func (autoApi *AutoCodeApi) CreateTemp(c *gin.Context) {
7176
apiIds = ids
7277
}
7378
}
74-
a.PackageT = strings.Title(a.Package)
79+
a.PackageT = caser.String(a.Package)
7580
err := autoCodeService.CreateTemp(a, apiIds...)
7681
if err != nil {
7782
if errors.Is(err, system.AutoMoveErr) {

‎server/go.mod

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,39 @@ require (
66
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
77
github.com/aliyun/aliyun-oss-go-sdk v2.1.6+incompatible
88
github.com/aws/aws-sdk-go v1.42.27
9+
github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
910
github.com/casbin/casbin/v2 v2.11.0
1011
github.com/casbin/gorm-adapter/v3 v3.0.2
11-
github.com/flipped-aurora/gva-plugins v0.0.0-20210828060501-fc8b729b9a4a
1212
github.com/flipped-aurora/ws v1.0.2
1313
github.com/fsnotify/fsnotify v1.4.9
1414
github.com/fvbock/endless v0.0.0-20170109170031-447134032cb6
1515
github.com/gin-gonic/gin v1.7.0
16+
github.com/go-openapi/jsonreference v0.19.6 // indirect
17+
github.com/go-openapi/spec v0.20.3 // indirect
18+
github.com/go-openapi/swag v0.19.15 // indirect
1619
github.com/go-redis/redis/v8 v8.11.0
1720
github.com/go-sql-driver/mysql v1.5.0
1821
github.com/golang-jwt/jwt/v4 v4.3.0
1922
github.com/gookit/color v1.3.1
2023
github.com/huaweicloud/huaweicloud-sdk-go-obs v3.21.8+incompatible
2124
github.com/jackc/pgx/v4 v4.15.0 // indirect
2225
github.com/jordan-wright/email v0.0.0-20200824153738-3f5bafa1cd84
26+
github.com/json-iterator/go v1.1.10 // indirect
27+
github.com/mailru/easyjson v0.7.7 // indirect
28+
github.com/mitchellh/mapstructure v1.2.2 // indirect
2329
github.com/mojocn/base64Captcha v1.3.1
2430
github.com/natefinch/lumberjack v2.0.0+incompatible
31+
github.com/pelletier/go-toml v1.6.0 // indirect
2532
github.com/pkg/errors v0.9.1
2633
github.com/qiniu/api.v7/v7 v7.4.1
2734
github.com/robfig/cron/v3 v3.0.1
2835
github.com/satori/go.uuid v1.2.0
2936
github.com/shirou/gopsutil v3.21.9+incompatible
3037
github.com/songzhibin97/gkit v1.1.1
38+
github.com/spf13/afero v1.2.2 // indirect
39+
github.com/spf13/cast v1.3.1 // indirect
40+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
41+
github.com/spf13/pflag v1.0.5 // indirect
3142
github.com/spf13/viper v1.7.0
3243
github.com/stretchr/testify v1.7.0
3344
github.com/swaggo/gin-swagger v1.3.0
@@ -37,8 +48,11 @@ require (
3748
github.com/unrolled/secure v1.0.7
3849
github.com/xuri/excelize/v2 v2.4.1
3950
go.uber.org/zap v1.16.0
40-
golang.org/x/crypto v0.0.0-20220213190939-1e6e3497d506 // indirect
51+
golang.org/x/crypto v0.0.0-20220213190939-1e6e3497d506
4152
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
53+
golang.org/x/text v0.3.7
54+
golang.org/x/tools v0.1.5 // indirect
55+
gopkg.in/ini.v1 v1.55.0 // indirect
4256
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
4357
gorm.io/driver/mysql v1.0.1
4458
gorm.io/driver/postgres v1.2.3

‎server/go.sum

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,7 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
8686
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
8787
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
8888
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
89-
github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239/go.mod h1:Gdwt2ce0yfBxPvZrHkprdPPTTS3N5rwmLE8T22KBXlw=
9089
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
91-
github.com/flipped-aurora/gin-vue-admin/server v0.0.0-20210823151324-f5410430faf0/go.mod h1:ksHCxOjTTQDk1Y1MrptfG6e9+s3rDJzQXkIZBHl8sws=
92-
github.com/flipped-aurora/gva-plugins v0.0.0-20210828060501-fc8b729b9a4a h1:GEU1KU8lvWWwvHNTXaoVxonsp8t120oFQnlpAtGqKpM=
93-
github.com/flipped-aurora/gva-plugins v0.0.0-20210828060501-fc8b729b9a4a/go.mod h1:/DpDUj/vphN4x3UaTDhTvT6aZaCasfKOGbMgPabwGv0=
9490
github.com/flipped-aurora/ws v1.0.2 h1:oEUz7sgrbPENvgli7Q4QpC0NIEbJucgR4yjcDMg/AjY=
9591
github.com/flipped-aurora/ws v1.0.2/go.mod h1:RdyM2Fnvxx7f7A6WSmU1aAhDrQIAVW7LS/0LsAUE5mE=
9692
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
@@ -145,7 +141,6 @@ github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTM
145141
github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
146142
github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
147143
github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
148-
github.com/go-playground/validator/v10 v10.3.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
149144
github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
150145
github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
151146
github.com/go-redis/redis/v8 v8.11.0 h1:O1Td0mQ8UFChQ3N9zFQqo6kTU2cJ+/it88gDB+zg0wo=
@@ -316,7 +311,6 @@ github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dv
316311
github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
317312
github.com/jackc/puddle v1.2.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
318313
github.com/jackc/puddle v1.2.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
319-
github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869/go.mod h1:cJ6Cj7dQo+O6GJNiMx+Pa94qKj+TG8ONdKHgMNIyyag=
320314
github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
321315
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
322316
github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
@@ -357,9 +351,6 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
357351
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
358352
github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
359353
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
360-
github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is=
361-
github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA=
362-
github.com/lestrrat-go/strftime v1.0.3/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
363354
github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
364355
github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
365356
github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@@ -465,7 +456,6 @@ github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
465456
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
466457
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
467458
github.com/shirou/gopsutil v3.20.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
468-
github.com/shirou/gopsutil v3.21.1+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
469459
github.com/shirou/gopsutil v3.21.9+incompatible h1:LTLpUnfX81MkHeCtSrwNKZwuW5Id6kCa7/P43NdcNn4=
470460
github.com/shirou/gopsutil v3.21.9+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
471461
github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
@@ -516,7 +506,6 @@ github.com/swaggo/gin-swagger v1.3.0/go.mod h1:oy1BRA6WvgtCp848lhxce7BnWH4C8Bxa0
516506
github.com/swaggo/swag v1.5.1/go.mod h1:1Bl9F/ZBpVWh22nY0zmYyASPO1lI/zIwRDrpZU+tv8Y=
517507
github.com/swaggo/swag v1.7.0 h1:5bCA/MTLQoIqDXXyHfOpMeDvL9j68OY/udlK4pQoo4E=
518508
github.com/swaggo/swag v1.7.0/go.mod h1:BdPIL73gvS9NBsdi7M1JOxLvlbfvNRaBP8m6WT6Aajo=
519-
github.com/tebeka/strftime v0.1.3/go.mod h1:7wJm3dZlpr4l/oVK0t1HYIc4rMzQ2XJlOMIUJUJH6XQ=
520509
github.com/tencentyun/cos-go-sdk-v5 v0.7.19 h1:janAfTO4MglOrUFuKGTQJBuMc66+F7TgtEIt1wPsJ+k=
521510
github.com/tencentyun/cos-go-sdk-v5 v0.7.19/go.mod h1:wQBO5HdAkLjj2q6XQiIfDSP8DXDNrppDRw2Kp/1BODA=
522511
github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev3vTo=
@@ -690,7 +679,6 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
690679
golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
691680
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
692681
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
693-
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
694682
golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71 h1:ikCpsnYR+Ew0vu99XlDp55lGgDJdIMx3f4a18jfse/s=
695683
golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
696684
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
@@ -780,7 +768,6 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
780768
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
781769
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
782770
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
783-
google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
784771
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
785772
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
786773
google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
@@ -826,7 +813,6 @@ gorm.io/driver/sqlserver v0.2.4/go.mod h1:TcPfkdce5b8qlCMgyUeUdm7HQa1ZzWUuxzI+od
826813
gorm.io/gorm v0.2.19/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
827814
gorm.io/gorm v0.2.23/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
828815
gorm.io/gorm v1.9.19/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
829-
gorm.io/gorm v1.20.7/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
830816
gorm.io/gorm v1.22.3/go.mod h1:F+OptMscr0P2F2qU97WT1WimdH9GaQPoDW7AYd5i2Y0=
831817
gorm.io/gorm v1.22.5 h1:lYREBgc02Be/5lSCTuysZZDb6ffL2qrat6fg9CFbvXU=
832818
gorm.io/gorm v1.22.5/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=

‎server/service/system/sys_auto_code.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import (
1010
"go/format"
1111
"go/parser"
1212
"go/token"
13+
"golang.org/x/text/cases"
14+
"golang.org/x/text/language"
1315
"io/ioutil"
1416
"log"
1517
"os"
@@ -48,6 +50,7 @@ type autoPackage struct {
4850
var (
4951
packageInjectionMap map[string]astInjectionMeta
5052
injectionPaths []injectionMeta
53+
caser = cases.Title(language.English)
5154
)
5255

5356
func Init(Package string) {
@@ -619,7 +622,7 @@ func (autoCodeService *AutoCodeService) CreatePackageTemp(packageName string) er
619622
// 创建完成后在对应的位置插入结构代码
620623
for _, v := range pendingTemp {
621624
meta := packageInjectionMap[v.name]
622-
if err := ImportReference(meta.path, fmt.Sprintf(meta.importCodeF, v.name, packageName), fmt.Sprintf(meta.structNameF, strings.Title(packageName)), fmt.Sprintf(meta.packageNameF, packageName), meta.groupName); err != nil {
625+
if err := ImportReference(meta.path, fmt.Sprintf(meta.importCodeF, v.name, packageName), fmt.Sprintf(meta.structNameF, caser.String(packageName)), fmt.Sprintf(meta.packageNameF, packageName), meta.groupName); err != nil {
623626
return err
624627
}
625628
}
@@ -750,7 +753,7 @@ func (vi *Visitor) addFuncBodyVar(funDecl *ast.FuncDecl) ast.Visitor {
750753
},
751754
},
752755
Sel: &ast.Ident{
753-
Name: strings.Title(vi.PackageName),
756+
Name: caser.String(vi.PackageName),
754757
},
755758
},
756759
},

0 commit comments

Comments
 (0)