fix：更新去同步

controllers/approval.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	approval2 "hongze/hongze_mobile_admin/models/request/approval"
 	"hongze/hongze_mobile_admin/models/response/approval"
 	"hongze/hongze_mobile_admin/models/tables/admin"
@@ -16,7 +17,6 @@ import (
 	"hongze/hongze_mobile_admin/services"
 	"hongze/hongze_mobile_admin/services/flow"
 	"hongze/hongze_mobile_admin/utils"
-	"rdluck_tools/paging"
 	"strconv"
 	"time"
 )

controllers/approval_new.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"encoding/json"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	approval2 "hongze/hongze_mobile_admin/models/request/approval"
 	approvalResp "hongze/hongze_mobile_admin/models/response/approval"
 	"hongze/hongze_mobile_admin/models/tables/company_approval"
@@ -13,7 +14,6 @@ import (
 	"hongze/hongze_mobile_admin/models/tables/contract_approval_record"
 	company_apply "hongze/hongze_mobile_admin/services/company_approval"
 	"hongze/hongze_mobile_admin/utils"
-	"rdluck_tools/paging"
 	"strconv"
 	"strings"
 	"time"

controllers/contract.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"encoding/json"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	contractReq "hongze/hongze_mobile_admin/models/request/contract"
 	contractResp "hongze/hongze_mobile_admin/models/response/contract"
 	"hongze/hongze_mobile_admin/models/tables/contract"
@@ -10,7 +11,6 @@ import (
 	"hongze/hongze_mobile_admin/services/seal"
 	"hongze/hongze_mobile_admin/utils"
 	"path"
-	"rdluck_tools/paging"
 	"strconv"
 	"strings"
 )

controllers/contract_approval.go

@@ -3,13 +3,13 @@ package controllers
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	contractReq "hongze/hongze_mobile_admin/models/request/contract"
 	contractResp "hongze/hongze_mobile_admin/models/response/contract"
 	"hongze/hongze_mobile_admin/models/tables/contract_approval"
 	"hongze/hongze_mobile_admin/models/tables/contract_approval_record"
 	contractService "hongze/hongze_mobile_admin/services/contract"
 	"hongze/hongze_mobile_admin/utils"
-	"rdluck_tools/paging"
 	"strconv"
 	"strings"
 )

controllers/message.go

@@ -3,13 +3,13 @@ package controllers
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hongze_mobile_admin/models/response/message"
 	"hongze/hongze_mobile_admin/models/tables/company_approval"
 	"hongze/hongze_mobile_admin/models/tables/company_approval_message"
 	"hongze/hongze_mobile_admin/models/tables/contract_approval"
 	"hongze/hongze_mobile_admin/models/tables/contract_approval_record"
 	"hongze/hongze_mobile_admin/utils"
-	"rdluck_tools/paging"
 	"sort"
 	"strconv"
 	"strings"

controllers/seal.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"encoding/json"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	sealReq "hongze/hongze_mobile_admin/models/request/seal"
 	sealResp "hongze/hongze_mobile_admin/models/response/seal"
 	"hongze/hongze_mobile_admin/models/tables/seal"
@@ -9,7 +10,6 @@ import (
 	sealService "hongze/hongze_mobile_admin/services/seal"
 	"hongze/hongze_mobile_admin/utils"
 	"path"
-	"rdluck_tools/paging"
 	"strconv"
 )
 

controllers/seal_approval.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"encoding/json"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	sealReq "hongze/hongze_mobile_admin/models/request/seal"
 	sealResp "hongze/hongze_mobile_admin/models/response/seal"
 	"hongze/hongze_mobile_admin/models/tables/contract_approval"
@@ -9,7 +10,6 @@ import (
 	"hongze/hongze_mobile_admin/models/tables/seal"
 	sealService "hongze/hongze_mobile_admin/services/seal"
 	"hongze/hongze_mobile_admin/utils"
-	"rdluck_tools/paging"
 	"strconv"
 	"strings"
 )

go.mod

