From 640f303aec3812d033dc4e9c901037627af51ca9 Mon Sep 17 00:00:00 2001 From: workabee <2950914812@qq.com> Date: Mon, 19 Feb 2024 14:37:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/config.yaml | 35 ++++++++++++++++++ conf/dubbogo.yaml | 68 +++++++++++++++++++++++++++++++++++ internal/config/app_config.go | 2 +- internal/model/ocr.go | 31 ++++++++-------- pkg/service/init.go | 2 +- 5 files changed, 122 insertions(+), 16 deletions(-) create mode 100644 conf/config.yaml create mode 100644 conf/dubbogo.yaml diff --git a/conf/config.yaml b/conf/config.yaml new file mode 100644 index 0000000..3d9ffd4 --- /dev/null +++ b/conf/config.yaml @@ -0,0 +1,35 @@ +system: + domain: exhibitiontest + mode: dev + node_num: 3 + port: 8086 + key: + cert: + is_https: false + cron: false + key_path: "" + cert_path: "" +redis: + db: 1 + addr: 127.0.0.1:6379 + password: +jaeger: + addr: 127.0.0.1:6831 + open: true +zapLog: + level: "info" + filename: "logs/exhibition-main.log" + max_size: 5 + max_age: 30 + max_backups: 30 +jwt: + key: "3Ei*^!a6^6$w^wgK" + expire: 24 +bos: + AccessKeyId: "ALTAKxrqOQHnAN525Tb2GX4Bhe" + AccessKeySecret: "d2ecaa9d75114d3b9f42b99014198306" + BucketName: "dci-file-new" + Endpoint: ".bj.bcebos.com" + BosBaseDir: "exhibition" + Host: "https://bj.bcebos.com" + CdnHost: "https://cdns.fontree.cn" \ No newline at end of file diff --git a/conf/dubbogo.yaml b/conf/dubbogo.yaml new file mode 100644 index 0000000..e53ca1d --- /dev/null +++ b/conf/dubbogo.yaml @@ -0,0 +1,68 @@ +dubbo: + registries: + demoZK: + protocol: zookeeper + timeout: 30s + address: 127.0.0.1:2181 + consumer: + filter: tracing + request-timeout: 30s + params: + max-call-send-msg-size: 8000000 + max-call-recv-msg-size: 8000000 + references: + AccountClientImpl: + protocol: tri + retries: 0 + interface: com.fontree.microservices.common.Account + filter: cshutdown,sign + params: + .accessKeyId: "Accountksl" + .secretAccessKey: "BSDY-FDF1-Fontree_account" + ExhibitionClientImpl: + protocol: tri + interface: com.fontree.microservices.common.Exhibition + ArtistClientImpl: + protocol: tri + interface: com.fontree.microservices.common.Artist + logger: + zap-config: + level: error # 日志级别 + development: false + disableCaller: false + disableStacktrace: false + encoding: "json" + # zap encoder 配置 + encoderConfig: + messageKey: "message" + levelKey: "level" + timeKey: "time" + nameKey: "logger" + callerKey: "caller" + stacktraceKey: "stacktrace" + lineEnding: "" + levelEncoder: "capitalColor" + timeEncoder: "iso8601" + durationEncoder: "seconds" + callerEncoder: "short" + nameEncoder: "" + EncodeTime: zapcore.TimeEncoderOfLayout("2006-01-02 15:04:05.000"), + EncodeDuration: zapcore.SecondsDurationEncoder, + outputPaths: + - "stderr" + errorOutputPaths: + - "stderr" + lumberjack-config: + # 写日志的文件名称 + filename: "logs/runtime/exhibition-main.log" + # 每个日志文件长度的最大大小，单位是 MiB。默认 100MiB + maxSize: 5 + # 日志保留的最大天数(只保留最近多少天的日志) + maxAge: 30 + # 只保留最近多少个日志文件，用于控制程序总日志的大小 + maxBackups: 30 + # 是否使用本地时间，默认使用 UTC 时间 + localTime: true + # 是否压缩日志文件，压缩方法 gzip + compress: false + diff --git a/internal/config/app_config.go b/internal/config/app_config.go index 4907e17..b537d99 100644 --- a/internal/config/app_config.go +++ b/internal/config/app_config.go @@ -55,7 +55,7 @@ type AppConfig struct { func GetConf() (iniConf string, err error) { if os.Getenv(model.MODE_ENV) != "" { - if err = os.Setenv(constant.ConfigFileEnvKey, fmt.Sprintf("./conf/%s%s", os.Getenv(model.MODE_ENV), model.SERVER_DUBBOGO_CONFIG)); err != nil { + if err = os.Setenv(constant.ConfigFileEnvKey, fmt.Sprintf("./conf/%s/%s", os.Getenv(model.MODE_ENV), model.SERVER_DUBBOGO_CONFIG)); err != nil { return } } diff --git a/internal/model/ocr.go b/internal/model/ocr.go index 4e50867..861dc68 100644 --- a/internal/model/ocr.go +++ b/internal/model/ocr.go @@ -100,6 +100,7 @@ func OcrGetIdCard(image string, side string) (*OrcRes, error) { return nil, err } fmt.Printf("%+v\n", res) + switch res.ImageStatus { case "normal": @@ -120,20 +121,22 @@ func OcrGetIdCard(image string, side string) (*OrcRes, error) { default: return nil, errors.New("未知状态") } - switch res.IdcardNumberType { - case -1: - return nil, errors.New("身份证正面所有字段全为空") - case 0: - return nil, errors.New(" 身份证证号不合法，此情况下不返回身份证证号") - case 1: - case 2: - return nil, errors.New("身份证证号和性别、出生信息都不一致") - case 3: - return nil, errors.New("身份证证号和出生信息不一致") - case 4: - return nil, errors.New("身份证证号和性别信息不一致") - default: - return nil, errors.New("未知状态") + if side == "front" { + switch res.IdcardNumberType { + case -1: + return nil, errors.New("身份证正面所有字段全为空") + case 0: + return nil, errors.New(" 身份证证号不合法，此情况下不返回身份证证号") + case 1: + case 2: + return nil, errors.New("身份证证号和性别、出生信息都不一致") + case 3: + return nil, errors.New("身份证证号和出生信息不一致") + case 4: + return nil, errors.New("身份证证号和性别信息不一致") + default: + return nil, errors.New("未知状态") + } } var result OrcRes fmt.Println(res.WordsResult.Name.Words) diff --git a/pkg/service/init.go b/pkg/service/init.go index 665f9e4..5b886fe 100644 --- a/pkg/service/init.go +++ b/pkg/service/init.go @@ -14,10 +14,10 @@ var AccountProvider = new(account.AccountClientImpl) var GrpcArtistImpl = new(artist.ArtistClientImpl) func init() { + appConfig.GetOptions() config.SetConsumerService(GrpcArtistImpl) config.SetConsumerService(AccountProvider) config.SetConsumerService(GrpcExhibitionClientImpl) - appConfig.GetOptions() if err := config.Load(); err != nil { panic(err) }