From 6b792f94cf01986db10aab51467a5cf350029e53 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 19 Aug 2019 10:43:36 +0800
Subject: [PATCH 1/3] - up

---
 business/jxstore/cms/cms.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go
index 38b14b286..8514c405b 100644
--- a/business/jxstore/cms/cms.go
+++ b/business/jxstore/cms/cms.go
@@ -266,7 +266,9 @@ func DeleteConfig(ctx *jxcontext.Context, key, configType string) (err error) {
 		if err = err2; err == nil && len(userIDs) > 0 {
 			userList, totalCount, err2 := dao.GetUsers(dao.GetDB(), 0, "", userIDs, "", "", 0, -1)
 			if err = err2; err == nil && totalCount > 0 {
-				err = fmt.Errorf("还有人员在使用角色:%s，人员信息:%s", key, utils.MustMarshal(utils.Struct2Map(userList, "compact")))
+				// todo
+				// err = fmt.Errorf("还有人员在使用角色:%s，人员信息:%s", key, utils.MustMarshal(utils.Struct2Map(userList, "compact")))
+				err = fmt.Errorf("还有人员在使用角色:%s，人员信息:%s", key, utils.Format4Output(userList, false))
 			}
 		}
 		errList.AddErr(err)

From a1397d11f9ac7a4df1937b8e7480b9490663bc3d Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 19 Aug 2019 11:00:25 +0800
Subject: [PATCH 2/3] + feie_test.go

---
 business/partner/printer/feie/feie_test.go | 42 ++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/business/partner/printer/feie/feie_test.go b/business/partner/printer/feie/feie_test.go
index e2179a769..03800c3b7 100644
--- a/business/partner/printer/feie/feie_test.go
+++ b/business/partner/printer/feie/feie_test.go
@@ -1 +1,43 @@
 package feie
+
+import (
+	"testing"
+
+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+
+	"git.rosy.net.cn/baseapi/utils"
+
+	"git.rosy.net.cn/jx-callback/business/partner"
+
+	_ "git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
+	_ "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler/defsch"
+	"git.rosy.net.cn/jx-callback/globals/testinit"
+)
+
+func init() {
+	testinit.Init()
+}
+
+func TestGetCityShops(t *testing.T) {
+	orderID := "919864156000342"
+	vendorID := 0
+	order, err := partner.CurOrderManager.LoadOrder(orderID, vendorID)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	context := CurPrinterHandler.getOrderContent(order, "mobile")
+	status, err := CurPrinterHandler.PrintMsg(jxcontext.AdminCtx, "id1", "id2", "title", context)
+	t.Log(utils.Format4Output(status, false))
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestRegisterPrinter(t *testing.T) {
+	newID1, newID2, err := CurPrinterHandler.RegisterPrinter(jxcontext.AdminCtx, "id1", "id2", "title")
+	t.Log(newID1 + "," + newID2)
+	if err != nil {
+		t.Fatal(err)
+	}
+}

From e52718ca2d0259601d58113f01154c047740f7ea Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 19 Aug 2019 11:02:02 +0800
Subject: [PATCH 3/3] =?UTF-8?q?-=20=E6=9B=B4=E6=96=B0beta=E4=BA=AC?=
 =?UTF-8?q?=E4=B8=9C=E7=9A=84token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/app.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/app.conf b/conf/app.conf
index 691989212..c5eb2bd6e 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -283,7 +283,7 @@ enableElmStoreWrite = false
 enableMtwmStoreWrite = false
 enableWscStoreWrite = false
 
-jdToken  = "ccb10daf-e6f5-4a58-ada5-b97f9073a137"
+jdToken  = "77e703b7-7997-441b-a12a-2e522efb117a"
 jdAppKey = "1dba76d40cac446ca500c0391a0b6c9d"
 jdSecret = "a88d031a1e7b462cb1579f12e97fe7f4"