From b54708aa0292dd21bd9a17d1fb831ef51d5206dd Mon Sep 17 00:00:00 2001
From: hoteas <hoteas@958342c6-dd43-9346-b63c-019703d72853>
Date: Mon, 6 Nov 2017 16:38:03 +0000
Subject: [PATCH]
---
.../hotime/.idea/copyright/profiles_settings.xml | 3 +++
trunk/src/go.hoteas.com/hotime/.idea/goLibraries.xml | 10 ++++++++++
.../go.hoteas.com/hotime/.idea/libraries/Go_SDK.xml | 8 ++++++++
trunk/src/go.hoteas.com/hotime/objtoobj.go | 7 +++++++
4 files changed, 28 insertions(+)
create mode 100644 trunk/src/go.hoteas.com/hotime/.idea/copyright/profiles_settings.xml
create mode 100644 trunk/src/go.hoteas.com/hotime/.idea/goLibraries.xml
create mode 100644 trunk/src/go.hoteas.com/hotime/.idea/libraries/Go_SDK.xml
diff --git a/trunk/src/go.hoteas.com/hotime/.idea/copyright/profiles_settings.xml b/trunk/src/go.hoteas.com/hotime/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000..c7d1c5a
--- /dev/null
+++ b/trunk/src/go.hoteas.com/hotime/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+<component name="CopyrightManager">
+ <settings default="" />
+</component>
\ No newline at end of file
diff --git a/trunk/src/go.hoteas.com/hotime/.idea/goLibraries.xml b/trunk/src/go.hoteas.com/hotime/.idea/goLibraries.xml
new file mode 100644
index 0000000..0ca2371
--- /dev/null
+++ b/trunk/src/go.hoteas.com/hotime/.idea/goLibraries.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="GoLibraries">
+ <option name="urls">
+ <list>
+ <option value="file://$PROJECT_DIR$/../../.." />
+ </list>
+ </option>
+ </component>
+</project>
\ No newline at end of file
diff --git a/trunk/src/go.hoteas.com/hotime/.idea/libraries/Go_SDK.xml b/trunk/src/go.hoteas.com/hotime/.idea/libraries/Go_SDK.xml
new file mode 100644
index 0000000..6552a3b
--- /dev/null
+++ b/trunk/src/go.hoteas.com/hotime/.idea/libraries/Go_SDK.xml
@@ -0,0 +1,8 @@
+<component name="libraryTable">
+ <library name="Go SDK">
+ <CLASSES>
+ <root url="file://D:/app/go/src" />
+ </CLASSES>
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
diff --git a/trunk/src/go.hoteas.com/hotime/objtoobj.go b/trunk/src/go.hoteas.com/hotime/objtoobj.go
index d19aca7..db1f3e2 100644
--- a/trunk/src/go.hoteas.com/hotime/objtoobj.go
+++ b/trunk/src/go.hoteas.com/hotime/objtoobj.go
@@ -21,6 +21,13 @@ func ObjToMap(obj interface{}, e ...*Error) Map {
v = obj.(Map)
case map[string]interface{}:
v = obj.(map[string]interface{})
+ case string:
+ v = Map{}
+ e := json.Unmarshal([]byte(obj.(string)), &v)
+ if e != nil {
+ err = errors.New("没有合适的转换对象！" + e.Error())
+ v = nil
+ }
default:
data, err := json.Marshal(obj)
if err != nil {