From 3b1a41dd7ebb99d76b86057dba67fdd9501c5eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= Date: Wed, 18 Aug 2021 17:53:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BE=AE=E4=BF=A1=E6=94=AF?= =?UTF-8?q?=E4=BB=98V3=E7=89=88=20=E4=BC=98=E5=8C=96=E7=94=B5=E5=BD=B1?= =?UTF-8?q?=E7=A5=A8=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 ++- README.md | 2 +- library.go | 2 +- service/{movieapi/v2 => movieapiv2}/.gitignore | 0 service/{movieapi/v2 => movieapiv2}/app.go | 2 +- service/{movieapi/v2 => movieapiv2}/movie_info_get_ShowDate.go | 2 +- .../{movieapi/v2 => movieapiv2}/movie_info_get_cinema_list.go | 2 +- .../{movieapi/v2 => movieapiv2}/movie_info_get_city_area.go | 2 +- .../{movieapi/v2 => movieapiv2}/movie_info_get_city_list.go | 2 +- service/{movieapi/v2 => movieapiv2}/movie_info_get_hot_list.go | 2 +- .../v2 => movieapiv2}/movie_info_get_schedule_list.go | 2 +- service/{movieapi/v2 => movieapiv2}/movie_info_get_sea.go | 2 +- .../{movieapi/v2 => movieapiv2}/movie_info_get_show_list.go | 2 +- .../{movieapi/v2 => movieapiv2}/movie_info_get_soon_list.go | 2 +- service/{movieapi/v2 => movieapiv2}/movie_info_get_version.go | 2 +- service/{movieapi/v2 => movieapiv2}/sign.go | 2 +- service/{wechat/pay/v3 => wechatpayapiv3}/.gitignore | 0 service/{wechat/pay/v3 => wechatpayapiv3}/app.go | 2 +- service/{wechat/pay/v3 => wechatpayapiv3}/config.go | 2 +- .../pay/v3 => wechatpayapiv3}/pay_transactions_jsapi.go | 2 +- service/{wechat/pay/v3 => wechatpayapiv3}/sign.go | 2 +- 21 files changed, 20 insertions(+), 19 deletions(-) rename service/{movieapi/v2 => movieapiv2}/.gitignore (100%) rename service/{movieapi/v2 => movieapiv2}/app.go (98%) rename service/{movieapi/v2 => movieapiv2}/movie_info_get_ShowDate.go (98%) rename service/{movieapi/v2 => movieapiv2}/movie_info_get_cinema_list.go (98%) rename service/{movieapi/v2 => movieapiv2}/movie_info_get_city_area.go (98%) rename service/{movieapi/v2 => movieapiv2}/movie_info_get_city_list.go (97%) rename service/{movieapi/v2 => movieapiv2}/movie_info_get_hot_list.go (99%) rename service/{movieapi/v2 => movieapiv2}/movie_info_get_schedule_list.go (99%) rename service/{movieapi/v2 => movieapiv2}/movie_info_get_sea.go (98%) rename service/{movieapi/v2 => movieapiv2}/movie_info_get_show_list.go (98%) rename service/{movieapi/v2 => movieapiv2}/movie_info_get_soon_list.go (99%) rename service/{movieapi/v2 => movieapiv2}/movie_info_get_version.go (96%) rename service/{movieapi/v2 => movieapiv2}/sign.go (98%) rename service/{wechat/pay/v3 => wechatpayapiv3}/.gitignore (100%) rename service/{wechat/pay/v3 => wechatpayapiv3}/app.go (98%) rename service/{wechat/pay/v3 => wechatpayapiv3}/config.go (90%) rename service/{wechat/pay/v3 => wechatpayapiv3}/pay_transactions_jsapi.go (99%) rename service/{wechat/pay/v3 => wechatpayapiv3}/sign.go (99%) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb8fb785..3017f610 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ -## v1.0.21 / 2021-08-18 +## v1.0.22 / 2021-08-18 - 增加微信支付V3版 +- 优化电影票服务 - ## v1.0.20 / 2021-08-16 diff --git a/README.md b/README.md index 0cfa854e..b651ae25 100644 --- a/README.md +++ b/README.md @@ -11,5 +11,5 @@ ## Install 安装 ```Importing -go get -v -u gitee.com/dtapps/go-library@v1.0.21 +go get -v -u gitee.com/dtapps/go-library@v1.0.22 ``` diff --git a/library.go b/library.go index f397e79a..d72c7861 100644 --- a/library.go +++ b/library.go @@ -1,5 +1,5 @@ package go_library func Version() string { - return "v1.0.21" + return "v1.0.22" } diff --git a/service/movieapi/v2/.gitignore b/service/movieapiv2/.gitignore similarity index 100% rename from service/movieapi/v2/.gitignore rename to service/movieapiv2/.gitignore diff --git a/service/movieapi/v2/app.go b/service/movieapiv2/app.go similarity index 98% rename from service/movieapi/v2/app.go rename to service/movieapiv2/app.go index 517f0c4e..990df16a 100644 --- a/service/movieapi/v2/app.go +++ b/service/movieapiv2/app.go @@ -1,4 +1,4 @@ -package v2 +package movieapiv2 import ( "encoding/json" diff --git a/service/movieapi/v2/movie_info_get_ShowDate.go b/service/movieapiv2/movie_info_get_ShowDate.go similarity index 98% rename from service/movieapi/v2/movie_info_get_ShowDate.go rename to service/movieapiv2/movie_info_get_ShowDate.go index c8144a62..52c55ff3 100644 --- a/service/movieapi/v2/movie_info_get_ShowDate.go +++ b/service/movieapiv2/movie_info_get_ShowDate.go @@ -1,4 +1,4 @@ -package v2 +package movieapiv2 import ( "encoding/json" diff --git a/service/movieapi/v2/movie_info_get_cinema_list.go b/service/movieapiv2/movie_info_get_cinema_list.go similarity index 98% rename from service/movieapi/v2/movie_info_get_cinema_list.go rename to service/movieapiv2/movie_info_get_cinema_list.go index c0fb707d..ff65d361 100644 --- a/service/movieapi/v2/movie_info_get_cinema_list.go +++ b/service/movieapiv2/movie_info_get_cinema_list.go @@ -1,4 +1,4 @@ -package v2 +package movieapiv2 import ( "encoding/json" diff --git a/service/movieapi/v2/movie_info_get_city_area.go b/service/movieapiv2/movie_info_get_city_area.go similarity index 98% rename from service/movieapi/v2/movie_info_get_city_area.go rename to service/movieapiv2/movie_info_get_city_area.go index 05267909..e801a8e1 100644 --- a/service/movieapi/v2/movie_info_get_city_area.go +++ b/service/movieapiv2/movie_info_get_city_area.go @@ -1,4 +1,4 @@ -package v2 +package movieapiv2 import ( "encoding/json" diff --git a/service/movieapi/v2/movie_info_get_city_list.go b/service/movieapiv2/movie_info_get_city_list.go similarity index 97% rename from service/movieapi/v2/movie_info_get_city_list.go rename to service/movieapiv2/movie_info_get_city_list.go index 90b9732e..fe8bc4eb 100644 --- a/service/movieapi/v2/movie_info_get_city_list.go +++ b/service/movieapiv2/movie_info_get_city_list.go @@ -1,4 +1,4 @@ -package v2 +package movieapiv2 import ( "encoding/json" diff --git a/service/movieapi/v2/movie_info_get_hot_list.go b/service/movieapiv2/movie_info_get_hot_list.go similarity index 99% rename from service/movieapi/v2/movie_info_get_hot_list.go rename to service/movieapiv2/movie_info_get_hot_list.go index cbf0e203..dcf8ddff 100644 --- a/service/movieapi/v2/movie_info_get_hot_list.go +++ b/service/movieapiv2/movie_info_get_hot_list.go @@ -1,4 +1,4 @@ -package v2 +package movieapiv2 import ( "encoding/json" diff --git a/service/movieapi/v2/movie_info_get_schedule_list.go b/service/movieapiv2/movie_info_get_schedule_list.go similarity index 99% rename from service/movieapi/v2/movie_info_get_schedule_list.go rename to service/movieapiv2/movie_info_get_schedule_list.go index d3d70df9..92d472f5 100644 --- a/service/movieapi/v2/movie_info_get_schedule_list.go +++ b/service/movieapiv2/movie_info_get_schedule_list.go @@ -1,4 +1,4 @@ -package v2 +package movieapiv2 import ( "encoding/json" diff --git a/service/movieapi/v2/movie_info_get_sea.go b/service/movieapiv2/movie_info_get_sea.go similarity index 98% rename from service/movieapi/v2/movie_info_get_sea.go rename to service/movieapiv2/movie_info_get_sea.go index 3f669198..12f74dff 100644 --- a/service/movieapi/v2/movie_info_get_sea.go +++ b/service/movieapiv2/movie_info_get_sea.go @@ -1,4 +1,4 @@ -package v2 +package movieapiv2 import ( "encoding/json" diff --git a/service/movieapi/v2/movie_info_get_show_list.go b/service/movieapiv2/movie_info_get_show_list.go similarity index 98% rename from service/movieapi/v2/movie_info_get_show_list.go rename to service/movieapiv2/movie_info_get_show_list.go index f5852bc2..38e09764 100644 --- a/service/movieapi/v2/movie_info_get_show_list.go +++ b/service/movieapiv2/movie_info_get_show_list.go @@ -1,4 +1,4 @@ -package v2 +package movieapiv2 import ( "encoding/json" diff --git a/service/movieapi/v2/movie_info_get_soon_list.go b/service/movieapiv2/movie_info_get_soon_list.go similarity index 99% rename from service/movieapi/v2/movie_info_get_soon_list.go rename to service/movieapiv2/movie_info_get_soon_list.go index aef8ddf5..319d1b4b 100644 --- a/service/movieapi/v2/movie_info_get_soon_list.go +++ b/service/movieapiv2/movie_info_get_soon_list.go @@ -1,4 +1,4 @@ -package v2 +package movieapiv2 import ( "encoding/json" diff --git a/service/movieapi/v2/movie_info_get_version.go b/service/movieapiv2/movie_info_get_version.go similarity index 96% rename from service/movieapi/v2/movie_info_get_version.go rename to service/movieapiv2/movie_info_get_version.go index 4e79f178..d2e1a07e 100644 --- a/service/movieapi/v2/movie_info_get_version.go +++ b/service/movieapiv2/movie_info_get_version.go @@ -1,4 +1,4 @@ -package v2 +package movieapiv2 import "encoding/json" diff --git a/service/movieapi/v2/sign.go b/service/movieapiv2/sign.go similarity index 98% rename from service/movieapi/v2/sign.go rename to service/movieapiv2/sign.go index 49b994cd..d00bc3e4 100644 --- a/service/movieapi/v2/sign.go +++ b/service/movieapiv2/sign.go @@ -1,4 +1,4 @@ -package v2 +package movieapiv2 import ( "crypto/md5" diff --git a/service/wechat/pay/v3/.gitignore b/service/wechatpayapiv3/.gitignore similarity index 100% rename from service/wechat/pay/v3/.gitignore rename to service/wechatpayapiv3/.gitignore diff --git a/service/wechat/pay/v3/app.go b/service/wechatpayapiv3/app.go similarity index 98% rename from service/wechat/pay/v3/app.go rename to service/wechatpayapiv3/app.go index e5a146cc..df56d9d6 100644 --- a/service/wechat/pay/v3/app.go +++ b/service/wechatpayapiv3/app.go @@ -1,4 +1,4 @@ -package v3 +package wechatpayapiv3 import ( "bytes" diff --git a/service/wechat/pay/v3/config.go b/service/wechatpayapiv3/config.go similarity index 90% rename from service/wechat/pay/v3/config.go rename to service/wechatpayapiv3/config.go index 25897d46..a6cedabd 100644 --- a/service/wechat/pay/v3/config.go +++ b/service/wechatpayapiv3/config.go @@ -1,4 +1,4 @@ -package v3 +package wechatpayapiv3 // 微信支付 API 地址 const ( diff --git a/service/wechat/pay/v3/pay_transactions_jsapi.go b/service/wechatpayapiv3/pay_transactions_jsapi.go similarity index 99% rename from service/wechat/pay/v3/pay_transactions_jsapi.go rename to service/wechatpayapiv3/pay_transactions_jsapi.go index 4fe0a464..5f1737db 100644 --- a/service/wechat/pay/v3/pay_transactions_jsapi.go +++ b/service/wechatpayapiv3/pay_transactions_jsapi.go @@ -1,4 +1,4 @@ -package v3 +package wechatpayapiv3 import ( "encoding/json" diff --git a/service/wechat/pay/v3/sign.go b/service/wechatpayapiv3/sign.go similarity index 99% rename from service/wechat/pay/v3/sign.go rename to service/wechatpayapiv3/sign.go index c45f3488..1094fd98 100644 --- a/service/wechat/pay/v3/sign.go +++ b/service/wechatpayapiv3/sign.go @@ -1,4 +1,4 @@ -package v3 +package wechatpayapiv3 import ( "crypto"