From 3de489226447506949db2265b97ae165b044be84 Mon Sep 17 00:00:00 2001 From: Ryan Su Date: Tue, 30 May 2023 17:50:04 +0800 Subject: [PATCH 1/4] feat: i18n config --- api/internal/config/config.go | 2 ++ api/internal/svc/service_context.go | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/api/internal/config/config.go b/api/internal/config/config.go index d595abef..2f8509b9 100644 --- a/api/internal/config/config.go +++ b/api/internal/config/config.go @@ -2,6 +2,7 @@ package config import ( "github.com/suyuan32/simple-admin-common/config" + "github.com/suyuan32/simple-admin-common/i18n" "github.com/suyuan32/simple-admin-common/plugins/casbin" "github.com/suyuan32/simple-admin-common/utils/captcha" "github.com/zeromicro/go-zero/core/stores/redis" @@ -18,4 +19,5 @@ type Config struct { Captcha captcha.Conf DatabaseConf config.DatabaseConf CasbinConf casbin.CasbinConf + I18nConf i18n.Conf } diff --git a/api/internal/svc/service_context.go b/api/internal/svc/service_context.go index de510693..38e1b834 100644 --- a/api/internal/svc/service_context.go +++ b/api/internal/svc/service_context.go @@ -35,7 +35,12 @@ func NewServiceContext(c config.Config) *ServiceContext { cbn := c.CasbinConf.MustNewCasbinWithRedisWatcher(c.DatabaseConf.Type, c.DatabaseConf.GetDSN(), c.RedisConf) - trans := i18n.NewTranslator(i18n2.LocaleFS) + var trans *i18n.Translator + if c.I18nConf.Dir != "" { + trans = i18n.NewTranslatorFromFile(c.I18nConf) + } else { + trans = i18n.NewTranslator(i18n2.LocaleFS) + } return &ServiceContext{ Config: c, From 3c059c94d75aee0ad303390f8a9eb43e304a0287 Mon Sep 17 00:00:00 2001 From: Ryan Su Date: Wed, 31 May 2023 17:46:30 +0800 Subject: [PATCH 2/4] chore: update dependencies --- api/core.go | 2 +- api/etc/core.yaml | 2 ++ core.yml | 2 +- go.mod | 30 +++++++++++++----------- go.sum | 60 +++++++++++++++++++++++++---------------------- 5 files changed, 52 insertions(+), 44 deletions(-) diff --git a/api/core.go b/api/core.go index 8276f9d3..2e604b9d 100644 --- a/api/core.go +++ b/api/core.go @@ -5,7 +5,7 @@ // Schemes: http, https // Host: localhost:9100 // BasePath: / -// Version: 1.0.6 +// Version: 1.0.7 // Contact: yuansu.china.work@gmail.com // SecurityDefinitions: // Token: diff --git a/api/etc/core.yaml b/api/etc/core.yaml index edf9b031..53658e12 100644 --- a/api/etc/core.yaml +++ b/api/etc/core.yaml @@ -63,6 +63,8 @@ CasbinConf: [matchers] m = r.sub == p.sub && keyMatch2(r.obj,p.obj) && r.act == p.act +I18nConf: + Dir: # set the path of locale if you need to load files # Tracing Analysis diff --git a/core.yml b/core.yml index 07ab9e3c..e33f5280 100644 --- a/core.yml +++ b/core.yml @@ -2504,7 +2504,7 @@ info: email: yuansu.china.work@gmail.com description: This is simple admin api doc title: Simple Admin - version: 1.0.6 + version: 1.0.7 paths: /api: post: diff --git a/go.mod b/go.mod index dae4bb1b..b4ff9138 100644 --- a/go.mod +++ b/go.mod @@ -4,19 +4,19 @@ go 1.20 require ( entgo.io/ent v0.12.3 - github.com/casbin/casbin/v2 v2.69.0 + github.com/casbin/casbin/v2 v2.69.1 github.com/gofrs/uuid/v5 v5.0.0 github.com/hibiken/asynq v0.24.1 github.com/mojocn/base64Captcha v1.3.5 - github.com/suyuan32/simple-admin-common v1.0.6 - github.com/suyuan32/simple-admin-job v1.0.6 + github.com/suyuan32/simple-admin-common v1.0.7 + github.com/suyuan32/simple-admin-job v1.0.7 github.com/zeromicro/go-zero v1.5.2 golang.org/x/oauth2 v0.6.0 google.golang.org/grpc v1.55.0 google.golang.org/protobuf v1.30.0 ) -replace github.com/zeromicro/go-zero v1.5.2 => github.com/suyuan32/simple-admin-tools v1.5.7 +replace github.com/zeromicro/go-zero v1.5.2 => github.com/suyuan32/simple-admin-tools v1.5.8 require ( ariga.io/atlas v0.10.2-0.20230427182402-87a07dfb83bf // indirect @@ -90,7 +90,7 @@ require ( github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.42.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect - github.com/redis/go-redis/v9 v9.0.4 // indirect + github.com/redis/go-redis/v9 v9.0.5 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/spf13/cast v1.5.0 // indirect @@ -98,15 +98,17 @@ require ( go.etcd.io/etcd/api/v3 v3.5.9 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect go.etcd.io/etcd/client/v3 v3.5.9 // indirect - go.opentelemetry.io/otel v1.15.1 // indirect - go.opentelemetry.io/otel/exporters/jaeger v1.15.1 // indirect - go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.15.1 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.15.1 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.15.1 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.15.1 // indirect - go.opentelemetry.io/otel/exporters/zipkin v1.15.1 // indirect - go.opentelemetry.io/otel/sdk v1.15.1 // indirect - go.opentelemetry.io/otel/trace v1.15.1 // indirect + go.opentelemetry.io/otel v1.16.0 // indirect + go.opentelemetry.io/otel/exporters/jaeger v1.16.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0 // indirect + go.opentelemetry.io/otel/exporters/zipkin v1.16.0 // indirect + go.opentelemetry.io/otel/metric v1.16.0 // indirect + go.opentelemetry.io/otel/sdk v1.16.0 // indirect + go.opentelemetry.io/otel/trace v1.16.0 // indirect go.opentelemetry.io/proto/otlp v0.19.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/automaxprocs v1.5.2 // indirect diff --git a/go.sum b/go.sum index 36aae867..41cc03e1 100644 --- a/go.sum +++ b/go.sum @@ -76,8 +76,8 @@ github.com/bsm/gomega v1.26.0 h1:LhQm+AFcgV2M0WyKroMASzAzCAJVpAxQXv4SaI9a69Y= github.com/bsm/gomega v1.26.0/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/casbin/casbin/v2 v2.29.2/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg= -github.com/casbin/casbin/v2 v2.69.0 h1:hF9iUqqVJNqaG9U3SEmVRDe1eRmLUZZjO2MMGd2Pcuk= -github.com/casbin/casbin/v2 v2.69.0/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg= +github.com/casbin/casbin/v2 v2.69.1 h1:R3e7uveIRN5Pdqvq0GXEhXmn7HyfoEVjp21/mgEXbdI= +github.com/casbin/casbin/v2 v2.69.1/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg= github.com/casbin/ent-adapter v0.3.0 h1:4lkhB/BwXAhj84iSrZG/gQ4avkO4uPwz4kdDP1VEnww= github.com/casbin/ent-adapter v0.3.0/go.mod h1:U6saAFuVDEOWLCtrgx35d95M12FC0uh5GtJL82QunRM= github.com/casbin/redis-watcher/v2 v2.5.0 h1:a0922GOKYDSSiD7hEQxmLh/psea2eLZtf1V12XzLI5w= @@ -477,8 +477,8 @@ github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJf github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/redis/go-redis/v9 v9.0.3/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk= -github.com/redis/go-redis/v9 v9.0.4 h1:FC82T+CHJ/Q/PdyLW++GeCO+Ol59Y4T7R4jbgjvktgc= -github.com/redis/go-redis/v9 v9.0.4/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk= +github.com/redis/go-redis/v9 v9.0.5 h1:CuQcn5HIEeK7BgElubPP8CGtE0KakrnbBSTLjathl5o= +github.com/redis/go-redis/v9 v9.0.5/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= @@ -536,12 +536,12 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/suyuan32/simple-admin-common v1.0.6 h1:l9yTrZNgXPoSogav+EWCAQSMEAXSq8X5ZJMabTMtKAA= -github.com/suyuan32/simple-admin-common v1.0.6/go.mod h1:eGG/rKNL+hyFSW9/lbK4Qq/gL7Fa3w1PhhVknb1HOMQ= -github.com/suyuan32/simple-admin-job v1.0.6 h1:tERz1W0UL0lfKDG5x0wFY7V+kMrIB0tqwoVOIgduedQ= -github.com/suyuan32/simple-admin-job v1.0.6/go.mod h1:TAeMpDMLshq9gSapEevIGFmTp9zvE22jjBvvHeBwlHY= -github.com/suyuan32/simple-admin-tools v1.5.7 h1:J1RjcTBqXDM687ld3oyLmysBu9KI06UgaaZtiJLOEl8= -github.com/suyuan32/simple-admin-tools v1.5.7/go.mod h1:11+ZssQCBKrRvpkmZJPUofpLcmBtuUIn/SO30GSrQSI= +github.com/suyuan32/simple-admin-common v1.0.7 h1:jv+bqNSobWh+9YiWaPYPGqFxdFwM3DmJUJKq4UsWxOc= +github.com/suyuan32/simple-admin-common v1.0.7/go.mod h1:uCT2akzJwHLoaNhay7/CRH0RHSNJWrVECn01pagXT9o= +github.com/suyuan32/simple-admin-job v1.0.7 h1:pgV4FQMjwyQ93MBKLlTwu6J6RNO29t2H3+49Sqk7Wrs= +github.com/suyuan32/simple-admin-job v1.0.7/go.mod h1:7CLdcDL53uczIap1FjA76vxHnpDJhk+mKWt0HB+e2qg= +github.com/suyuan32/simple-admin-tools v1.5.8 h1:D/svqEC2YclCFmkvSUyQLkUrCvlAyNnUnpoVuDpGghU= +github.com/suyuan32/simple-admin-tools v1.5.8/go.mod h1:pxTc1iLV4Honp1vAC3iASnlywesMqu2z6IkaDMhPOpY= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= @@ -570,24 +570,28 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/otel v1.15.1 h1:3Iwq3lfRByPaws0f6bU3naAqOR1n5IeDWd9390kWHa8= -go.opentelemetry.io/otel v1.15.1/go.mod h1:mHHGEHVDLal6YrKMmk9LqC4a3sF5g+fHfrttQIB1NTc= -go.opentelemetry.io/otel/exporters/jaeger v1.15.1 h1:x3SLvwli0OyAJapNcOIzf1xXBRBA+HD3elrMQmFfmXo= -go.opentelemetry.io/otel/exporters/jaeger v1.15.1/go.mod h1:0Ck9b5oLL/bFZvfAEEqtrb1U0jZXjm5fWXMCOCG3vvM= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.15.1 h1:XYDQtNzdb2T4uM1pku2m76eSMDJgqhJ+6KzkqgQBALc= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.15.1/go.mod h1:uOTV75+LOzV+ODmL8ahRLWkFA3eQcSC2aAsbxIu4duk= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.15.1 h1:tyoeaUh8REKay72DVYsSEBYV18+fGONe+YYPaOxgLoE= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.15.1/go.mod h1:HUSnrjQQ19KX9ECjpQxufsF+3ioD3zISPMlauTPZu2g= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.15.1 h1:pIfoG5IAZFzp9EUlJzdSkpUwpaUAAnD+Ru1nBLTACIQ= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.15.1/go.mod h1:poNKBqF5+nR/6ke2oGTDjHfksrsHDOHXAl2g4+9ONsY= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.15.1 h1:pnJfHmVcCEBcH5lkM+npJF8cTAjV/d+9cXVNCs5P/ao= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.15.1/go.mod h1:cC3Eu2V56zXY09YlijmqDhOUnL2jVL6KKJg4PGh++dU= -go.opentelemetry.io/otel/exporters/zipkin v1.15.1 h1:B6s/o48bx00ayJu7F+jIMJfhPTyxW+S8vthjTZMNBj0= -go.opentelemetry.io/otel/exporters/zipkin v1.15.1/go.mod h1:EjjV7/YfYXG+khxCOfG6PPeRGoOmtcSusyW66qPqpRQ= -go.opentelemetry.io/otel/sdk v1.15.1 h1:5FKR+skgpzvhPQHIEfcwMYjCBr14LWzs3uSqKiQzETI= -go.opentelemetry.io/otel/sdk v1.15.1/go.mod h1:8rVtxQfrbmbHKfqzpQkT5EzZMcbMBwTzNAggbEAM0KA= -go.opentelemetry.io/otel/trace v1.15.1 h1:uXLo6iHJEzDfrNC0L0mNjItIp06SyaBQxu5t3xMlngY= -go.opentelemetry.io/otel/trace v1.15.1/go.mod h1:IWdQG/5N1x7f6YUlmdLeJvH9yxtuJAfc4VW5Agv9r/8= +go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= +go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= +go.opentelemetry.io/otel/exporters/jaeger v1.16.0 h1:YhxxmXZ011C0aDZKoNw+juVWAmEfv/0W2XBOv9aHTaA= +go.opentelemetry.io/otel/exporters/jaeger v1.16.0/go.mod h1:grYbBo/5afWlPpdPZYhyn78Bk04hnvxn2+hvxQhKIQM= +go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 h1:t4ZwRPU+emrcvM2e9DHd0Fsf0JTPVcbfa/BhTDF03d0= +go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0/go.mod h1:vLarbg68dH2Wa77g71zmKQqlQ8+8Rq3GRG31uc0WcWI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 h1:cbsD4cUcviQGXdw8+bo5x2wazq10SKz8hEbtCRPcU78= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0/go.mod h1:JgXSGah17croqhJfhByOLVY719k1emAXC8MVhCIJlRs= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 h1:TVQp/bboR4mhZSav+MdgXB8FaRho1RC8UwVn3T0vjVc= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0/go.mod h1:I33vtIe0sR96wfrUcilIzLoA3mLHhRmz9S9Te0S3gDo= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0 h1:iqjq9LAB8aK++sKVcELezzn655JnBNdsDhghU4G/So8= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0/go.mod h1:hGXzO5bhhSHZnKvrDaXB82Y9DRFour0Nz/KrBh7reWw= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0 h1:+XWJd3jf75RXJq29mxbuXhCXFDG3S3R4vBUeSI2P7tE= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0/go.mod h1:hqgzBPTf4yONMFgdZvL/bK42R/iinTyVQtiWihs3SZc= +go.opentelemetry.io/otel/exporters/zipkin v1.16.0 h1:WdMSH6vIJ+myJfr/HB/pjsYoJWQP0Wz/iJ1haNO5hX4= +go.opentelemetry.io/otel/exporters/zipkin v1.16.0/go.mod h1:QjDOKdylighHJBc7pf4Vo6fdhtiEJEqww/3Df8TOWjo= +go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= +go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= +go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= +go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= +go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.19.0 h1:IVN6GR+mhC4s5yfcTbmzHYODqvWAp3ZedA2SJPI1Nnw= go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= From 711c6571e97ce4a9d6f85ea0e90d9d7bfdb6483b Mon Sep 17 00:00:00 2001 From: Ryan Su Date: Wed, 31 May 2023 18:14:52 +0800 Subject: [PATCH 3/4] fix: update images in all-in-one --- deploy/docker-compose/all_in_one/docker-compose.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/deploy/docker-compose/all_in_one/docker-compose.yaml b/deploy/docker-compose/all_in_one/docker-compose.yaml index 07a9df40..7408ef4c 100644 --- a/deploy/docker-compose/all_in_one/docker-compose.yaml +++ b/deploy/docker-compose/all_in_one/docker-compose.yaml @@ -63,7 +63,7 @@ services: memory: 200M core-rpc: - image: ryanpower/core-rpc-docker:v1.0.6 + image: ryanpower/core-rpc-docker:v1.0.7 container_name: core-rpc restart: always ports: @@ -83,7 +83,7 @@ services: memory: 200M job-rpc: - image: ryanpower/job-rpc-docker:v1.0.6 + image: ryanpower/job-rpc-docker:v1.0.7 container_name: job-rpc restart: always ports: @@ -103,7 +103,7 @@ services: memory: 200M core-api: - image: ryanpower/core-api-docker:v1.0.6 + image: ryanpower/core-api-docker:v1.0.7 container_name: core-api restart: always # environment: @@ -125,7 +125,7 @@ services: memory: 200M backend-ui: - image: ryanpower/backend-ui-docker:v1.0.6 + image: ryanpower/backend-ui-docker:v1.0.7 container_name: backend-ui restart: always ports: @@ -145,7 +145,7 @@ services: memory: 200M fms-api: - image: ryanpower/fms-api-docker:v1.0.6 + image: ryanpower/fms-api-docker:v1.0.7 container_name: fms-api restart: always # environment: From 2cb88f66bfe9b8ad13b77dd529088f38e053d04d Mon Sep 17 00:00:00 2001 From: Ryan Su Date: Wed, 31 May 2023 18:20:16 +0800 Subject: [PATCH 4/4] fix: add i18n files in dockerfile --- Dockerfile-api | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile-api b/Dockerfile-api index aba4d59c..ab6b08f7 100644 --- a/Dockerfile-api +++ b/Dockerfile-api @@ -31,6 +31,7 @@ ENV CONFIG_FILE=${CONFIG_FILE} COPY --from=builder /build/api/${PROJECT}_api ./ COPY --from=builder /build/api/etc/${CONFIG_FILE} ./etc/ +COPY --from=builder /build/api/internal/i18n/locale/ ./etc/locale/ EXPOSE 9100 ENTRYPOINT ./${PROJECT}_api -f etc/${CONFIG_FILE} \ No newline at end of file