From 465eb014bd32f01b7045be12356440666ff3d273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=9C=E9=A3=8E=E6=94=AF=E4=BB=98=E7=B3=BB=E7=BB=9F?= <447206051@qq.com> Date: Thu, 19 Dec 2019 16:33:30 +0800 Subject: [PATCH 1/5] Update README.md --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 05c81d3..6968da7 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ 详细的安装文档在doc文件夹中。 # 部分截图 boss管理后台示意图 -![Image_text](https://github.com/kongyuebin1/dongfeng-pay/blob/master/doc/boss1.png) -![Image text](https://github.com/kongyuebin1/dongfeng-pay/raw/master/doc/boss2.png) -![Image text](https://github.com/kongyuebin1/dongfeng-pay/raw/master/doc/boss3.png) -![Image text](https://github.com/kongyuebin1/dongfeng-pay/raw/master/doc/boss4.png) -![Image text](https://github.com/kongyuebin1/dongfeng-pay/raw/master/doc/boss5.png) -![Image text](https://github.com/kongyuebin1/dongfeng-pay/raw/master/doc/boss6.png) +![Image_text](http://139.196.82.110/doc/boss1.png) +![Image text](http://139.196.82.110/doc/boss2.png) +![Image text](http://139.196.82.110/doc/boss3.png) +![Image text](http://139.196.82.110/doc/boss4.png) +![Image text](http://139.196.82.110/doc/boss5.png) +![Image text](http://139.196.82.110/doc/boss6.png) From 14255fb8b80b285bf553db63ac34a4ec202d9f78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=9C=E9=A3=8E=E6=94=AF=E4=BB=98=E7=B3=BB=E7=BB=9F?= <447206051@qq.com> Date: Thu, 19 Dec 2019 16:37:48 +0800 Subject: [PATCH 2/5] Update README.md --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index 6968da7..209bc50 100644 --- a/README.md +++ b/README.md @@ -12,3 +12,16 @@ boss管理后台示意图 ![Image text](http://139.196.82.110/doc/boss4.png) ![Image text](http://139.196.82.110/doc/boss5.png) ![Image text](http://139.196.82.110/doc/boss6.png) + +商户后台部分截图 +![Image_text](http://139.196.82.110/doc/merchant1.png) +![Image text](http://139.196.82.110/doc/merchant2.png) + +代理后台部分截图 +![Image_text](http://139.196.82.110/doc/agent1.png) +![Image text](http://139.196.82.110/doc/agent2.png) +![Image text](http://139.196.82.110/doc/agent3.png) + +# 后话 +1：因为是模拟了三方的支付系统，所有很多功能都是实现了（你懂得）。 +2：还有一部分功能没有写上去，有需要的可以在上面进行二次开发。 From 71695f88b497ee994f6be68ec304c034d01d2421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=9C=E9=A3=8E=E6=94=AF=E4=BB=98=E7=B3=BB=E7=BB=9F?= <447206051@qq.com> Date: Thu, 19 Dec 2019 16:40:06 +0800 Subject: [PATCH 3/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 209bc50..51e1779 100644 --- a/README.md +++ b/README.md @@ -23,5 +23,5 @@ boss管理后台示意图 ![Image text](http://139.196.82.110/doc/agent3.png) # 后话 -1：因为是模拟了三方的支付系统，所有很多功能都是实现了（你懂得）。 +1：因为是模拟了三方的支付系统，所有很多功能都是实现了，但是该系统截图上面的资金都是模拟的。 2：还有一部分功能没有写上去，有需要的可以在上面进行二次开发。 From da8a16e175332cfd0aa1a6f630a7126539811425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=9C=E9=A3=8E=E6=94=AF=E4=BB=98=E7=B3=BB=E7=BB=9F?= <447206051@qq.com> Date: Thu, 19 Dec 2019 16:41:13 +0800 Subject: [PATCH 4/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 51e1779..e37c48f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # dongfeng-pay 东风支付系统，采用大家喜欢的go语言编写，前后端齐全（管理后台，商户后台，代理后台，网关，结算，代付，等） # 目的 -接触了很多支付系统，绝大部分都是用java、php写的，本人想着为go献出一份绵薄之力。该开源项目只能用于学习，不准备用于任何的非法商业活动，否则后果自负。 +接触了很多支付系统，绝大部分都是用java、php写的，本人想着为go献出一份绵薄之力。该开源项目只能用于学习，不准备用于任何的非法商业活动，否则后果自负；可集成到小型的电商平台。 # 安装 详细的安装文档在doc文件夹中。 # 部分截图 From f4234c7eced4b73035017f703f5b75a14a179c58 Mon Sep 17 00:00:00 2001 From: Joker Date: Thu, 19 Dec 2019 16:43:20 +0800 Subject: [PATCH 5/5] modify imports name --- .idea/$CACHE_FILE$ | 6 ++ .idea/dongfeng-pay.iml | 8 ++ .idea/inspectionProfiles/Project_Default.xml | 6 ++ .idea/jsLinters/jshint.xml | 16 ++++ .idea/misc.xml | 6 ++ .idea/modules.xml | 8 ++ .idea/vcs.xml | 6 ++ jhagent/controllers/account_history.go | 4 +- jhagent/controllers/deal_excel.go | 6 +- jhagent/controllers/index.go | 4 +- jhagent/controllers/keep_session.go | 2 +- jhagent/controllers/login.go | 8 +- jhagent/controllers/multi_withdraw.go | 8 +- jhagent/controllers/trade_record.go | 4 +- jhagent/controllers/user_info.go | 4 +- jhagent/controllers/withdraw.go | 8 +- jhagent/main.go | 8 +- jhagent/routers/commentsRouter_controllers.go | 76 +++++++++---------- jhagent/routers/router.go | 2 +- jhagent/sys/public_method.go | 2 +- jhagent/sys/session.go | 2 +- jhagent/utils/logs.go | 2 +- jhagent/utils/send_messages.go | 2 +- jhboss/controllers/add.go | 6 +- jhboss/controllers/datas.go | 2 +- jhboss/controllers/delete.go | 4 +- jhboss/controllers/get.go | 6 +- jhboss/controllers/login.go | 6 +- jhboss/controllers/query.go | 6 +- jhboss/controllers/send_notify_merchant.go | 4 +- jhboss/controllers/update.go | 8 +- jhboss/main.go | 8 +- jhboss/routers/router.go | 2 +- jhboss/routers/router_pages.go | 2 +- jhboss/tests/default_test.go | 2 +- jhgateway/controllers/gateway/base_gateway.go | 8 +- .../controllers/gateway/merchant_query.go | 4 +- .../controllers/gateway/payfor_gateway.go | 6 +- jhgateway/controllers/gateway/scan_gateway.go | 4 +- jhgateway/main.go | 4 +- jhgateway/routers/router.go | 2 +- jhgateway/tests/default_test.go | 2 +- jhmerchant/controllers/account_history.go | 4 +- jhmerchant/controllers/deal_excel.go | 6 +- jhmerchant/controllers/index.go | 4 +- jhmerchant/controllers/keep_session.go | 2 +- jhmerchant/controllers/login.go | 8 +- jhmerchant/controllers/multi_withdraw.go | 8 +- jhmerchant/controllers/trade_record.go | 4 +- jhmerchant/controllers/user_info.go | 4 +- jhmerchant/controllers/withdraw.go | 8 +- jhmerchant/main.go | 8 +- .../routers/commentsRouter_controllers.go | 72 +++++++++--------- jhmerchant/routers/router.go | 2 +- jhmerchant/sys/public_method.go | 2 +- jhmerchant/sys/session.go | 2 +- jhmerchant/utils/logs.go | 2 +- jhmerchant/utils/send_messages.go | 2 +- jhmicro/main.go | 10 +-- jhmicro/notify/order_notify.go | 8 +- jhmicro/order_settle/settle.go | 2 +- jhmicro/pay_for/payfor.go | 4 +- jhmicro/query/order_query.go | 8 +- jhmicro/query/pay_for_query.go | 10 +-- service/conf/config.go | 2 +- service/controller/alipay.go | 2 +- service/controller/gateway_solve.go | 2 +- service/controller/init.go | 2 +- service/controller/kuaifu.go | 6 +- service/controller/order_settle.go | 6 +- service/controller/pay_solve.go | 8 +- service/controller/payfor_solve.go | 8 +- service/controller/supplier_interface.go | 2 +- service/controller/weixin.go | 2 +- service/message_queue/active_mq.go | 2 +- service/models/init.go | 2 +- service/models/payfor_info.go | 4 +- service/models/transaction.go | 4 +- service/service_init/init_all.go | 6 +- shop/controllers/scan_shop.go | 2 +- shop/main.go | 2 +- shop/routers/router.go | 2 +- 82 files changed, 292 insertions(+), 236 deletions(-) create mode 100644 .idea/$CACHE_FILE$ create mode 100644 .idea/dongfeng-pay.iml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/jsLinters/jshint.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/$CACHE_FILE$ b/.idea/$CACHE_FILE$ new file mode 100644 index 0000000..6cb8985 --- /dev/null +++ b/.idea/$CACHE_FILE$ @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/dongfeng-pay.iml b/.idea/dongfeng-pay.iml new file mode 100644 index 0000000..c956989 --- /dev/null +++ b/.idea/dongfeng-pay.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..eff7139 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/jsLinters/jshint.xml b/.idea/jsLinters/jshint.xml new file mode 100644 index 0000000..a5ea5c8 --- /dev/null +++ b/.idea/jsLinters/jshint.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..28a804d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..4a8cfe9 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/jhagent/controllers/account_history.go b/jhagent/controllers/account_history.go index 855f8cc..d4ec21b 100644 --- a/jhagent/controllers/account_history.go +++ b/jhagent/controllers/account_history.go @@ -10,8 +10,8 @@ package controllers import ( - "juhe/jhagent/sys/enum" - "juhe/service/models" + "dongfeng-pay/jhagent/sys/enum" + "dongfeng-pay/service/models" "strconv" "strings" ) diff --git a/jhagent/controllers/deal_excel.go b/jhagent/controllers/deal_excel.go index b6edd9c..a683e80 100644 --- a/jhagent/controllers/deal_excel.go +++ b/jhagent/controllers/deal_excel.go @@ -12,9 +12,9 @@ package controllers import ( "fmt" "github.com/tealeg/xlsx" - "juhe/jhagent/sys/enum" - "juhe/jhagent/utils" - "juhe/service/models" + "dongfeng-pay/jhagent/sys/enum" + "dongfeng-pay/jhagent/utils" + "dongfeng-pay/service/models" "os" "recharge/sys" "strings" diff --git a/jhagent/controllers/index.go b/jhagent/controllers/index.go index 231f5b8..fb42d64 100644 --- a/jhagent/controllers/index.go +++ b/jhagent/controllers/index.go @@ -11,8 +11,8 @@ package controllers import ( "fmt" - "juhe/jhagent/sys/enum" - "juhe/service/models" + "dongfeng-pay/jhagent/sys/enum" + "dongfeng-pay/service/models" ) type Index struct { diff --git a/jhagent/controllers/keep_session.go b/jhagent/controllers/keep_session.go index 82971c4..f45d9a4 100644 --- a/jhagent/controllers/keep_session.go +++ b/jhagent/controllers/keep_session.go @@ -11,7 +11,7 @@ package controllers import ( "github.com/astaxie/beego" - "juhe/jhagent/sys/enum" + "dongfeng-pay/jhagent/sys/enum" ) type KeepSession struct { diff --git a/jhagent/controllers/login.go b/jhagent/controllers/login.go index 55a64da..b9830d7 100644 --- a/jhagent/controllers/login.go +++ b/jhagent/controllers/login.go @@ -13,10 +13,10 @@ import ( "fmt" "github.com/astaxie/beego" "github.com/dchest/captcha" - "juhe/jhagent/sys" - "juhe/jhagent/sys/enum" - "juhe/jhagent/utils" - "juhe/service/models" + "dongfeng-pay/jhagent/sys" + "dongfeng-pay/jhagent/sys/enum" + "dongfeng-pay/jhagent/utils" + "dongfeng-pay/service/models" "strconv" "strings" ) diff --git a/jhagent/controllers/multi_withdraw.go b/jhagent/controllers/multi_withdraw.go index a4c58d3..559d72c 100644 --- a/jhagent/controllers/multi_withdraw.go +++ b/jhagent/controllers/multi_withdraw.go @@ -13,10 +13,10 @@ import ( "fmt" "github.com/rs/xid" "github.com/tealeg/xlsx" - "juhe/jhagent/sys/enum" - "juhe/jhagent/utils" - "juhe/service/common" - "juhe/service/models" + "dongfeng-pay/jhagent/sys/enum" + "dongfeng-pay/jhagent/utils" + "dongfeng-pay/service/common" + "dongfeng-pay/service/models" "path" "regexp" "strconv" diff --git a/jhagent/controllers/trade_record.go b/jhagent/controllers/trade_record.go index 6acfe21..c134060 100644 --- a/jhagent/controllers/trade_record.go +++ b/jhagent/controllers/trade_record.go @@ -10,8 +10,8 @@ package controllers import ( - "juhe/jhagent/sys/enum" - "juhe/service/models" + "dongfeng-pay/jhagent/sys/enum" + "dongfeng-pay/service/models" "strconv" "strings" ) diff --git a/jhagent/controllers/user_info.go b/jhagent/controllers/user_info.go index 16d9f6e..a44bd67 100644 --- a/jhagent/controllers/user_info.go +++ b/jhagent/controllers/user_info.go @@ -10,8 +10,8 @@ package controllers import ( - "juhe/jhagent/sys/enum" - "juhe/service/models" + "dongfeng-pay/jhagent/sys/enum" + "dongfeng-pay/service/models" "regexp" "strings" ) diff --git a/jhagent/controllers/withdraw.go b/jhagent/controllers/withdraw.go index 024fa32..df6dfac 100644 --- a/jhagent/controllers/withdraw.go +++ b/jhagent/controllers/withdraw.go @@ -12,10 +12,10 @@ package controllers import ( "fmt" "github.com/rs/xid" - "juhe/jhagent/sys/enum" - "juhe/jhagent/utils" - "juhe/service/common" - "juhe/service/models" + "dongfeng-pay/jhagent/sys/enum" + "dongfeng-pay/jhagent/utils" + "dongfeng-pay/service/common" + "dongfeng-pay/service/models" "regexp" "strconv" "strings" diff --git a/jhagent/main.go b/jhagent/main.go index 3230a8e..1f78505 100644 --- a/jhagent/main.go +++ b/jhagent/main.go @@ -1,12 +1,12 @@ package main import ( + _ "dongfeng-pay/jhagent/routers" + "dongfeng-pay/jhagent/sys" + "dongfeng-pay/jhagent/utils" + "dongfeng-pay/service/service_init" "github.com/astaxie/beego" "github.com/astaxie/beego/orm" - _ "juhe/jhagent/routers" - "juhe/jhagent/sys" - "juhe/jhagent/utils" - "juhe/service/service_init" ) func init() { diff --git a/jhagent/routers/commentsRouter_controllers.go b/jhagent/routers/commentsRouter_controllers.go index 4f3ad1f..6dfac84 100644 --- a/jhagent/routers/commentsRouter_controllers.go +++ b/jhagent/routers/commentsRouter_controllers.go @@ -7,7 +7,7 @@ import ( func init() { - beego.GlobalControllerRouter["juhe/jhagent/controllers:DealExcel"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:DealExcel"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:DealExcel"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:DealExcel"], beego.ControllerComments{ Method: "DownloadExcelModel", Router: `/excel/download`, @@ -15,7 +15,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:DealExcel"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:DealExcel"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:DealExcel"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:DealExcel"], beego.ControllerComments{ Method: "DownloadRecordExcel", Router: `/excel/download_excel/?:params`, @@ -23,7 +23,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:DealExcel"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:DealExcel"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:DealExcel"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:DealExcel"], beego.ControllerComments{ Method: "MakeComplaintExcel", Router: `/excel/make_complaint_record_excel/?:params`, @@ -31,7 +31,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:DealExcel"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:DealExcel"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:DealExcel"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:DealExcel"], beego.ControllerComments{ Method: "MakeOrderExcel", Router: `/excel/make_order_excel/?:params`, @@ -39,7 +39,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:DealExcel"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:DealExcel"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:DealExcel"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:DealExcel"], beego.ControllerComments{ Method: "MakeWithdrawExcel", Router: `/excel/make_withdraw_record_excel/?:params`, @@ -47,7 +47,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:History"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:History"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:History"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:History"], beego.ControllerComments{ Method: "HistoryQueryAndListPage", Router: `/history/list_history_record/?:params`, @@ -55,7 +55,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:History"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:History"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:History"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:History"], beego.ControllerComments{ Method: "ShowHistoryListUI", Router: `/history/show_history_list_ui`, @@ -63,7 +63,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:Index"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:Index"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Index"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Index"], beego.ControllerComments{ Method: "LoadUserAccountInfo", Router: `/index/loadInfo/`, @@ -71,7 +71,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:Index"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:Index"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Index"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Index"], beego.ControllerComments{ Method: "LoadOrderCount", Router: `/index/loadOrders`, @@ -79,7 +79,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:Index"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:Index"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Index"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Index"], beego.ControllerComments{ Method: "LoadCountOrder", Router: `/index/load_count_order`, @@ -87,7 +87,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:Index"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:Index"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Index"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Index"], beego.ControllerComments{ Method: "LoadUserPayWay", Router: `/index/pay_way`, @@ -95,7 +95,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:Index"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:Index"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Index"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Index"], beego.ControllerComments{ Method: "LoadUserPayWayUI", Router: `/index/show_pay_way_ui`, @@ -103,7 +103,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:Index"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:Index"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Index"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Index"], beego.ControllerComments{ Method: "ShowUI", Router: `/index/ui/`, @@ -111,7 +111,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:Login"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:Login"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Login"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Login"], beego.ControllerComments{ Method: "Index", Router: `/`, @@ -119,7 +119,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:Login"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:Login"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Login"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Login"], beego.ControllerComments{ Method: "FlushCaptcha", Router: `/flushCaptcha.py/`, @@ -127,7 +127,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:Login"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:Login"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Login"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Login"], beego.ControllerComments{ Method: "UserLogin", Router: `/login.py/?:params`, @@ -135,7 +135,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:Login"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:Login"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Login"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Login"], beego.ControllerComments{ Method: "LoginOut", Router: `/loginOut.py`, @@ -143,7 +143,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:Login"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:Login"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Login"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Login"], beego.ControllerComments{ Method: "PayDoc", Router: `/pay_doc.py`, @@ -151,7 +151,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:Login"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:Login"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Login"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Login"], beego.ControllerComments{ Method: "VerifyCaptcha", Router: `/verifyCaptcha.py/:value/:chaId`, @@ -159,7 +159,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:MultiWithdraw"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:MultiWithdraw"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:MultiWithdraw"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:MultiWithdraw"], beego.ControllerComments{ Method: "ShowMultiWithdrawUI", Router: `/multi_withdraw/show_multi_ui`, @@ -167,7 +167,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:TradeRecord"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:TradeRecord"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:TradeRecord"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:TradeRecord"], beego.ControllerComments{ Method: "ComplaintQueryAndListPage", Router: `/trade/complaint/?:params`, @@ -175,7 +175,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:TradeRecord"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:TradeRecord"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:TradeRecord"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:TradeRecord"], beego.ControllerComments{ Method: "TradeQueryAndListPage", Router: `/trade/list/?:params`, @@ -183,7 +183,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:TradeRecord"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:TradeRecord"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:TradeRecord"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:TradeRecord"], beego.ControllerComments{ Method: "ShowComplaintUI", Router: `/trade/show_complaint_ui`, @@ -191,7 +191,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:TradeRecord"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:TradeRecord"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:TradeRecord"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:TradeRecord"], beego.ControllerComments{ Method: "ShowUI", Router: `/trade/show_ui`, @@ -199,7 +199,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:UserInfo"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:UserInfo"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:UserInfo"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:UserInfo"], beego.ControllerComments{ Method: "ConfirmOriginPayPwd", Router: `/user_info/confirm_pay_pwd/?:params`, @@ -207,7 +207,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:UserInfo"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:UserInfo"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:UserInfo"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:UserInfo"], beego.ControllerComments{ Method: "ConfirmOriginPwd", Router: `/user_info/confirm_pwd/?:params`, @@ -215,7 +215,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:UserInfo"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:UserInfo"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:UserInfo"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:UserInfo"], beego.ControllerComments{ Method: "MerchantQueryAndListPage", Router: `/user_info/merchant_list/?:params`, @@ -223,7 +223,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:UserInfo"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:UserInfo"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:UserInfo"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:UserInfo"], beego.ControllerComments{ Method: "ModifyUserInfo", Router: `/user_info/modify_userInfo/?:params`, @@ -231,7 +231,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:UserInfo"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:UserInfo"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:UserInfo"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:UserInfo"], beego.ControllerComments{ Method: "SetPayPassword", Router: `/user_info/set_pay_password/?:params`, @@ -239,7 +239,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:UserInfo"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:UserInfo"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:UserInfo"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:UserInfo"], beego.ControllerComments{ Method: "ShowMerchantUI", Router: `/user_info/show_merchant_ui`, @@ -247,7 +247,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:UserInfo"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:UserInfo"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:UserInfo"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:UserInfo"], beego.ControllerComments{ Method: "ShowModifyUserInfoUI", Router: `/user_info/show_modify_ui`, @@ -255,7 +255,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:UserInfo"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:UserInfo"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:UserInfo"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:UserInfo"], beego.ControllerComments{ Method: "ShowUserInfoUI", Router: `/user_info/show_ui`, @@ -263,7 +263,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:Withdraw"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:Withdraw"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Withdraw"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Withdraw"], beego.ControllerComments{ Method: "LaunchMultiWithdraw", Router: `/multi_withdraw/launch_multi_withdraw/?:params`, @@ -271,7 +271,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:Withdraw"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:Withdraw"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Withdraw"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Withdraw"], beego.ControllerComments{ Method: "UserBalance", Router: `/withdraw/balance`, @@ -279,7 +279,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:Withdraw"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:Withdraw"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Withdraw"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Withdraw"], beego.ControllerComments{ Method: "LaunchSingleWithdraw", Router: `/withdraw/launch_single_withdraw/?:params`, @@ -287,7 +287,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:Withdraw"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:Withdraw"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Withdraw"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Withdraw"], beego.ControllerComments{ Method: "WithdrawQueryAndListPage", Router: `/withdraw/list_record/?:params`, @@ -295,7 +295,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:Withdraw"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:Withdraw"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Withdraw"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Withdraw"], beego.ControllerComments{ Method: "ShowListUI", Router: `/withdraw/show_list_ui`, @@ -303,7 +303,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhagent/controllers:Withdraw"] = append(beego.GlobalControllerRouter["juhe/jhagent/controllers:Withdraw"], + beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Withdraw"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhagent/controllers:Withdraw"], beego.ControllerComments{ Method: "ShowWithdrawUI", Router: `/withdraw/show_ui`, diff --git a/jhagent/routers/router.go b/jhagent/routers/router.go index 10745ec..f4e553b 100644 --- a/jhagent/routers/router.go +++ b/jhagent/routers/router.go @@ -3,7 +3,7 @@ package routers import ( "github.com/astaxie/beego" "github.com/dchest/captcha" - "juhe/jhagent/controllers" + "dongfeng-pay/jhagent/controllers" ) func init() { diff --git a/jhagent/sys/public_method.go b/jhagent/sys/public_method.go index ed4ad52..ed354a0 100644 --- a/jhagent/sys/public_method.go +++ b/jhagent/sys/public_method.go @@ -11,7 +11,7 @@ package sys import ( "fmt" - "juhe/jhagent/sys/enum" + "dongfeng-pay/jhagent/sys/enum" "math/rand" "os" "strconv" diff --git a/jhagent/sys/session.go b/jhagent/sys/session.go index d6de2fd..71f2751 100644 --- a/jhagent/sys/session.go +++ b/jhagent/sys/session.go @@ -11,7 +11,7 @@ package sys import ( "github.com/astaxie/beego" - "juhe/jhagent/sys/enum" + "dongfeng-pay/jhagent/sys/enum" ) func InitSession() { diff --git a/jhagent/utils/logs.go b/jhagent/utils/logs.go index 0c3ec96..501175f 100644 --- a/jhagent/utils/logs.go +++ b/jhagent/utils/logs.go @@ -11,7 +11,7 @@ package utils import ( - "juhe/jhagent/sys" + "dongfeng-pay/jhagent/sys" "strings" "github.com/astaxie/beego" diff --git a/jhagent/utils/send_messages.go b/jhagent/utils/send_messages.go index c29b1ee..ee33b37 100644 --- a/jhagent/utils/send_messages.go +++ b/jhagent/utils/send_messages.go @@ -11,7 +11,7 @@ package utils import ( "fmt" - "juhe/jhagent/sys/enum" + "dongfeng-pay/jhagent/sys/enum" "net/http" "net/url" ) diff --git a/jhboss/controllers/add.go b/jhboss/controllers/add.go index 52917ae..81d8a65 100644 --- a/jhboss/controllers/add.go +++ b/jhboss/controllers/add.go @@ -14,9 +14,9 @@ import ( "github.com/astaxie/beego/logs" "github.com/astaxie/beego/validation" "github.com/rs/xid" - "juhe/service/common" - "juhe/service/models" - "juhe/service/utils" + "dongfeng-pay/service/common" + "dongfeng-pay/service/models" + "dongfeng-pay/service/utils" "strconv" "strings" ) diff --git a/jhboss/controllers/datas.go b/jhboss/controllers/datas.go index caa7ed3..14ae58a 100644 --- a/jhboss/controllers/datas.go +++ b/jhboss/controllers/datas.go @@ -10,7 +10,7 @@ package controllers import ( - "juhe/service/models" + "dongfeng-pay/service/models" ) type BaseDataJSON struct { diff --git a/jhboss/controllers/delete.go b/jhboss/controllers/delete.go index f639690..f7f7c4d 100644 --- a/jhboss/controllers/delete.go +++ b/jhboss/controllers/delete.go @@ -11,8 +11,8 @@ package controllers import ( "github.com/astaxie/beego/logs" - "juhe/service/models" - "juhe/service/utils" + "dongfeng-pay/service/models" + "dongfeng-pay/service/utils" "sort" "strings" ) diff --git a/jhboss/controllers/get.go b/jhboss/controllers/get.go index 8cc40ea..cdceb80 100644 --- a/jhboss/controllers/get.go +++ b/jhboss/controllers/get.go @@ -11,9 +11,9 @@ package controllers import ( "fmt" - "juhe/service/common" - "juhe/service/controller" - "juhe/service/models" + "dongfeng-pay/service/common" + "dongfeng-pay/service/controller" + "dongfeng-pay/service/models" "sort" "strconv" "strings" diff --git a/jhboss/controllers/login.go b/jhboss/controllers/login.go index b401e51..dc30aa2 100644 --- a/jhboss/controllers/login.go +++ b/jhboss/controllers/login.go @@ -4,9 +4,9 @@ import ( "github.com/astaxie/beego" "github.com/astaxie/beego/logs" "github.com/astaxie/beego/validation" - "juhe/service/common" - "juhe/service/models" - "juhe/service/utils" + "dongfeng-pay/service/common" + "dongfeng-pay/service/models" + "dongfeng-pay/service/utils" ) type LoginController struct { diff --git a/jhboss/controllers/query.go b/jhboss/controllers/query.go index c518e5f..35fc3de 100644 --- a/jhboss/controllers/query.go +++ b/jhboss/controllers/query.go @@ -13,9 +13,9 @@ import ( "fmt" "github.com/astaxie/beego" "github.com/astaxie/beego/logs" - "juhe/service/common" - "juhe/service/controller" - "juhe/service/models" + "dongfeng-pay/service/common" + "dongfeng-pay/service/controller" + "dongfeng-pay/service/models" "strings" ) diff --git a/jhboss/controllers/send_notify_merchant.go b/jhboss/controllers/send_notify_merchant.go index ae5aa18..2710398 100644 --- a/jhboss/controllers/send_notify_merchant.go +++ b/jhboss/controllers/send_notify_merchant.go @@ -14,8 +14,8 @@ import ( "github.com/astaxie/beego" "github.com/astaxie/beego/httplib" "github.com/astaxie/beego/logs" - "juhe/service/common" - "juhe/service/models" + "dongfeng-pay/service/common" + "dongfeng-pay/service/models" "strings" ) diff --git a/jhboss/controllers/update.go b/jhboss/controllers/update.go index 346a27f..f1ab2ad 100644 --- a/jhboss/controllers/update.go +++ b/jhboss/controllers/update.go @@ -13,10 +13,10 @@ import ( "fmt" "github.com/astaxie/beego/logs" "github.com/astaxie/beego/validation" - "juhe/service/common" - "juhe/service/controller" - "juhe/service/models" - "juhe/service/utils" + "dongfeng-pay/service/common" + "dongfeng-pay/service/controller" + "dongfeng-pay/service/models" + "dongfeng-pay/service/utils" "strconv" "strings" ) diff --git a/jhboss/main.go b/jhboss/main.go index 7394e9b..bab660a 100644 --- a/jhboss/main.go +++ b/jhboss/main.go @@ -3,10 +3,10 @@ package main import ( "github.com/astaxie/beego" "github.com/astaxie/beego/logs" - _ "juhe/jhboss/routers" - _ "juhe/service/message_queue" - _ "juhe/service/models" - "juhe/service/service_init" + _ "dongfeng-pay/jhboss/routers" + _ "dongfeng-pay/service/message_queue" + _ "dongfeng-pay/service/models" + "dongfeng-pay/service/service_init" ) func main() { diff --git a/jhboss/routers/router.go b/jhboss/routers/router.go index c85a94d..c23e215 100644 --- a/jhboss/routers/router.go +++ b/jhboss/routers/router.go @@ -2,7 +2,7 @@ package routers import ( "github.com/astaxie/beego" - "juhe/jhboss/controllers" + "dongfeng-pay/jhboss/controllers" ) func init() { diff --git a/jhboss/routers/router_pages.go b/jhboss/routers/router_pages.go index 8a47389..ff50a7e 100644 --- a/jhboss/routers/router_pages.go +++ b/jhboss/routers/router_pages.go @@ -11,7 +11,7 @@ package routers import ( "github.com/astaxie/beego" - "juhe/jhboss/controllers" + "dongfeng-pay/jhboss/controllers" ) func init() { diff --git a/jhboss/tests/default_test.go b/jhboss/tests/default_test.go index 91439bf..abf6f6a 100644 --- a/jhboss/tests/default_test.go +++ b/jhboss/tests/default_test.go @@ -6,7 +6,7 @@ import ( "testing" "runtime" "path/filepath" - _ "juhe/jhboss/routers" + _ "dongfeng-pay/jhboss/routers" "github.com/astaxie/beego" . "github.com/smartystreets/goconvey/convey" diff --git a/jhgateway/controllers/gateway/base_gateway.go b/jhgateway/controllers/gateway/base_gateway.go index 952b194..5714244 100644 --- a/jhgateway/controllers/gateway/base_gateway.go +++ b/jhgateway/controllers/gateway/base_gateway.go @@ -14,10 +14,10 @@ import ( "github.com/astaxie/beego" "github.com/astaxie/beego/logs" "github.com/rs/xid" - "juhe/service/common" - "juhe/service/controller" - "juhe/service/models" - "juhe/service/utils" + "dongfeng-pay/service/common" + "dongfeng-pay/service/controller" + "dongfeng-pay/service/models" + "dongfeng-pay/service/utils" "strconv" "strings" "time" diff --git a/jhgateway/controllers/gateway/merchant_query.go b/jhgateway/controllers/gateway/merchant_query.go index 6090659..2713716 100644 --- a/jhgateway/controllers/gateway/merchant_query.go +++ b/jhgateway/controllers/gateway/merchant_query.go @@ -14,8 +14,8 @@ import ( "fmt" "github.com/astaxie/beego" "github.com/astaxie/beego/logs" - "juhe/service/models" - "juhe/service/utils" + "dongfeng-pay/service/models" + "dongfeng-pay/service/utils" "strings" ) diff --git a/jhgateway/controllers/gateway/payfor_gateway.go b/jhgateway/controllers/gateway/payfor_gateway.go index faaebe1..e36b9c8 100644 --- a/jhgateway/controllers/gateway/payfor_gateway.go +++ b/jhgateway/controllers/gateway/payfor_gateway.go @@ -15,9 +15,9 @@ import ( "github.com/astaxie/beego" "github.com/astaxie/beego/logs" "github.com/rs/xid" - "juhe/service/common" - "juhe/service/models" - "juhe/service/utils" + "dongfeng-pay/service/common" + "dongfeng-pay/service/models" + "dongfeng-pay/service/utils" "strconv" "strings" ) diff --git a/jhgateway/controllers/gateway/scan_gateway.go b/jhgateway/controllers/gateway/scan_gateway.go index a3ace7c..9b7921a 100644 --- a/jhgateway/controllers/gateway/scan_gateway.go +++ b/jhgateway/controllers/gateway/scan_gateway.go @@ -10,8 +10,8 @@ package gateway import ( - "juhe/service/controller" - "juhe/service/utils" + "dongfeng-pay/service/controller" + "dongfeng-pay/service/utils" "strings" ) diff --git a/jhgateway/main.go b/jhgateway/main.go index 8d116cb..fb03e5e 100644 --- a/jhgateway/main.go +++ b/jhgateway/main.go @@ -2,8 +2,8 @@ package main import ( "github.com/astaxie/beego" - _ "juhe/jhgateway/routers" - "juhe/service/service_init" + _ "dongfeng-pay/jhgateway/routers" + "dongfeng-pay/service/service_init" ) func main() { diff --git a/jhgateway/routers/router.go b/jhgateway/routers/router.go index aef1210..2062a15 100644 --- a/jhgateway/routers/router.go +++ b/jhgateway/routers/router.go @@ -2,7 +2,7 @@ package routers import ( "github.com/astaxie/beego" - "juhe/jhgateway/controllers/gateway" + "dongfeng-pay/jhgateway/controllers/gateway" ) func init() { diff --git a/jhgateway/tests/default_test.go b/jhgateway/tests/default_test.go index 85b516b..f0fd258 100644 --- a/jhgateway/tests/default_test.go +++ b/jhgateway/tests/default_test.go @@ -6,7 +6,7 @@ import ( "testing" "runtime" "path/filepath" - _ "juhe/jhgateway/routers" + _ "dongfeng-pay/jhgateway/routers" "github.com/astaxie/beego" . "github.com/smartystreets/goconvey/convey" diff --git a/jhmerchant/controllers/account_history.go b/jhmerchant/controllers/account_history.go index cdcea85..1259c0b 100644 --- a/jhmerchant/controllers/account_history.go +++ b/jhmerchant/controllers/account_history.go @@ -10,8 +10,8 @@ package controllers import ( - "juhe/jhmerchant/sys/enum" - "juhe/service/models" + "dongfeng-pay/jhmerchant/sys/enum" + "dongfeng-pay/service/models" "strconv" "strings" ) diff --git a/jhmerchant/controllers/deal_excel.go b/jhmerchant/controllers/deal_excel.go index 458b51d..ef1b55f 100644 --- a/jhmerchant/controllers/deal_excel.go +++ b/jhmerchant/controllers/deal_excel.go @@ -12,9 +12,9 @@ package controllers import ( "fmt" "github.com/tealeg/xlsx" - "juhe/jhmerchant/sys/enum" - "juhe/jhmerchant/utils" - "juhe/service/models" + "dongfeng-pay/jhmerchant/sys/enum" + "dongfeng-pay/jhmerchant/utils" + "dongfeng-pay/service/models" "os" "recharge/sys" "strings" diff --git a/jhmerchant/controllers/index.go b/jhmerchant/controllers/index.go index 69bd6dd..6183a96 100644 --- a/jhmerchant/controllers/index.go +++ b/jhmerchant/controllers/index.go @@ -11,8 +11,8 @@ package controllers import ( "fmt" - "juhe/jhmerchant/sys/enum" - "juhe/service/models" + "dongfeng-pay/jhmerchant/sys/enum" + "dongfeng-pay/service/models" ) type Index struct { diff --git a/jhmerchant/controllers/keep_session.go b/jhmerchant/controllers/keep_session.go index cde58fd..8f6a1b9 100644 --- a/jhmerchant/controllers/keep_session.go +++ b/jhmerchant/controllers/keep_session.go @@ -11,7 +11,7 @@ package controllers import ( "github.com/astaxie/beego" - "juhe/jhmerchant/sys/enum" + "dongfeng-pay/jhmerchant/sys/enum" ) type KeepSession struct { diff --git a/jhmerchant/controllers/login.go b/jhmerchant/controllers/login.go index 853ed32..09f7e63 100644 --- a/jhmerchant/controllers/login.go +++ b/jhmerchant/controllers/login.go @@ -13,10 +13,10 @@ import ( "fmt" "github.com/astaxie/beego" "github.com/dchest/captcha" - "juhe/jhmerchant/sys" - "juhe/jhmerchant/sys/enum" - "juhe/jhmerchant/utils" - "juhe/service/models" + "dongfeng-pay/jhmerchant/sys" + "dongfeng-pay/jhmerchant/sys/enum" + "dongfeng-pay/jhmerchant/utils" + "dongfeng-pay/service/models" "strconv" "strings" ) diff --git a/jhmerchant/controllers/multi_withdraw.go b/jhmerchant/controllers/multi_withdraw.go index fe7269c..3a6ebeb 100644 --- a/jhmerchant/controllers/multi_withdraw.go +++ b/jhmerchant/controllers/multi_withdraw.go @@ -13,10 +13,10 @@ import ( "fmt" "github.com/rs/xid" "github.com/tealeg/xlsx" - "juhe/jhmerchant/sys/enum" - "juhe/jhmerchant/utils" - "juhe/service/common" - "juhe/service/models" + "dongfeng-pay/jhmerchant/sys/enum" + "dongfeng-pay/jhmerchant/utils" + "dongfeng-pay/service/common" + "dongfeng-pay/service/models" "path" "regexp" "strconv" diff --git a/jhmerchant/controllers/trade_record.go b/jhmerchant/controllers/trade_record.go index 1cafca1..cd1ac91 100644 --- a/jhmerchant/controllers/trade_record.go +++ b/jhmerchant/controllers/trade_record.go @@ -10,8 +10,8 @@ package controllers import ( - "juhe/jhmerchant/sys/enum" - "juhe/service/models" + "dongfeng-pay/jhmerchant/sys/enum" + "dongfeng-pay/service/models" "strconv" "strings" ) diff --git a/jhmerchant/controllers/user_info.go b/jhmerchant/controllers/user_info.go index e0260c5..4be146c 100644 --- a/jhmerchant/controllers/user_info.go +++ b/jhmerchant/controllers/user_info.go @@ -10,8 +10,8 @@ package controllers import ( - "juhe/jhmerchant/sys/enum" - "juhe/service/models" + "dongfeng-pay/jhmerchant/sys/enum" + "dongfeng-pay/service/models" "regexp" "strings" ) diff --git a/jhmerchant/controllers/withdraw.go b/jhmerchant/controllers/withdraw.go index 6e1f242..c74113a 100644 --- a/jhmerchant/controllers/withdraw.go +++ b/jhmerchant/controllers/withdraw.go @@ -12,10 +12,10 @@ package controllers import ( "fmt" "github.com/rs/xid" - "juhe/jhmerchant/sys/enum" - "juhe/jhmerchant/utils" - "juhe/service/common" - "juhe/service/models" + "dongfeng-pay/jhmerchant/sys/enum" + "dongfeng-pay/jhmerchant/utils" + "dongfeng-pay/service/common" + "dongfeng-pay/service/models" "regexp" "strconv" "strings" diff --git a/jhmerchant/main.go b/jhmerchant/main.go index d5fbbea..49bc9df 100644 --- a/jhmerchant/main.go +++ b/jhmerchant/main.go @@ -3,10 +3,10 @@ package main import ( "github.com/astaxie/beego" "github.com/astaxie/beego/orm" - _ "juhe/jhmerchant/routers" - "juhe/jhmerchant/sys" - "juhe/jhmerchant/utils" - "juhe/service/service_init" + _ "dongfeng-pay/jhmerchant/routers" + "dongfeng-pay/jhmerchant/sys" + "dongfeng-pay/jhmerchant/utils" + "dongfeng-pay/service/service_init" ) func init() { diff --git a/jhmerchant/routers/commentsRouter_controllers.go b/jhmerchant/routers/commentsRouter_controllers.go index b5a0b55..e799566 100644 --- a/jhmerchant/routers/commentsRouter_controllers.go +++ b/jhmerchant/routers/commentsRouter_controllers.go @@ -7,7 +7,7 @@ import ( func init() { - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:DealExcel"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:DealExcel"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:DealExcel"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:DealExcel"], beego.ControllerComments{ Method: "DownloadExcelModel", Router: `/excel/download`, @@ -15,7 +15,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:DealExcel"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:DealExcel"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:DealExcel"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:DealExcel"], beego.ControllerComments{ Method: "DownloadRecordExcel", Router: `/excel/download_excel/?:params`, @@ -23,7 +23,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:DealExcel"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:DealExcel"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:DealExcel"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:DealExcel"], beego.ControllerComments{ Method: "MakeComplaintExcel", Router: `/excel/make_complaint_record_excel/?:params`, @@ -31,7 +31,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:DealExcel"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:DealExcel"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:DealExcel"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:DealExcel"], beego.ControllerComments{ Method: "MakeOrderExcel", Router: `/excel/make_order_excel/?:params`, @@ -39,7 +39,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:DealExcel"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:DealExcel"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:DealExcel"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:DealExcel"], beego.ControllerComments{ Method: "MakeWithdrawExcel", Router: `/excel/make_withdraw_record_excel/?:params`, @@ -47,7 +47,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:History"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:History"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:History"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:History"], beego.ControllerComments{ Method: "HistoryQueryAndListPage", Router: `/history/list_history_record/?:params`, @@ -55,7 +55,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:History"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:History"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:History"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:History"], beego.ControllerComments{ Method: "ShowHistoryListUI", Router: `/history/show_history_list_ui`, @@ -63,7 +63,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Index"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Index"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Index"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Index"], beego.ControllerComments{ Method: "LoadUserAccountInfo", Router: `/index/loadInfo/`, @@ -71,7 +71,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Index"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Index"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Index"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Index"], beego.ControllerComments{ Method: "LoadOrderCount", Router: `/index/loadOrders`, @@ -79,7 +79,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Index"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Index"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Index"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Index"], beego.ControllerComments{ Method: "LoadCountOrder", Router: `/index/load_count_order`, @@ -87,7 +87,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Index"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Index"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Index"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Index"], beego.ControllerComments{ Method: "LoadUserPayWay", Router: `/index/pay_way`, @@ -95,7 +95,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Index"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Index"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Index"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Index"], beego.ControllerComments{ Method: "LoadUserPayWayUI", Router: `/index/show_pay_way_ui`, @@ -103,7 +103,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Index"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Index"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Index"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Index"], beego.ControllerComments{ Method: "ShowUI", Router: `/index/ui/`, @@ -111,7 +111,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Login"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Login"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Login"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Login"], beego.ControllerComments{ Method: "Index", Router: `/`, @@ -119,7 +119,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Login"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Login"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Login"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Login"], beego.ControllerComments{ Method: "FlushCaptcha", Router: `/flushCaptcha.py/`, @@ -127,7 +127,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Login"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Login"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Login"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Login"], beego.ControllerComments{ Method: "UserLogin", Router: `/login.py/?:params`, @@ -135,7 +135,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Login"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Login"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Login"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Login"], beego.ControllerComments{ Method: "LoginOut", Router: `/loginOut.py`, @@ -143,7 +143,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Login"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Login"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Login"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Login"], beego.ControllerComments{ Method: "PayDoc", Router: `/pay_doc.py`, @@ -151,7 +151,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Login"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Login"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Login"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Login"], beego.ControllerComments{ Method: "VerifyCaptcha", Router: `/verifyCaptcha.py/:value/:chaId`, @@ -159,7 +159,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:MultiWithdraw"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:MultiWithdraw"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:MultiWithdraw"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:MultiWithdraw"], beego.ControllerComments{ Method: "ShowMultiWithdrawUI", Router: `/multi_withdraw/show_multi_ui`, @@ -167,7 +167,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:TradeRecord"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:TradeRecord"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:TradeRecord"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:TradeRecord"], beego.ControllerComments{ Method: "ComplaintQueryAndListPage", Router: `/trade/complaint/?:params`, @@ -175,7 +175,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:TradeRecord"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:TradeRecord"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:TradeRecord"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:TradeRecord"], beego.ControllerComments{ Method: "TradeQueryAndListPage", Router: `/trade/list/?:params`, @@ -183,7 +183,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:TradeRecord"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:TradeRecord"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:TradeRecord"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:TradeRecord"], beego.ControllerComments{ Method: "ShowComplaintUI", Router: `/trade/show_complaint_ui`, @@ -191,7 +191,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:TradeRecord"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:TradeRecord"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:TradeRecord"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:TradeRecord"], beego.ControllerComments{ Method: "ShowUI", Router: `/trade/show_ui`, @@ -199,7 +199,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:UserInfo"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:UserInfo"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:UserInfo"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:UserInfo"], beego.ControllerComments{ Method: "ConfirmOriginPwd", Router: `/user_info/confirm_pwd/?:params`, @@ -207,7 +207,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:UserInfo"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:UserInfo"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:UserInfo"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:UserInfo"], beego.ControllerComments{ Method: "ModifyUserInfo", Router: `/user_info/modify_userInfo/?:params`, @@ -215,7 +215,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:UserInfo"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:UserInfo"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:UserInfo"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:UserInfo"], beego.ControllerComments{ Method: "ShowModifyUserInfoUI", Router: `/user_info/show_modify_ui`, @@ -223,7 +223,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:UserInfo"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:UserInfo"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:UserInfo"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:UserInfo"], beego.ControllerComments{ Method: "ShowUserInfoUI", Router: `/user_info/show_ui`, @@ -231,7 +231,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Withdraw"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Withdraw"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Withdraw"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Withdraw"], beego.ControllerComments{ Method: "LaunchMultiWithdraw", Router: `/multi_withdraw/launch_multi_withdraw/?:params`, @@ -239,7 +239,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Withdraw"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Withdraw"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Withdraw"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Withdraw"], beego.ControllerComments{ Method: "SendMsgForMultiWithdraw", Router: `/multi_withdraw/send_msg_for_multi/?:params`, @@ -247,7 +247,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Withdraw"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Withdraw"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Withdraw"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Withdraw"], beego.ControllerComments{ Method: "UserBalance", Router: `/withdraw/balance`, @@ -255,7 +255,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Withdraw"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Withdraw"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Withdraw"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Withdraw"], beego.ControllerComments{ Method: "LaunchSingleWithdraw", Router: `/withdraw/launch_single_withdraw/?:params`, @@ -263,7 +263,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Withdraw"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Withdraw"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Withdraw"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Withdraw"], beego.ControllerComments{ Method: "WithdrawQueryAndListPage", Router: `/withdraw/list_record/?:params`, @@ -271,7 +271,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Withdraw"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Withdraw"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Withdraw"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Withdraw"], beego.ControllerComments{ Method: "SendMsgForWithdraw", Router: `/withdraw/send_msg/?:params`, @@ -279,7 +279,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Withdraw"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Withdraw"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Withdraw"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Withdraw"], beego.ControllerComments{ Method: "ShowListUI", Router: `/withdraw/show_list_ui`, @@ -287,7 +287,7 @@ func init() { MethodParams: param.Make(), Params: nil}) - beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Withdraw"] = append(beego.GlobalControllerRouter["juhe/jhmerchant/controllers:Withdraw"], + beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Withdraw"] = append(beego.GlobalControllerRouter["dongfeng-pay/jhmerchant/controllers:Withdraw"], beego.ControllerComments{ Method: "ShowWithdrawUI", Router: `/withdraw/show_ui`, diff --git a/jhmerchant/routers/router.go b/jhmerchant/routers/router.go index 1f56550..a731f58 100644 --- a/jhmerchant/routers/router.go +++ b/jhmerchant/routers/router.go @@ -3,7 +3,7 @@ package routers import ( "github.com/astaxie/beego" "github.com/dchest/captcha" - "juhe/jhmerchant/controllers" + "dongfeng-pay/jhmerchant/controllers" ) func init() { diff --git a/jhmerchant/sys/public_method.go b/jhmerchant/sys/public_method.go index 97eea8c..7d15468 100644 --- a/jhmerchant/sys/public_method.go +++ b/jhmerchant/sys/public_method.go @@ -11,7 +11,7 @@ package sys import ( "fmt" - "juhe/jhmerchant/sys/enum" + "dongfeng-pay/jhmerchant/sys/enum" "math/rand" "os" "strconv" diff --git a/jhmerchant/sys/session.go b/jhmerchant/sys/session.go index eb30ff7..9331b5a 100644 --- a/jhmerchant/sys/session.go +++ b/jhmerchant/sys/session.go @@ -11,7 +11,7 @@ package sys import ( "github.com/astaxie/beego" - "juhe/jhmerchant/sys/enum" + "dongfeng-pay/jhmerchant/sys/enum" ) func InitSession() { diff --git a/jhmerchant/utils/logs.go b/jhmerchant/utils/logs.go index f54c601..e7f1169 100644 --- a/jhmerchant/utils/logs.go +++ b/jhmerchant/utils/logs.go @@ -11,7 +11,7 @@ package utils import ( - "juhe/jhmerchant/sys" + "dongfeng-pay/jhmerchant/sys" "strings" "github.com/astaxie/beego" diff --git a/jhmerchant/utils/send_messages.go b/jhmerchant/utils/send_messages.go index 055f837..e117f63 100644 --- a/jhmerchant/utils/send_messages.go +++ b/jhmerchant/utils/send_messages.go @@ -11,7 +11,7 @@ package utils import ( "fmt" - "juhe/jhmerchant/sys/enum" + "dongfeng-pay/jhmerchant/sys/enum" "net/http" "net/url" ) diff --git a/jhmicro/main.go b/jhmicro/main.go index a99e66a..85f710f 100644 --- a/jhmicro/main.go +++ b/jhmicro/main.go @@ -3,11 +3,11 @@ package main import ( "github.com/astaxie/beego" "github.com/astaxie/beego/logs" - "juhe/jhmicro/notify" - "juhe/jhmicro/order_settle" - "juhe/jhmicro/pay_for" - "juhe/jhmicro/query" - "juhe/service/service_init" + "dongfeng-pay/jhmicro/notify" + "dongfeng-pay/jhmicro/order_settle" + "dongfeng-pay/jhmicro/pay_for" + "dongfeng-pay/jhmicro/query" + "dongfeng-pay/service/service_init" ) func main() { diff --git a/jhmicro/notify/order_notify.go b/jhmicro/notify/order_notify.go index 9f40a00..4db4c25 100644 --- a/jhmicro/notify/order_notify.go +++ b/jhmicro/notify/order_notify.go @@ -14,10 +14,10 @@ import ( "github.com/astaxie/beego/httplib" "github.com/astaxie/beego/logs" "github.com/go-stomp/stomp" - "juhe/service/common" - "juhe/service/message_queue" - "juhe/service/models" - "juhe/service/utils" + "dongfeng-pay/service/common" + "dongfeng-pay/service/message_queue" + "dongfeng-pay/service/models" + "dongfeng-pay/service/utils" "os" "strings" "time" diff --git a/jhmicro/order_settle/settle.go b/jhmicro/order_settle/settle.go index 103ac7a..7f6a696 100644 --- a/jhmicro/order_settle/settle.go +++ b/jhmicro/order_settle/settle.go @@ -11,7 +11,7 @@ package order_settle import ( "github.com/astaxie/beego/logs" - "juhe/service/controller" + "dongfeng-pay/service/controller" "time" ) diff --git a/jhmicro/pay_for/payfor.go b/jhmicro/pay_for/payfor.go index eb4854b..7552f5f 100644 --- a/jhmicro/pay_for/payfor.go +++ b/jhmicro/pay_for/payfor.go @@ -11,8 +11,8 @@ package pay_for import ( "github.com/astaxie/beego/logs" - "juhe/service/common" - "juhe/service/controller" + "dongfeng-pay/service/common" + "dongfeng-pay/service/controller" "time" ) diff --git a/jhmicro/query/order_query.go b/jhmicro/query/order_query.go index 8b7b3d6..e309128 100644 --- a/jhmicro/query/order_query.go +++ b/jhmicro/query/order_query.go @@ -13,10 +13,10 @@ import ( "fmt" "github.com/astaxie/beego/logs" "github.com/go-stomp/stomp" - "juhe/service/common" - "juhe/service/controller" - "juhe/service/message_queue" - "juhe/service/models" + "dongfeng-pay/service/common" + "dongfeng-pay/service/controller" + "dongfeng-pay/service/message_queue" + "dongfeng-pay/service/models" "os" "time" ) diff --git a/jhmicro/query/pay_for_query.go b/jhmicro/query/pay_for_query.go index 61a2502..987ec36 100644 --- a/jhmicro/query/pay_for_query.go +++ b/jhmicro/query/pay_for_query.go @@ -13,11 +13,11 @@ import ( "fmt" "github.com/astaxie/beego/logs" "github.com/go-stomp/stomp" - "juhe/service/common" - "juhe/service/controller" - "juhe/service/message_queue" - "juhe/service/models" - "juhe/service/utils" + "dongfeng-pay/service/common" + "dongfeng-pay/service/controller" + "dongfeng-pay/service/message_queue" + "dongfeng-pay/service/models" + "dongfeng-pay/service/utils" "os" "time" ) diff --git a/service/conf/config.go b/service/conf/config.go index 76da4fa..e32eecf 100644 --- a/service/conf/config.go +++ b/service/conf/config.go @@ -14,5 +14,5 @@ package conf // DB_PORT = "3306" // DB_USER = "root" // DB_PASSWORD = "" -// DB_BASE = "juhe_pay" +// DB_BASE = "dongfeng-pay_pay" //) diff --git a/service/controller/alipay.go b/service/controller/alipay.go index 0ac06f4..5f5c31c 100644 --- a/service/controller/alipay.go +++ b/service/controller/alipay.go @@ -10,7 +10,7 @@ package controller import ( - "juhe/service/models" + "dongfeng-pay/service/models" ) type AlipayImpl struct { diff --git a/service/controller/gateway_solve.go b/service/controller/gateway_solve.go index 702cd2e..1d38fda 100644 --- a/service/controller/gateway_solve.go +++ b/service/controller/gateway_solve.go @@ -12,7 +12,7 @@ package controller import ( "github.com/astaxie/beego/logs" "github.com/astaxie/beego/orm" - "juhe/service/models" + "dongfeng-pay/service/models" ) /* diff --git a/service/controller/init.go b/service/controller/init.go index 60419ec..9a6e916 100644 --- a/service/controller/init.go +++ b/service/controller/init.go @@ -11,7 +11,7 @@ package controller import ( "github.com/astaxie/beego/logs" - "juhe/service/common" + "dongfeng-pay/service/common" ) var registerSupplier = make(map[string]PayInterface) diff --git a/service/controller/kuaifu.go b/service/controller/kuaifu.go index 413c158..1e9b334 100644 --- a/service/controller/kuaifu.go +++ b/service/controller/kuaifu.go @@ -16,9 +16,9 @@ import ( "github.com/astaxie/beego/logs" "github.com/rs/xid" "github.com/widuu/gojson" - "juhe/service/common" - "juhe/service/models" - "juhe/service/utils" + "dongfeng-pay/service/common" + "dongfeng-pay/service/models" + "dongfeng-pay/service/utils" "strconv" "strings" ) diff --git a/service/controller/order_settle.go b/service/controller/order_settle.go index 8f4326d..dde5279 100644 --- a/service/controller/order_settle.go +++ b/service/controller/order_settle.go @@ -13,9 +13,9 @@ import ( "fmt" "github.com/astaxie/beego/logs" "github.com/astaxie/beego/orm" - "juhe/service/common" - "juhe/service/models" - "juhe/service/utils" + "dongfeng-pay/service/common" + "dongfeng-pay/service/models" + "dongfeng-pay/service/utils" "time" ) diff --git a/service/controller/pay_solve.go b/service/controller/pay_solve.go index 76d2014..f78c925 100644 --- a/service/controller/pay_solve.go +++ b/service/controller/pay_solve.go @@ -13,10 +13,10 @@ import ( "fmt" "github.com/astaxie/beego/logs" "github.com/astaxie/beego/orm" - "juhe/service/common" - "juhe/service/message_queue" - "juhe/service/models" - "juhe/service/utils" + "dongfeng-pay/service/common" + "dongfeng-pay/service/message_queue" + "dongfeng-pay/service/models" + "dongfeng-pay/service/utils" url2 "net/url" "strconv" ) diff --git a/service/controller/payfor_solve.go b/service/controller/payfor_solve.go index 76abdd1..f79e1f2 100644 --- a/service/controller/payfor_solve.go +++ b/service/controller/payfor_solve.go @@ -13,10 +13,10 @@ import ( "fmt" "github.com/astaxie/beego/logs" "github.com/astaxie/beego/orm" - "juhe/service/common" - "juhe/service/message_queue" - "juhe/service/models" - "juhe/service/utils" + "dongfeng-pay/service/common" + "dongfeng-pay/service/message_queue" + "dongfeng-pay/service/models" + "dongfeng-pay/service/utils" "strings" ) diff --git a/service/controller/supplier_interface.go b/service/controller/supplier_interface.go index d1de5b2..6bf05f3 100644 --- a/service/controller/supplier_interface.go +++ b/service/controller/supplier_interface.go @@ -10,7 +10,7 @@ package controller import ( - "juhe/service/models" + "dongfeng-pay/service/models" ) //定义扫码支付的返回值 diff --git a/service/controller/weixin.go b/service/controller/weixin.go index f800513..be23c66 100644 --- a/service/controller/weixin.go +++ b/service/controller/weixin.go @@ -10,7 +10,7 @@ package controller import ( - "juhe/service/models" + "dongfeng-pay/service/models" ) type WeiXinImpl struct { diff --git a/service/message_queue/active_mq.go b/service/message_queue/active_mq.go index 3c47a5c..d552ec2 100644 --- a/service/message_queue/active_mq.go +++ b/service/message_queue/active_mq.go @@ -12,7 +12,7 @@ package message_queue import ( "github.com/astaxie/beego/logs" "github.com/go-stomp/stomp" - "juhe/service/common" + "dongfeng-pay/service/common" "os" "time" ) diff --git a/service/models/init.go b/service/models/init.go index b1f537e..a072000 100644 --- a/service/models/init.go +++ b/service/models/init.go @@ -14,7 +14,7 @@ import ( "github.com/astaxie/beego" "github.com/astaxie/beego/orm" _ "github.com/go-sql-driver/mysql" - "juhe/service/conf" + "dongfeng-pay/service/conf" ) func Init() { diff --git a/service/models/payfor_info.go b/service/models/payfor_info.go index 7cbf4c0..6ab62dc 100644 --- a/service/models/payfor_info.go +++ b/service/models/payfor_info.go @@ -13,8 +13,8 @@ import ( "fmt" "github.com/astaxie/beego/logs" "github.com/astaxie/beego/orm" - "juhe/service/common" - "juhe/service/utils" + "dongfeng-pay/service/common" + "dongfeng-pay/service/utils" ) type PayforInfo struct { diff --git a/service/models/transaction.go b/service/models/transaction.go index a90a6a1..fa9730c 100644 --- a/service/models/transaction.go +++ b/service/models/transaction.go @@ -12,8 +12,8 @@ package models import ( "github.com/astaxie/beego/logs" "github.com/astaxie/beego/orm" - "juhe/service/common" - "juhe/service/utils" + "dongfeng-pay/service/common" + "dongfeng-pay/service/utils" ) func OperatorAccount(accountUid, operatorType string, amount float64) (string, bool) { diff --git a/service/service_init/init_all.go b/service/service_init/init_all.go index de29339..de48b11 100644 --- a/service/service_init/init_all.go +++ b/service/service_init/init_all.go @@ -10,9 +10,9 @@ package service_init import ( - _ "juhe/service/message_queue" - "juhe/service/models" - "juhe/service/controller" + _ "dongfeng-pay/service/message_queue" + "dongfeng-pay/service/models" + "dongfeng-pay/service/controller" ) func InitAll() { diff --git a/shop/controllers/scan_shop.go b/shop/controllers/scan_shop.go index aed5725..ab91ee3 100644 --- a/shop/controllers/scan_shop.go +++ b/shop/controllers/scan_shop.go @@ -15,7 +15,7 @@ import ( "github.com/astaxie/beego/logs" "github.com/skip2/go-qrcode" "github.com/widuu/gojson" - "juhe/service/utils" + "dongfeng-pay/service/utils" "strings" ) diff --git a/shop/main.go b/shop/main.go index f5a8b1c..df6feab 100644 --- a/shop/main.go +++ b/shop/main.go @@ -2,7 +2,7 @@ package main import ( "github.com/astaxie/beego" - _ "juhe/shop/routers" + _ "dongfeng-pay/shop/routers" ) func main() { diff --git a/shop/routers/router.go b/shop/routers/router.go index 2d18d5f..478c31f 100644 --- a/shop/routers/router.go +++ b/shop/routers/router.go @@ -2,7 +2,7 @@ package routers import ( "github.com/astaxie/beego" - "juhe/shop/controllers" + "dongfeng-pay/shop/controllers" ) func init() {