@@ -6,23 +6,23 @@ require (
 	baliance.com/gooxml v1.0.1
 	github.com/SebastiaanKlippert/go-wkhtmltopdf v1.7.1
 	github.com/aliyun/aliyun-oss-go-sdk v2.1.9+incompatible
-	github.com/astaxie/beego v1.12.3
+	github.com/astaxie/beego v1.12.3 // indirect
 	github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
 	github.com/beego/bee/v2 v2.0.2 // indirect
 	github.com/beego/beego/v2 v2.0.1
 	github.com/flosch/pongo2 v0.0.0-20200913210552-0d938eb266f3 // indirect
 	github.com/go-delve/delve v1.7.0 // indirect
 	github.com/go-sql-driver/mysql v1.6.0
-	github.com/lib/pq v1.10.2 // indirect
 	github.com/mattn/go-colorable v0.1.8 // indirect
 	github.com/mattn/go-isatty v0.0.13 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
 	github.com/medivhzhan/weapp/v2 v2.4.2
 	github.com/peterh/liner v1.2.1 // indirect
+	github.com/rdlucklib/rdluck_tools v1.0.2
 	github.com/satori/go.uuid v1.2.0 // indirect
 	github.com/shopspring/decimal v1.2.0
 	github.com/sirupsen/logrus v1.8.1 // indirect
-	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
+	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
 	github.com/smartystreets/goconvey v1.6.4
 	github.com/spf13/cast v1.4.0 // indirect
 	github.com/spf13/viper v1.8.1 // indirect
@@ -33,7 +33,4 @@ require (
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
-	rdluck_tools v0.0.0
 )
-
-replace rdluck_tools => /Users/roc/go/src/rdluck_tools

go.sum

@@ -171,6 +171,7 @@ github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/garyburd/redigo v1.6.3/go.mod h1:rTb6epsqigu3kYKBnaF028A7Tf/Aw5s0cqA47doKKqw=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/glendc/gopher-json v0.0.0-20170414221815-dc4743023d0c/go.mod h1:Gja1A+xZ9BoviGJNA2E9vFkPjjsl+CoJxSXiQM1UXtw=
 github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
@@ -252,6 +253,7 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-dap v0.2.0/go.mod h1:5q8aYQFnHOAZEMP+6vmq25HKYAEwE+LF5yh7JKrrhSQ=
 github.com/google/go-dap v0.5.0/go.mod h1:5q8aYQFnHOAZEMP+6vmq25HKYAEwE+LF5yh7JKrrhSQ=
@@ -361,6 +363,8 @@ github.com/lib/pq v1.7.0 h1:h93mCPfUSkaul3Ka/VG8uZdmW1uMHDGxzu0NWHuJmHY=
 github.com/lib/pq v1.7.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8=
 github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk=
+github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
 github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
 github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
@@ -504,6 +508,8 @@ github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3x
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
+github.com/rdlucklib/rdluck_tools v1.0.2 h1:Xf1khfttpAh4D1jtMVE5OxLXhFUaDnvG74vZH7FSZQY=
+github.com/rdlucklib/rdluck_tools v1.0.2/go.mod h1:9Onw9o4w19C8KE5lxb8GyxgRBbZweRVkQSc79v38EaA=
 github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
@@ -593,6 +599,7 @@ github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtX
 github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc=
 github.com/wendal/errors v0.0.0-20181209125328-7f31f4b264ec/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/ylywyn/jpush-api-go-client v0.0.0-20190906031852-8c4466c6e369/go.mod h1:Nv7wKD2/bCdKUFNKcJRa99a+1+aSLlCRJFriFYdjz/I=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -1022,6 +1029,7 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U=
 gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
@@ -1052,6 +1060,7 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

models/custom/contract/contract_service.go

@@ -1,8 +1,8 @@
 package contract
 
 import (
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"hongze/hongze_mobile_admin/models/tables/contract_service_detail"
-	"rdluck_tools/orm"
 	"time"
 )
 

models/custom/wechat.go

@@ -1,6 +1,6 @@
 package custom
 
-import "rdluck_tools/orm"
+import "github.com/rdlucklib/rdluck_tools/orm"
 
 type WechatSign struct {
 	AppId     string

models/db_init.go

@@ -2,6 +2,7 @@ package models
 
 import (
 	_ "github.com/go-sql-driver/mysql"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"hongze/hongze_mobile_admin/models/tables/admin"
 	"hongze/hongze_mobile_admin/models/tables/admin_record"
 	"hongze/hongze_mobile_admin/models/tables/approval_flow"
@@ -31,7 +32,6 @@ import (
 	"hongze/hongze_mobile_admin/models/tables/wx_token"
 	"hongze/hongze_mobile_admin/models/tables/wx_user"
 	"hongze/hongze_mobile_admin/utils"
-	"rdluck_tools/orm"
 	"time"
 )
 

models/response/approval/approval.go

@@ -1,10 +1,10 @@
 package approval
 
 import (
+	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hongze_mobile_admin/models/tables/company_approval"
 	"hongze/hongze_mobile_admin/models/tables/company_report_permission"
 	"hongze/hongze_mobile_admin/models/tables/contract_approval_record"
-	"rdluck_tools/paging"
 )
 
 // CompanyApprovalListResp 客户审批列表

models/response/contract/contract.go

@@ -1,10 +1,10 @@
 package contract
 
 import (
+	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hongze_mobile_admin/models/tables/contract"
 	"hongze/hongze_mobile_admin/models/tables/contract_approval"
 	"hongze/hongze_mobile_admin/models/tables/contract_approval_record"
-	"rdluck_tools/paging"
 	"time"
 )
 

models/response/seal/seal.go

@@ -1,10 +1,10 @@
 package seal
 
 import (
+	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hongze_mobile_admin/models/tables/contract_approval"
 	"hongze/hongze_mobile_admin/models/tables/contract_approval_record"
 	"hongze/hongze_mobile_admin/models/tables/seal"
-	"rdluck_tools/paging"
 )
 
 //AddSealResp 新增用印返回

models/tables/admin/admin.go

@@ -2,8 +2,8 @@ package admin
 
 import (
 	//_ "github.com/go-sql-driver/mysql"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"hongze/hongze_mobile_admin/models/custom"
-	"rdluck_tools/orm"
 )
 
 type Admin struct {

models/tables/admin_record/admin_record.go

@@ -1,7 +1,7 @@
 package admin_record
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/tables/approval_flow/approval_flow.go

@@ -1,8 +1,8 @@
 package approval_flow
 
 import (
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"hongze/hongze_mobile_admin/models/tables/approval_flow_node"
-	"rdluck_tools/orm"
 	"time"
 )
 

models/tables/approval_flow_node/approval_flow_node.go

@@ -1,7 +1,7 @@
 package approval_flow_node
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/tables/company/company.go

@@ -2,9 +2,9 @@ package company
 
 import (
 	"fmt"
+	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hongze_mobile_admin/utils"
-	"rdluck_tools/orm"
-	"rdluck_tools/paging"
 	"time"
 )
 

models/tables/company_approval/company_approval.go

@@ -1,12 +1,12 @@
 package company_approval
 
 import (
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"hongze/hongze_mobile_admin/models/tables/admin"
 	"hongze/hongze_mobile_admin/models/tables/company_delay_permission"
 	"hongze/hongze_mobile_admin/models/tables/company_permission_log"
 	"hongze/hongze_mobile_admin/models/tables/company_report_permission"
 	"hongze/hongze_mobile_admin/utils"
-	"rdluck_tools/orm"
 	"time"
 )
 

models/tables/company_approval_message/company_approval_message.go

@@ -1,7 +1,7 @@
 package company_approval_message
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/tables/company_contract/company_contract.go

@@ -1,8 +1,8 @@
 package company_contract
 
 import (
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"hongze/hongze_mobile_admin/models/tables/company_report_permission"
-	"rdluck_tools/orm"
 	"time"
 )
 

models/tables/company_delay_permission/company_delay_permission.go

@@ -1,7 +1,7 @@
 package company_delay_permission
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/tables/company_log/company_log.go

@@ -1,7 +1,7 @@
 package company_log
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/tables/company_operation_record/company_operation_record.go

@@ -1,7 +1,7 @@
 package company_operation_record
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/tables/company_permission_log/company_permission_log.go

@@ -1,7 +1,7 @@
 package company_permission_log
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/tables/company_product/company_product.go

@@ -1,7 +1,7 @@
 package company_product
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/tables/company_product_log/company_product_log.go

@@ -1,7 +1,7 @@
 package company_product_log
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/tables/company_report_permission/company_report_permission.go

@@ -1,7 +1,7 @@
 package company_report_permission
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/tables/contract/contract.go

@@ -2,10 +2,10 @@ package contract
 
 import (
 	"fmt"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"hongze/hongze_mobile_admin/models/custom/contract"
 	"hongze/hongze_mobile_admin/models/tables/company_report_permission"
 	"hongze/hongze_mobile_admin/utils"
-	"rdluck_tools/orm"
 	"time"
 )
 

models/tables/contract_approval/contract_approval.go

@@ -1,10 +1,10 @@
 package contract_approval
 
 import (
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"hongze/hongze_mobile_admin/models/tables/contract"
 	"hongze/hongze_mobile_admin/models/tables/contract_approval_record"
 	"hongze/hongze_mobile_admin/utils"
-	"rdluck_tools/orm"
 	"time"
 )
 

models/tables/contract_approval_record/contract_approval_record.go

@@ -1,7 +1,7 @@
 package contract_approval_record
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/tables/contract_operation_record/contract_operation_record.go

@@ -1,7 +1,7 @@
 package contract_operation_record
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/tables/contract_relation/contract_relation.go

@@ -1,8 +1,8 @@
 package contract_relation
 
 import (
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"hongze/hongze_mobile_admin/models/custom/contract"
-	"rdluck_tools/orm"
 )
 
 // ContractRelation 合同关系表结构体

models/tables/contract_service_detail/contract_service_detail.go

@@ -1,7 +1,7 @@
 package contract_service_detail
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/tables/contract_service_template/contract_service_template.go

@@ -1,8 +1,8 @@
 package contract_service_template
 
 import (
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"hongze/hongze_mobile_admin/models/tables/contract_service_detail"
-	"rdluck_tools/orm"
 	"time"
 )
 

models/tables/contract_template/contract_template.go

@@ -1,7 +1,7 @@
 package contract_template
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/tables/h5_admin_session/h5_admin_session.go

@@ -1,7 +1,7 @@
 package h5_admin_session
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/tables/report/report.go

@@ -1,8 +1,8 @@
 package report
 
 import (
-	"rdluck_tools/orm"
-	"rdluck_tools/paging"
+	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
 

models/tables/resource/resource.go

@@ -1,7 +1,7 @@
 package resource
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

models/tables/seal/seal.go

@@ -2,8 +2,8 @@ package seal
 
 import (
 	"fmt"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"hongze/hongze_mobile_admin/utils"
-	"rdluck_tools/orm"
 	"time"
 )
 

models/tables/wx_token/wx_token.go

@@ -1,6 +1,6 @@
 package wx_token
 
-import "rdluck_tools/orm"
+import "github.com/rdlucklib/rdluck_tools/orm"
 
 type WxToken struct {
 	AccessToken string

models/tables/wx_user/wx_user.go

@@ -1,7 +1,7 @@
 package wx_user
 
 import (
-	"rdluck_tools/orm"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 

services/contract/contract.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"hongze/hongze_mobile_admin/models/custom"
 	contractCustom "hongze/hongze_mobile_admin/models/custom/contract"
 	contractReq "hongze/hongze_mobile_admin/models/request/contract"
@@ -18,7 +19,6 @@ import (
 	"hongze/hongze_mobile_admin/services"
 	"hongze/hongze_mobile_admin/utils"
 	"mime/multipart"
-	"rdluck_tools/orm"
 	"reflect"
 	"strings"
 	"time"

services/wechat.go

@@ -4,10 +4,10 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/rdlucklib/rdluck_tools/http"
 	"hongze/hongze_mobile_admin/models/custom"
 	"hongze/hongze_mobile_admin/models/tables/wx_token"
 	"hongze/hongze_mobile_admin/utils"
-	"rdluck_tools/http"
 	"strconv"
 	"strings"
 	"time"

utils/config.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/beego/beego/v2/core/logs"
 	"github.com/beego/beego/v2/server/web"
-	"rdluck_tools/log"
+	"github.com/rdlucklib/rdluck_tools/log"
 )
 
 var (
@@ -55,6 +55,15 @@ func init() {
 		panic("配置文件读取run_mode错误 " + err.Error())
 	}
 	RunMode = tmpRunMode
+	if RunMode == "" {
+		RunMode = "release"
+		configPath := `/home/code/config/hongze_mobile_admin/conf/app.conf`
+		err := web.LoadAppConfig("ini", configPath)
+		if err != nil {
+			fmt.Println("web.LoadAppConfig Err:" + err.Error())
+		}
+	}
+
 	fmt.Println(RunMode, "模式")
 	config, err := web.AppConfig.GetSection(RunMode)
 	if err != nil {