修正目录

etc/i2bill-api.yaml

@@ -1,5 +1,5 @@
 Name: i2bill-api
-Host: 172.16.11.5
+Host: 127.0.0.1
 Port: 8888
 DataSource: root:gSRGZqb121TlYIbJy0@tcp(47.103.202.94:3306)/i2bill?charset=utf8&loc=Local&parseTime=true
 Table:
@@ -10,7 +10,7 @@ Transform:
   Etcd:
     Hosts:
       - 47.103.219.158:30019
-    Key: icole.rpc
+    Key: transform.rpc
 Weixin:
   Appid: wxb8a763ab9e81d0cb
   Secret: 95dc14b89d32fe91709bba8916f30f74

go.sum

@@ -3,8 +3,6 @@ git.i2edu.net/i2/go-zero v1.0.1-0.20210616091154-7fac117e009f h1:zD6rIG7+PhJwYXu
 git.i2edu.net/i2/go-zero v1.0.1-0.20210616091154-7fac117e009f/go.mod h1:a9idDtfMmMXrZIHyDg6XnYjWuCpKG0I6zv6Vo9Fpncc=
 git.i2edu.net/i2/i2-bill-erp v0.0.0-20210708072024-8e03931b0a43 h1:mI+bIZKhPGng8VfpwjaShlNTgBbRqqQxgtSohfeVhh8=
 git.i2edu.net/i2/i2-bill-erp v0.0.0-20210708072024-8e03931b0a43/go.mod h1:gYy5Vw881tLNXYyfGeZvmNcpPaVkcVP5MXzE0dTr6Ys=
-git.i2edu.net/i2/i2-bill-erp v0.0.0-20210709062523-18c6edcaa220 h1:j9jLWoD5oX56dpmicLucgz/wzNBFeARmRONa4UqFzfY=
-git.i2edu.net/i2/i2-bill-erp v0.0.0-20210709062523-18c6edcaa220/go.mod h1:gYy5Vw881tLNXYyfGeZvmNcpPaVkcVP5MXzE0dTr6Ys=
 gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s=
 gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
@@ -264,11 +262,9 @@ github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
-github.com/tal-tech/go-zero v1.1.7 h1:rs78kI5ZiBx1RIl562qDzkBV8P7CdnbCiljknyC4mXg=
 github.com/tal-tech/go-zero v1.1.7/go.mod h1:BEylLQnv5moldpMT1lH3kUoMEcdaIp+r9Lgp+41dXxg=
 github.com/tealeg/xlsx v1.0.5 h1:+f8oFmvY8Gw1iUXzPk+kz+4GpbDZPK1FhPiQRd+ypgE=
 github.com/tealeg/xlsx v1.0.5/go.mod h1:btRS8dz54TDnvKNosuAqxrM1QgN1udgk9O34bDCnORM=
-github.com/thoas/go-funk v0.8.0 h1:JP9tKSvnpFVclYgDM0Is7FD9M4fhPvqA0s0BsXmzSRQ=
 github.com/thoas/go-funk v0.8.0/go.mod h1:+IWnUfUmFO1+WVYQWQtIJHeRRdaIyyYglZN7xzUPe4Q=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6 h1:lYIiVDtZnyTWlNwiAxLj0bbpTcx1BWCFhXjfsvmPdNc=

internal/handler/acquirer_student/acquirer_student_add_handler.go

