Selaa lähdekoodia

正式构建版本

xjg 5 kuukautta sitten
vanhempi
commit
797e178388

+ 44 - 0
.drone.yml

@@ -0,0 +1,44 @@
+kind: pipeline
+type: docker
+name: kube-service-publish
+trigger:
+  event:
+    - push
+  branch:
+    - master
+steps:
+  - name: build
+    image: plugins/docker:20.14.2
+    volumes:
+      - name: docker-ca
+        path: /etc/docker
+      - name: dockersock
+        path: /var/run/docker.sock
+    settings:
+      username: admin
+      password:
+        from_secret: harbor_password
+      repo: sghharbor.com/sghblog/authorization-service
+      registry: sghharbor.com
+      tags:
+        - v1.0.0
+  - name: ssh commands
+    image: appleboy/drone-ssh:1.6.13
+    settings:
+      host: 47.56.16.206
+      username: root
+      password:
+        from_secret: ssh_password
+      port: 22
+      script:
+        #拉取镜像并重启 注意--需要提前在目标主机完成docker login
+        - if [ $(docker ps -a | grep authorization-service| wc -l) -ge 1 ];then docker stop authorization-service&& docker rm kube-service; fi
+        - docker pull sghharbor.com/sghblog/authorization-service:v1.0.0
+        - docker run --name authorization-service--restart=always -d -p 8091:8091 sghharbor.com/sghblog/authorization-service:v1.0.0
+volumes:
+  - name: docker-ca
+    host:
+      path: /etc/docker
+  - name: dockersock
+    host:
+      path: /var/run/docker.sock

+ 23 - 0
Dockerfile

@@ -0,0 +1,23 @@
+FROM golang:1.19-alpine as builder
+WORKDIR /go/src/sghblog.com/server
+COPY . .
+
+RUN go env -w GO111MODULE=on    && go env -w GOPROXY=https://goproxy.cn,direct    && go env -w CGO_ENABLED=0    && go env    && go mod tidy    && go build -o server .
+
+FROM alpine:latest
+
+LABEL MAINTAINER="sghblog@163.com"
+
+# 安装 tzdata 包
+RUN apk --no-cache add tzdata
+
+WORKDIR /go/src/sghblog.com/server
+COPY --from=0 /go/src/sghblog.com/server/server ./
+
+RUN apk add --no-cache curl
+
+# 设置时区为Asia/Shanghai
+ENV TZ=Asia/Shanghai
+
+EXPOSE 8091
+ENTRYPOINT ./server

+ 2 - 2
domain/model/base/base.go