@@ -1,4 +1,4 @@
-package handler
+package acquirer_student
 
 import (
 	"git.i2edu.net/i2/i2-bill-api/internal/logic/acquirer_student"
@@ -18,7 +18,7 @@ func AcquirerStudentAddHandler(ctx *svc.ServiceContext) http.HandlerFunc {
 			return
 		}
 
-		l := logic.NewAcquirerStudentAddLogic(r.Context(), ctx)
+		l := acquirer_student.NewAcquirerStudentAddLogic(r.Context(), ctx)
 		resp, err := l.AcquirerStudentAdd(req)
 		if err != nil {
 			httpx.Error(w, err)

internal/handler/acquirer_student/acquirer_student_page_handler.go

@@ -1,4 +1,4 @@
-package handler
+package acquirer_student
 
 import (
 	"git.i2edu.net/i2/i2-bill-api/internal/logic/acquirer_student"
@@ -11,7 +11,7 @@ import (
 func AcquirerStudentPageHandler(ctx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 
-		l := logic.NewAcquirerStudentPageLogic(r.Context(), ctx)
+		l := acquirer_student.NewAcquirerStudentPageLogic(r.Context(), ctx)
 		resp, err := l.AcquirerStudentPage(r)
 		if err != nil {
 			httpx.Error(w, err)

internal/handler/acquirer_student/acquirer_student_total_handler.go

@@ -1,4 +1,4 @@
-package handler
+package acquirer_student
 
 import (
 	"git.i2edu.net/i2/i2-bill-api/internal/logic/acquirer_student"
@@ -11,7 +11,7 @@ import (
 func AcquirerStudentTotalHandler(ctx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 
-		l := logic.NewAcquirerStudentTotalLogic(r.Context(), ctx)
+		l := acquirer_student.NewAcquirerStudentTotalLogic(r.Context(), ctx)
 		resp, err := l.AcquirerStudentTotal(r)
 		if err != nil {
 			httpx.Error(w, err)

internal/handler/base_organ/get_erp_city_tree_handler.go

@@ -1,4 +1,4 @@
-package handler
+package base_organ
 
 import (
 	"net/http"
@@ -11,7 +11,7 @@ import (
 func GetErpCityTreeHandler(ctx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 
-		l := logic.NewGetErpCityTreeLogic(r.Context(), ctx)
+		l := base_organ.NewGetErpCityTreeLogic(r.Context(), ctx)
 		resp, err := l.GetErpCityTree()
 		if err != nil {
 			httpx.Error(w, err)

internal/handler/base_organ_school/get_erp_sch_perm_handler.go

@@ -1,4 +1,4 @@
-package handler
+package base_organ_school
 
 import (
 	"net/http"
@@ -11,7 +11,7 @@ import (
 func GetErpSchPermHandler(ctx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 
-		l := logic.NewGetErpSchPermLogic(r.Context(), ctx)
+		l := base_organ_school.NewGetErpSchPermLogic(r.Context(), ctx)
 		resp, err := l.GetErpSchPerm()
 		if err != nil {
 			httpx.Error(w, err)

internal/handler/base_organ_school/get_erp_sch_tree_handler.go

@@ -1,4 +1,4 @@
-package handler
+package base_organ_school
 
 import (
 	"net/http"
@@ -11,7 +11,7 @@ import (
 func GetErpSchTreeHandler(ctx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 
-		l := logic.NewGetErpSchTreeLogic(r.Context(), ctx)
+		l := base_organ_school.NewGetErpSchTreeLogic(r.Context(), ctx)
 		resp, err := l.GetErpSchTree()
 		if err != nil {
 			httpx.Error(w, err)

internal/handler/mkt_network_detail/get_erp_mkt_network_detail_handler.go

@@ -1,4 +1,4 @@
-package handler
+package mkt_network_detail
 
 import (
 	"net/http"
@@ -11,7 +11,7 @@ import (
 func GetErpMktNetworkDetailHandler(ctx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 
-		l := logic.NewGetErpMktNetworkDetailLogic(r.Context(), ctx)
+		l := mkt_network_detail.NewGetErpMktNetworkDetailLogic(r.Context(), ctx)
 		resp, err := l.GetErpMktNetworkDetail()
 		if err != nil {
 			httpx.Error(w, err)

internal/handler/sys_optionset/get_erp_optionset_handler.go

@@ -1,4 +1,4 @@
-package handler
+package sys_optionset
 
 import (
 	"net/http"
@@ -11,7 +11,7 @@ import (
 func GetErpOptionsetHandler(ctx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 
-		l := logic.NewGetErpOptionsetLogic(r.Context(), ctx)
+		l := sys_optionset.NewGetErpOptionsetLogic(r.Context(), ctx)
 		r.ParseForm()
 		resp, err := l.GetErpOptionset(r.Form.Get("code"))
 		if err != nil {

internal/logic/acquirer_student/acquirer_student_add_logic.go

@@ -1,4 +1,4 @@
-package logic
+package acquirer_student
 
 import (
 	"context"

internal/logic/acquirer_student/acquirer_student_page_logic.go

@@ -1,4 +1,4 @@
-package logic
+package acquirer_student
 
 import (
 	"context"

internal/logic/acquirer_student/acquirer_student_total_logic.go

@@ -1,4 +1,4 @@
-package logic
+package acquirer_student
 
 import (
 	"context"

internal/logic/base_organ/get_erp_city_tree_logic.go

@@ -1,4 +1,4 @@
-package logic
+package base_organ
 
 import (
 	"context"

internal/logic/base_organ_school/get_erp_sch_perm_logic.go

@@ -1,4 +1,4 @@
-package logic
+package base_organ_school
 
 import (
 	"context"

internal/logic/base_organ_school/get_erp_sch_tree_logic.go

@@ -1,4 +1,4 @@
-package logic
+package base_organ_school
 
 import (
 	"context"

internal/logic/mkt_network_detail/get_erp_mkt_network_detail_logic.go

@@ -1,4 +1,4 @@
-package logic
+package mkt_network_detail
 
 import (
 	"context"

internal/logic/sys_optionset/get_erp_optionset_logic.go

@@ -1,4 +1,4 @@
-package logic
+package sys_optionset
 
 import (
 	"context"