@@ -2,8 +2,8 @@ package base
 
 import (
 	"fmt"
-	req "sghblog.com/paas/authorization-service/domain/model/request"
-	pb "sghblog.com/paas/authorization-service/proto"
+	req "sghgogs.com/sghblog/authorization-service/domain/model/request"
+	pb "sghgogs.com/sghblog/authorization-service/proto"
 )
 
 type ListMapItem struct {

+ 1 - 1
domain/model/request/admin/user.go

@@ -1,7 +1,7 @@
 package admin
 
 import (
-	"sghblog.com/paas/authorization-service/domain/model/base"
+	"sghgogs.com/sghblog/authorization-service/domain/model/base"
 	"time"
 )
 

+ 2 - 2
domain/model/request/admin_role.go

@@ -1,7 +1,7 @@
 package request
 
 import (
-	pb "sghblog.com/paas/authorization-service/proto"
+	pb "sghgogs.com/sghblog/authorization-service/proto"
 	"time"
 )
 
@@ -23,7 +23,7 @@ type AdminRole struct {
 // 	fmt.Print("BeforeCreate......")
 // 	return
 // }
-// 
+//
 // // AfterUpdate 在同一个事务中更新数据
 // func (u *AdminUser) AfterUpdate(tx *gorm.DB) (err error) {
 // 	fmt.Print("AfterUpdate......")

+ 1 - 1
domain/model/request/admin_user.go

@@ -1,7 +1,7 @@
 package request
 
 import (
-	pb "sghblog.com/paas/authorization-service/proto"
+	pb "sghgogs.com/sghblog/authorization-service/proto"
 	"time"
 )
 

+ 2 - 2
domain/repository/admin_common.go

@@ -1,8 +1,8 @@
 package repository
 
 import (
-	req "sghblog.com/paas/authorization-service/domain/model/request"
-	pb "sghblog.com/paas/authorization-service/proto"
+	req "sghgogs.com/sghblog/authorization-service/domain/model/request"
+	pb "sghgogs.com/sghblog/authorization-service/proto"
 )
 
 func (u *Repository) AdminLogin(username string) (req.AdminUser, error) {

+ 3 - 3
domain/repository/admin_role.go

@@ -3,9 +3,9 @@ package repository
 import (
 	"github.com/pkg/errors"
 	"gorm.io/gorm"
-	"sghblog.com/paas/authorization-service/domain/model/base"
-	req "sghblog.com/paas/authorization-service/domain/model/request"
-	pb "sghblog.com/paas/authorization-service/proto"
+	"sghgogs.com/sghblog/authorization-service/domain/model/base"
+	req "sghgogs.com/sghblog/authorization-service/domain/model/request"
+	pb "sghgogs.com/sghblog/authorization-service/proto"
 )
 
 func (u *Repository) GetAdminRole(roleId int64) (req.AdminRole, error) {

+ 3 - 3
domain/repository/admin_user.go

@@ -3,9 +3,9 @@ package repository
 import (
 	"github.com/pkg/errors"
 	"gorm.io/gorm"
-	"sghblog.com/paas/authorization-service/domain/model/base"
-	req "sghblog.com/paas/authorization-service/domain/model/request"
-	pb "sghblog.com/paas/authorization-service/proto"
+	"sghgogs.com/sghblog/authorization-service/domain/model/base"
+	req "sghgogs.com/sghblog/authorization-service/domain/model/request"
+	pb "sghgogs.com/sghblog/authorization-service/proto"
 )
 
 func (u *Repository) GetAdminUser(userId int64) (req.AdminUser, error) {

+ 2 - 2
domain/repository/repository.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"github.com/pkg/errors"
 	"gorm.io/gorm"
-	req "sghblog.com/paas/authorization-service/domain/model/request"
-	pb "sghblog.com/paas/authorization-service/proto"
+	req "sghgogs.com/sghblog/authorization-service/domain/model/request"
+	pb "sghgogs.com/sghblog/authorization-service/proto"
 )
 
 // func ConvertTimeToInt64(t time.Time) int64 {

+ 2 - 2
domain/service/admin_common.go

@@ -2,8 +2,8 @@ package service
 
 import (
 	"golang.org/x/crypto/bcrypt"
-	"sghblog.com/paas/authorization-service/domain/model/base"
-	pb "sghblog.com/paas/authorization-service/proto"
+	"sghgogs.com/sghblog/authorization-service/domain/model/base"
+	pb "sghgogs.com/sghblog/authorization-service/proto"
 	"sghgogs.com/sghblog/common"
 	"sghgogs.com/sghblog/common/errorcode"
 )

+ 4 - 4
domain/service/admin_role.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"github.com/pkg/errors"
 	"gorm.io/gorm"
-	"sghblog.com/paas/authorization-service/domain/model/base"
-	req "sghblog.com/paas/authorization-service/domain/model/request"
-	pb "sghblog.com/paas/authorization-service/proto"
-	"sghblog.com/paas/authorization-service/utils/authutil"
+	"sghgogs.com/sghblog/authorization-service/domain/model/base"
+	req "sghgogs.com/sghblog/authorization-service/domain/model/request"
+	pb "sghgogs.com/sghblog/authorization-service/proto"
+	"sghgogs.com/sghblog/authorization-service/utils/authutil"
 	"sghgogs.com/sghblog/common"
 	"sghgogs.com/sghblog/common/errorcode"
 	"time"

+ 4 - 4
domain/service/admin_user.go

@@ -6,10 +6,10 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/crypto/bcrypt"
 	"gorm.io/gorm"
-	"sghblog.com/paas/authorization-service/domain/model/base"
-	req "sghblog.com/paas/authorization-service/domain/model/request"
-	pb "sghblog.com/paas/authorization-service/proto"
-	"sghblog.com/paas/authorization-service/utils/authutil"
+	"sghgogs.com/sghblog/authorization-service/domain/model/base"
+	req "sghgogs.com/sghblog/authorization-service/domain/model/request"
+	pb "sghgogs.com/sghblog/authorization-service/proto"
+	"sghgogs.com/sghblog/authorization-service/utils/authutil"
 	"sghgogs.com/sghblog/common"
 	"sghgogs.com/sghblog/common/errorcode"
 	"time"

+ 4 - 4
domain/service/service.go

@@ -7,10 +7,10 @@ import (
 	"go-micro.dev/v4/auth"
 	"go-micro.dev/v4/metadata"
 	"reflect"
-	req "sghblog.com/paas/authorization-service/domain/model/request"
-	"sghblog.com/paas/authorization-service/domain/repository"
-	pb "sghblog.com/paas/authorization-service/proto"
-	"sghblog.com/paas/authorization-service/utils/authutil"
+	req "sghgogs.com/sghblog/authorization-service/domain/model/request"
+	"sghgogs.com/sghblog/authorization-service/domain/repository"
+	pb "sghgogs.com/sghblog/authorization-service/proto"
+	"sghgogs.com/sghblog/authorization-service/utils/authutil"
 	"sghgogs.com/sghblog/common/errorcode"
 	"strconv"
 	"strings"

+ 1 - 10
go.mod

@@ -10,7 +10,6 @@ require (
 	github.com/go-micro/plugins/v4/wrapper/trace/opentelemetry v1.2.0
 	github.com/go-redsync/redsync/v4 v4.11.0
 	github.com/google/uuid v1.3.0
-	github.com/jinzhu/copier v0.4.0
 	github.com/pkg/errors v0.9.1
 	github.com/redis/go-redis/v9 v9.3.0
 	github.com/sirupsen/logrus v1.9.0
@@ -24,9 +23,9 @@ require (
 	google.golang.org/protobuf v1.31.0
 	gorm.io/driver/mysql v1.5.2
 	gorm.io/gorm v1.25.5
+	sghgogs.com/sghblog/common v0.0.0-20231219070006-58d7e2000e0a
 )
 
-
 require (
 	github.com/Microsoft/go-winio v0.6.0 // indirect
 	github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
@@ -51,7 +50,6 @@ require (
 	github.com/go-git/go-git/v5 v5.4.2 // indirect
 	github.com/go-logr/logr v1.3.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-micro/plugins/v4/config/source/consul v1.2.0 // indirect
 	github.com/go-redis/redis/v8 v8.11.5 // indirect
 	github.com/go-sql-driver/mysql v1.7.0 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
@@ -82,7 +80,6 @@ require (
 	github.com/mitchellh/hashstructure v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.3.3 // indirect
 	github.com/nxadm/tail v1.4.8 // indirect
-	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -94,15 +91,10 @@ require (
 	github.com/russross/blackfriday/v2 v2.0.1 // indirect
 	github.com/sergi/go-diff v1.1.0 // indirect
 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
-	github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
-	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
 	github.com/urfave/cli/v2 v2.3.0 // indirect
 	github.com/xanzy/ssh-agent v0.3.0 // indirect
 	go.opentelemetry.io/otel/metric v1.21.0 // indirect
 	go.opentelemetry.io/otel/trace v1.21.0 // indirect
-	go.uber.org/atomic v1.4.0 // indirect
-	go.uber.org/multierr v1.1.0 // indirect
-	go.uber.org/zap v1.10.0 // indirect
 	golang.org/x/mod v0.9.0 // indirect
 	golang.org/x/net v0.17.0 // indirect
 	golang.org/x/sync v0.3.0 // indirect
@@ -110,7 +102,6 @@ require (
 	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/tools v0.7.0 // indirect
 	google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
-	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

+ 2 - 19
go.sum

@@ -169,8 +169,6 @@ github.com/go-micro/plugins/v4/auth/jwt v1.2.0 h1:+dJHFnobRhX3QvTlHKCj5Sn2eeFsfN
 github.com/go-micro/plugins/v4/auth/jwt v1.2.0/go.mod h1:6tHH9WrpbEwmNQKJj8DutZtZdvY9gl0XBRJPnzEwl6Q=
 github.com/go-micro/plugins/v4/client/grpc v1.1.0 h1:1MlhnyLxlZpzYY7gepj5zGJNn06yL+3OBbDfh0Z6jH0=
 github.com/go-micro/plugins/v4/client/grpc v1.1.0/go.mod h1:7mskyLlKoKT2V5mC4mdBcrpDx+CiLZxXtTMD+jpFuRY=
-github.com/go-micro/plugins/v4/config/source/consul v1.2.0 h1:AZ2L6vP8Cy3Sh2VI/9E8RmdkjdZPGqK8J3aE2rxQf5g=
-github.com/go-micro/plugins/v4/config/source/consul v1.2.0/go.mod h1:/v+vqsTJX0mZSahKKxcnAVF+TxPYRKbZBaOt9bI1YzI=
 github.com/go-micro/plugins/v4/registry/consul v1.2.1 h1:3wctYMtstwQLCjoJ1HA6mKGGFF1hcdKDv5MzHakB1jE=
 github.com/go-micro/plugins/v4/registry/consul v1.2.1/go.mod h1:wTat7/K9XQ+i64VbbcMYFcEwipYfSgJM51HcA/sgsM4=
 github.com/go-micro/plugins/v4/server/grpc v1.2.0 h1:lXfM+/0oE/u1g0hVBYsvbP4lYOYXYOmwf5qH7ghi7Cc=
@@ -320,8 +318,6 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOl
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
-github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8=
-github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
@@ -433,8 +429,6 @@ github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
-github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/oracle/oci-go-sdk v24.3.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/ovh/go-ovh v1.1.0/go.mod h1:AxitLZ5HBRPyUd+Zl60Ajaag+rNTdVXWIkzfrVuTXWA=
@@ -548,10 +542,6 @@ github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/transip/gotransip/v6 v6.2.0/go.mod h1:pQZ36hWWRahCUXkFWlx9Hs711gLd8J4qdgLdRzmtY+g=
 github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g=
-github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o=
-github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
-github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg=
-github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
 github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
 github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
@@ -586,12 +576,9 @@ go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6
 go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc=
 go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/ratelimit v0.0.0-20180316092928-c15da0234277/go.mod h1:2X8KaoNd1J0lZV+PxJk/5+DGbO/tpwLR1m++a7FnB/Y=
-go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 golang.org/x/crypto v0.0.0-20180621125126-a49355c7e3f8/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -870,8 +857,6 @@ gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
-gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
 gopkg.in/ns1/ns1-go.v2 v2.4.4/go.mod h1:GMnKY+ZuoJ+lVLL+78uSTjwTz2jMazq6AfGKQOYhsPk=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
@@ -907,7 +892,5 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-sghgogs.com/paas/common v1.0.0 h1:pvnbYkTcBPk0EumSePvw738jyyAPvJ57ceYKtR0usUU=
-sghgogs.com/paas/common v1.0.0/go.mod h1:5krPkunaU/X5Ewv1bUTmkO08XL6mGfPHHyU6pjEz1Ps=
-sghgogs.com/paas/common v1.0.2 h1:L17MikVLHyrW7kD6FYMGjidV54+VTAGhwPjVSGIDp74=
-sghgogs.com/paas/common v1.0.2/go.mod h1:5krPkunaU/X5Ewv1bUTmkO08XL6mGfPHHyU6pjEz1Ps=
+sghgogs.com/sghblog/common v0.0.0-20231219070006-58d7e2000e0a h1:QfEb62RyInH+XxxJBmGTYx4c0gFlrsrX3ybjihrIcR8=
+sghgogs.com/sghblog/common v0.0.0-20231219070006-58d7e2000e0a/go.mod h1:DcFGf3a/9IznsK3wIp2M2WbzwKWu9aBqQ96jD8NOTmY=

+ 3 - 3
handler/admin_common.go

@@ -7,9 +7,9 @@ import (
 	"go-micro.dev/v4/auth"
 	"go-micro.dev/v4/metadata"
 	"golang.org/x/crypto/bcrypt"
-	"sghblog.com/paas/authorization-service/domain/service"
-	pb "sghblog.com/paas/authorization-service/proto"
-	"sghblog.com/paas/authorization-service/utils/authutil"
+	"sghgogs.com/sghblog/authorization-service/domain/service"
+	pb "sghgogs.com/sghblog/authorization-service/proto"
+	"sghgogs.com/sghblog/authorization-service/utils/authutil"
 	"sghgogs.com/sghblog/common"
 	"sghgogs.com/sghblog/common/errorcode"
 	"strconv"

+ 2 - 2
handler/admin_role.go

@@ -2,8 +2,8 @@ package handler
 
 import (
 	"context"
-	"sghblog.com/paas/authorization-service/domain/service"
-	pb "sghblog.com/paas/authorization-service/proto"
+	"sghgogs.com/sghblog/authorization-service/domain/service"
+	pb "sghgogs.com/sghblog/authorization-service/proto"
 )
 
 type AdminRole struct {

+ 2 - 2
handler/admin_user.go

@@ -2,8 +2,8 @@ package handler
 
 import (
 	"context"
-	"sghblog.com/paas/authorization-service/domain/service"
-	pb "sghblog.com/paas/authorization-service/proto"
+	"sghgogs.com/sghblog/authorization-service/domain/service"
+	pb "sghgogs.com/sghblog/authorization-service/proto"
 	"sghgogs.com/sghblog/common/errorcode"
 )
 

+ 1 - 1
handler/health.go

@@ -2,7 +2,7 @@ package handler
 
 import (
 	"context"
-	pb "sghblog.com/paas/authorization-service/proto"
+	pb "sghgogs.com/sghblog/authorization-service/proto"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

+ 7 - 7
main.go

@@ -18,13 +18,13 @@ import (
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
 	"gorm.io/gorm/schema"
-	"sghblog.com/paas/authorization-service/config"
-	"sghblog.com/paas/authorization-service/domain/repository"
-	"sghblog.com/paas/authorization-service/domain/service"
-	"sghblog.com/paas/authorization-service/handler"
-	authorization_service "sghblog.com/paas/authorization-service/proto"
-	"sghblog.com/paas/authorization-service/utils/authutil"
-	"sghblog.com/paas/authorization-service/utils/tracing"
+	"sghgogs.com/sghblog/authorization-service/config"
+	"sghgogs.com/sghblog/authorization-service/domain/repository"
+	"sghgogs.com/sghblog/authorization-service/domain/service"
+	"sghgogs.com/sghblog/authorization-service/handler"
+	authorization_service "sghgogs.com/sghblog/authorization-service/proto"
+	"sghgogs.com/sghblog/authorization-service/utils/authutil"
+	"sghgogs.com/sghblog/authorization-service/utils/tracing"
 	"strings"
 	"time"
 )

+ 1 - 1
middleware.go

@@ -11,7 +11,7 @@ import (
 	"go-micro.dev/v4/metadata"
 	"go-micro.dev/v4/server"
 	"reflect"
-	"sghblog.com/paas/authorization-service/utils/authutil"
+	"sghgogs.com/sghblog/authorization-service/utils/authutil"
 	"sghgogs.com/sghblog/common"
 	"sghgogs.com/sghblog/common/errorcode"
 	"sort"

+ 2 - 2
test/admin_common/admin_common_test.go

@@ -7,8 +7,8 @@ import (
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
 	"gorm.io/gorm/schema"
-	"sghblog.com/paas/authorization-service/domain/repository"
-	"sghblog.com/paas/authorization-service/domain/service"
+	"sghgogs.com/sghblog/authorization-service/domain/repository"
+	"sghgogs.com/sghblog/authorization-service/domain/service"
 	"testing"
 	"time"
 )

+ 4 - 4
test/admin_role/admin_role_test.go

@@ -8,10 +8,10 @@ import (
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
 	"gorm.io/gorm/schema"
-	req "sghblog.com/paas/authorization-service/domain/model/request"
-	"sghblog.com/paas/authorization-service/domain/repository"
-	"sghblog.com/paas/authorization-service/domain/service"
-	pb "sghblog.com/paas/authorization-service/proto"
+	req "sghgogs.com/sghblog/authorization-service/domain/model/request"
+	"sghgogs.com/sghblog/authorization-service/domain/repository"
+	"sghgogs.com/sghblog/authorization-service/domain/service"
+	pb "sghgogs.com/sghblog/authorization-service/proto"
 	"testing"
 )
 

+ 4 - 4
test/adminuser/admin_user_test.go

@@ -8,10 +8,10 @@ import (
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
 	"gorm.io/gorm/schema"
-	req "sghblog.com/paas/authorization-service/domain/model/request"
-	"sghblog.com/paas/authorization-service/domain/repository"
-	"sghblog.com/paas/authorization-service/domain/service"
-	pb "sghblog.com/paas/authorization-service/proto"
+	req "sghgogs.com/sghblog/authorization-service/domain/model/request"
+	"sghgogs.com/sghblog/authorization-service/domain/repository"
+	"sghgogs.com/sghblog/authorization-service/domain/service"
+	pb "sghgogs.com/sghblog/authorization-service/proto"
 	"testing"
 )
 

+ 2 - 2
test/common/admin_login_test.go

@@ -7,8 +7,8 @@ import (
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
 	"gorm.io/gorm/schema"
-	"sghblog.com/paas/authorization-service/domain/repository"
-	authorization_service "sghblog.com/paas/authorization-service/proto"
+	"sghgogs.com/sghblog/authorization-service/domain/repository"
+	authorization_service "sghgogs.com/sghblog/authorization-service/proto"
 	"testing"
 )