代码提交

.idea/workspace.xml

@@ -1,7 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="b2adb873-ba08-458c-9357-4c6584e112eb" name="Default" comment="" />
+    <list default="true" id="b2adb873-ba08-458c-9357-4c6584e112eb" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/conf/app.conf" beforeDir="false" afterPath="$PROJECT_DIR$/conf/app.conf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/controllers/global/open_wechat_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/global/open_wechat_controller.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/controllers/members/members_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/members/members_controller.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/controllers/mpwechat/menu_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/mpwechat/menu_controller.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/controllers/mpwechat/mpwechat_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/mpwechat/mpwechat_controller.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/controllers/site/site_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/site/site_controller.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jobcron/open_wechat_job.go" beforeDir="false" afterPath="$PROJECT_DIR$/jobcron/open_wechat_job.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/models/activity_models.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/activity_models.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/models/site_models.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/site_models.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/models/user_customer_models.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/user_customer_models.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/routers/router.go" beforeDir="false" afterPath="$PROJECT_DIR$/routers/router.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/service/member_service/member_service.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/member_service/member_service.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/service/redis.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/redis.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/service/site_service/site_microwebsite_service.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/site_service/site_microwebsite_service.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/service/wechat_service/open_wechat_service.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/wechat_service/open_wechat_service.go" afterDir="false" />
+    </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -11,26 +28,103 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="router.go" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/routers/router.go">
+      <file leaf-file-name="app.conf" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/conf/app.conf">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="132">
-              <caret line="22" column="59" selection-start-line="22" selection-start-column="43" selection-end-line="22" selection-end-column="59" />
+            <state relative-caret-position="44">
+              <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="app.conf" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/conf/app.conf">
+      <file leaf-file-name="site_controller.go" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/controllers/site/site_controller.go">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-4633">
+              <caret line="4055" column="55" selection-start-line="4055" selection-start-column="37" selection-end-line="4055" selection-end-column="55" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="site_microwebsite_service.go" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/service/site_service/site_microwebsite_service.go">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="108">
+              <caret line="766" column="5" selection-start-line="766" selection-start-column="5" selection-end-line="766" selection-end-column="5" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="activity_models.go" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/models/activity_models.go">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="660">
+              <caret line="30" column="95" selection-start-line="30" selection-start-column="95" selection-end-line="30" selection-end-column="95" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="micro_service.go" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/service/micro_service/micro_service.go">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="156">
+              <caret line="50" column="26" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="26" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="micro_controller.go" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/controllers/micro/micro_controller.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="241">
-              <caret line="121" lean-forward="true" selection-start-line="81" selection-end-line="121" />
+            <state relative-caret-position="172">
+              <caret line="187" column="42" selection-start-line="187" selection-start-column="42" selection-end-line="187" selection-end-column="42" />
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Go Application" />
+      </list>
+    </option>
+  </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>SaveNavigation</find>
+      <find>GetNavigationset</find>
+      <find>/api/staff/getAllStaffInfo</find>
+      <find>GetAllStaffInfo</find>
+      <find>/api/site/getordermodel</find>
+      <find>GetOrderModel</find>
+      <find>GetOrderData</find>
+      <find>GetAllConnecway</find>
+      <find>AddMagiclinkData</find>
+      <find>GetDatatwo</find>
+      <find>AddArticelist</find>
+      <find>GetDoctorDetail</find>
+      <find>GetDoctorInfo</find>
+      <find>GetActivitiesListDetail</find>
+      <find>limit</find>
+      <find>GetAllActivities</find>
+      <find>DeleteRotations</find>
+      <find>DeleteSingleImages</find>
+      <find>magiclink</find>
+      <find>UpdateLinkAddress</find>
+      <find>UpdateEditMacForm</find>
+      <find>AddMacLinkAddress</find>
+      <find>GetLikeMacAddressById</find>
+      <find>GetActivities</find>
+      <find>/api/site/getactivities</find>
+      <find>GetArticlistDetail</find>
+      <find>GetArticlelist</find>
+      <find>GetAllArticles</find>
+      <find>GetActivitesDetail</find>
+      <find>webim登录成功</find>
+    </findStrings>
+  </component>
   <component name="GOROOT" path="C:\Go" />
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -38,8 +132,29 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/conf/app.conf" />
+        <option value="$PROJECT_DIR$/controllers/Micro/micro_controller.go" />
+        <option value="$PROJECT_DIR$/controllers/Micro/router_collector.go" />
+        <option value="$PROJECT_DIR$/controllers/base_controller.go" />
+        <option value="$PROJECT_DIR$/controllers/mpwechat/mpwechat_controller.go" />
+        <option value="$PROJECT_DIR$/../github.com/go-redis/redis/commands.go" />
+        <option value="$PROJECT_DIR$/service/redis.go" />
+        <option value="$PROJECT_DIR$/jobcron/open_wechat_job.go" />
+        <option value="$PROJECT_DIR$/controllers/global/open_wechat_controller.go" />
+        <option value="$PROJECT_DIR$/service/article_service/article_category_service.go" />
+        <option value="$PROJECT_DIR$/controllers/micro/router_collector.go" />
+        <option value="$PROJECT_DIR$/controllers/members/members_controller.go" />
+        <option value="$PROJECT_DIR$/models/user_customer_models.go" />
+        <option value="$PROJECT_DIR$/service/member_service/member_service.go" />
+        <option value="$PROJECT_DIR$/models/site_models.go" />
         <option value="$PROJECT_DIR$/routers/router.go" />
+        <option value="$PROJECT_DIR$/controllers/mpwechat/menu_controller.go" />
+        <option value="$PROJECT_DIR$/service/wechat_service/open_wechat_service.go" />
+        <option value="$PROJECT_DIR$/models/activity_models.go" />
+        <option value="$PROJECT_DIR$/controllers/site/site_controller.go" />
+        <option value="$PROJECT_DIR$/service/site_service/site_microwebsite_service.go" />
+        <option value="$PROJECT_DIR$/service/micro_service/micro_service.go" />
+        <option value="$PROJECT_DIR$/controllers/micro/micro_controller.go" />
+        <option value="$PROJECT_DIR$/conf/app.conf" />
       </list>
     </option>
   </component>
@@ -50,9 +165,8 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="16" />
-    <option name="y" value="305" />
-    <option name="width" value="1874" />
+    <option name="x" value="525" />
+    <option name="width" value="1230" />
     <option name="height" value="1040" />
   </component>
   <component name="ProjectView">
@@ -75,7 +189,35 @@
             <path>
               <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
               <item name="SCRM" type="462c0819:PsiDirectoryNode" />
-              <item name="routers" type="462c0819:PsiDirectoryNode" />
+              <item name="controllers" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
+              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
+              <item name="controllers" type="462c0819:PsiDirectoryNode" />
+              <item name="micro" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
+              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
+              <item name="controllers" type="462c0819:PsiDirectoryNode" />
+              <item name="site" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
+              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
+              <item name="models" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
+              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
+              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+              <item name="micro_service" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -85,6 +227,7 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
+    <property name="DefaultGoTemplateProperty" value="Go Application" />
     <property name="configurable.Global.GOPATH.is.expanded" value="true" />
     <property name="configurable.Project.GOPATH.is.expanded" value="true" />
     <property name="go.gopath.indexing.explicitly.defined" value="true" />
@@ -94,6 +237,11 @@
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="com.goide.configuration.GoLibrariesConfigurableProvider" />
   </component>
+  <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\goyard\src\SCRM\service\article_service" />
+    </key>
+  </component>
   <component name="RunDashboard">
     <option name="ruleStates">
       <list>
@@ -108,17 +256,17 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26340482" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.81006867" visible="true" weight="0.33981234" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.22319035" side_tool="true" visible="true" weight="0.4550642" />
       <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="7" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="9" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.43081313" />
+      <window_info id="Structure" order="1" sideWeight="0.18993135" side_tool="true" weight="0.288874" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.77680963" visible="true" weight="0.4550642" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -127,7 +275,6 @@
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Find" order="1" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -136,7 +283,68 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <option name="time" value="1" />
+    </breakpoint-manager>
+  </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/routers/router.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="30" column="32" selection-start-line="30" selection-start-column="32" selection-end-line="30" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/conf/app.conf">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2596">
+          <caret line="118" column="16" selection-start-line="118" selection-start-column="16" selection-end-line="118" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/routers/router.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="30" column="32" selection-start-line="30" selection-start-column="32" selection-end-line="30" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/conf/app.conf">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2596">
+          <caret line="118" column="16" selection-start-line="118" selection-start-column="16" selection-end-line="118" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/routers/router.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="30" column="32" selection-start-line="30" selection-start-column="32" selection-end-line="30" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/conf/app.conf">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2596">
+          <caret line="118" column="16" selection-start-line="118" selection-start-column="16" selection-end-line="118" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/routers/router.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="22" column="59" selection-start-line="22" selection-start-column="43" selection-end-line="22" selection-end-column="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/conf/app.conf">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2662">
+          <caret line="121" lean-forward="true" selection-start-line="81" selection-end-line="121" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/routers/router.go">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="132">
@@ -179,17 +387,260 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/routers/router.go">
+    <entry file="file://$PROJECT_DIR$/controllers/members/router_controller.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="20" selection-start-line="2" selection-start-column="5" selection-end-line="2" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/controllers/mpwechat/reply_controller.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="59">
+          <caret line="16" column="5" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/controllers/mpwechat/material_controller.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="59">
+          <caret line="20" column="5" selection-start-line="20" selection-start-column="5" selection-end-line="20" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/controllers/mpwechat/router_controller.go">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="132">
-          <caret line="22" column="59" selection-start-line="22" selection-start-column="43" selection-end-line="22" selection-end-column="59" />
+          <caret line="6" column="30" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/service/wechat_service/open_wechat_model.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="17" column="5" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/utils/tools.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="244" column="5" selection-start-line="244" selection-start-column="5" selection-end-line="244" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/service/redis.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="336">
+          <caret line="18" column="26" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../github.com/go-redis/redis/command.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="577" column="22" selection-start-line="577" selection-start-column="22" selection-end-line="577" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../github.com/go-redis/redis/commands.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="164">
+          <caret line="753" column="18" selection-start-line="753" selection-start-column="18" selection-end-line="753" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/controllers/mpwechat/mpwechat_controller.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="13" column="95" selection-start-line="13" selection-start-column="82" selection-end-line="13" selection-end-column="95" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/service/article_service/article_category_service.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-797">
+          <caret line="192" column="10" selection-start-line="192" selection-start-column="10" selection-end-line="192" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/controllers/global/open_wechat_controller.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="23">
+          <caret line="38" column="49" selection-start-line="38" selection-start-column="30" selection-end-line="38" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/jobcron/open_wechat_job.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="64">
+          <caret line="109" column="68" selection-start-line="109" selection-start-column="47" selection-end-line="109" selection-end-column="68" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/controllers/article/article_controller.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-792" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/service/db.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1122">
+          <caret line="57" selection-start-line="57" selection-end-line="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/service/admin_service/verify_login_token_service.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="20" column="75" selection-start-line="20" selection-start-column="61" selection-end-line="20" selection-end-column="75" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/controllers/micro/router_collector.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="24" selection-start-line="2" selection-start-column="24" selection-end-line="2" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/controllers/base_controller.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-317">
+          <caret line="8" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/controllers/site/router_collector.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="3" column="15" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/controllers/base_api_controller.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="137">
+          <caret line="8" column="5" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/service/member_service/models.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="7" column="23" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/controllers/members/members_controller.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="7" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/models/user_customer_models.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="17" selection-start-line="2" selection-start-column="5" selection-end-line="2" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/service/member_service/member_service.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="187" selection-start-line="187" selection-end-line="187" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/service/wechat_service/open_wechat_service.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="463" column="22" selection-start-line="463" selection-start-column="5" selection-end-line="463" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/controllers/mpwechat/menu_controller.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="185">
+          <caret line="219" column="42" selection-start-line="219" selection-start-column="25" selection-end-line="219" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/controllers/staff/staff_controller.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1746">
+          <caret line="141" column="62" selection-start-line="141" selection-start-column="47" selection-end-line="141" selection-end-column="62" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/service/staff_service/staff_manager_service.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="15" column="17" selection-start-line="15" selection-start-column="10" selection-end-line="15" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/routers/router.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="33" column="28" selection-start-line="33" selection-start-column="28" selection-end-line="33" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/models/article_models.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="50" column="11" selection-start-line="50" selection-start-column="4" selection-end-line="50" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/models/site_models.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5874">
+          <caret line="267" column="67" selection-start-line="267" selection-start-column="4" selection-end-line="267" selection-end-column="67" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/models/activity_models.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="660">
+          <caret line="30" column="95" selection-start-line="30" selection-start-column="95" selection-end-line="30" selection-end-column="95" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/service/site_service/site_microwebsite_service.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="108">
+          <caret line="766" column="5" selection-start-line="766" selection-start-column="5" selection-end-line="766" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/controllers/site/site_controller.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-4633">
+          <caret line="4055" column="55" selection-start-line="4055" selection-start-column="37" selection-end-line="4055" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/service/micro_service/micro_service.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="156">
+          <caret line="50" column="26" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/controllers/micro/micro_controller.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="172">
+          <caret line="187" column="42" selection-start-line="187" selection-start-column="42" selection-end-line="187" selection-end-column="42" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/conf/app.conf">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="241">
-          <caret line="121" lean-forward="true" selection-start-line="81" selection-end-line="121" />
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
         </state>
       </provider>
     </entry>

conf/app.conf

@@ -39,8 +39,8 @@ key = "e4SHrkiZu0pQEwVoGBapDBTf9N1Q6MxV"
 appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 [prod]
-httpdomain = http://api.jk.kuyicloud.com
-sso_domain = http://sso.kuyicloud.com
+httpdomain = http://api.scrm.kuyicloud.com
+sso_domain = https://sso.kuyicloud.com
 front_end_domain = "http://jk.kuyicloud.com/#"
 
 openwechattoken = dwqofqon2e12en2o

controllers/global/open_wechat_controller.go

@@ -264,6 +264,7 @@ func (c *OpenWechatAPIController) Authorization() {
 	}
 
 	code, err := wechat_service.GetReqPreAuthCode()
+	fmt.Println("code是什么",code,"错误",err)
 	if err != nil {
 		c.ServeFailJsonSend(enums.ErrorCodeDataException, "获取授权URL失败:（"+err.Error()+"）")
 		return
@@ -271,7 +272,7 @@ func (c *OpenWechatAPIController) Authorization() {
 
 	uri := fmt.Sprintf(beego.AppConfig.String("httpdomain")+"/openwechat/mp/authorizerinfo/%d/%d/%s", id, vtime, vcode)
 	url := "https://mp.weixin.qq.com/safe/bindcomponent?action=bindcomponent&auth_type=1&no_scan=1&component_appid=" + beego.AppConfig.String("openwechatappid") + "&pre_auth_code=" + code + "&redirect_uri=" + uri + "&auth_type=1#wechat_redirect"
-
+     fmt.Println("url是设么东西",url)
 	c.Data["url"] = url
 	c.TplName = "openwechat/authorization.html"
 

controllers/members/members_controller.go

@@ -112,6 +112,8 @@ func (c *MembersAPIController) GetAllMembers() {
 
 	adminUserInfo := c.GetAdminUserInfo()
 	members, err := member_service.GetAllMemberList(adminUserInfo.CurrentOrgId)
+	fmt.Println("members是什么",members)
+	fmt.Println("资讯管理错误是什么",err)
 	if err != nil {
 		c.ServeFailJsonSend(enums.ErrorCodeDataException, "获取列表失败")
 		return

controllers/micro/micro_controller.go

@@ -0,0 +1,283 @@
+package micro
+
+import (
+	"SCRM/service/micro_service"
+	"fmt"
+	"github.com/astaxie/beego"
+	"SCRM/enums"
+)
+
+func microRouters(){
+	beego.Router("/api/site/getdata",&Micro{},"Get:GetData")
+	beego.Router("/api/site/getdatatwo",&Micro{},"Get:GetDatatwo")
+	beego.Router("/api/site/getdatathree",&Micro{},"Get:GetOfficeDetail")
+	beego.Router("/api/site/getdatafour",&Micro{},"Get:GetDoctorDetail")
+	beego.Router("/api/site/getdatafive",&Micro{},"Get:GetOfficEnviromentDetail")
+	beego.Router("/api/site/getarticlelist",&Micro{},"Get:GetArticlelist")
+	beego.Router("/api/site/getactivities",&Micro{},"Get:GetActivities")
+	beego.Router("/api/site/getdatasix",&Micro{},"Get:GetArticlistDetail")
+	beego.Router("/api/site/getdataseven",&Micro{},"Get:GetActivitesDetail")
+	beego.Router("/api/site/getdefalutnavigationdata",&Micro{},"Get:GetDefalutNavigationData")
+	beego.Router("/api/site/getdataeight",&Micro{},"Get:GetOrderData")
+	beego.Router("/api/site/getdatanight",&Micro{},"Get:GetContactWay")
+	beego.Router("/api/site/singleactivitinfo",&Micro{},"Get:GetActivitDetail")
+	beego.Router("/api/site/singlearticleinfo",&Micro{},"Get:GetArticlesDetail")
+   beego.Router("/api/site/singledoctorinfo",&Micro{},"Get:GetDoctorInfo")
+
+}
+
+type Micro struct {
+     beego.Controller
+     //controllers.BaseAPIController
+}
+func (this *Micro) ServeFailJsonSend(code int, msg string) {
+	this.Data["json"] = enums.MakeFailResponseJSON(msg, code)
+	this.ServeJSON()
+}
+
+func (this *Micro) ServeSuccessJSON(data map[string]interface{}) {
+	this.Data["json"] = enums.MakeSuccessResponseJSON(data)
+	this.ServeJSON()
+}
+
+
+func (this *Micro) GetData(){
+	orgid, _ := this.GetInt64("orgid")
+	fmt.Println("小明id",orgid)
+	model, err := micro_service.GetData(orgid)
+	fmt.Println("model是什么",model)
+	fmt.Println("err",err)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patientModels":model,
+	})
+}
+
+func (this *Micro) GetDatatwo()  {
+	fmt.Println("获取医院详情")
+	id, err := this.GetInt64("id")
+	fmt.Println(err)
+	fmt.Println("id是什么",id)
+	orgid, _ := this.GetInt64("orgid")
+	fmt.Println("机构id",orgid)
+	hospital, err := micro_service.QueryHispitalDetail(orgid, id)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
+		 return
+		 }
+		 this.ServeSuccessJSON(map[string]interface{}{
+		 	"hospital":hospital,
+		 })
+}
+
+func (this *Micro) GetOfficeDetail()  {
+	id, err := this.GetInt64("id")
+	fmt.Println(err)
+	fmt.Println("id是什么",id)
+	orgid, _ := this.GetInt64("orgid")
+	fmt.Println("机构id",orgid)
+	offices, err := micro_service.GetOfficeDetail(orgid, id)
+		if err !=nil{
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"offices":offices,
+		})
+
+}
+
+func (this *Micro) GetDoctorDetail()  {
+	id, err := this.GetInt64("id")
+	fmt.Println(err)
+	fmt.Println("id是什么",id)
+	orgid, _ := this.GetInt64("orgid")
+	fmt.Println("机构id",orgid)
+	editdoctor, err := micro_service.GetDoctorDetail(orgid, id)
+		if err !=nil{
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"editdoctor":editdoctor,
+		})
+
+}
+
+func (this *Micro) GetOfficEnviromentDetail()  {
+	id, err := this.GetInt64("id")
+	fmt.Println(err)
+	fmt.Println("id是什么",id)
+	orgid, _ := this.GetInt64("orgid")
+	fmt.Println("机构id",orgid)
+	offenvironment, err := micro_service.GetOfficEnviromentDetail(orgid, id)
+	fmt.Println("错误",err)
+	fmt.Println("offenvironment",offenvironment)
+	if err !=nil{
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"offenvironment":offenvironment,
+		})
+}
+
+func (this *Micro) GetArticlelist()  {
+	//adminUserInfo := this.GetAdminUserInfo()
+	//userOrgID := int64(adminUserInfo.CurrentOrgId)
+	//fmt.Println("机构id",userOrgID)
+	orgid, _ := this.GetInt64("orgid")
+	//micro_service.GetArticlelistlimit(orgid)
+	articlelist, err := micro_service.GetlastLimit(orgid)
+	articlelists, err := micro_service.GetAllArticeList(orgid,articlelist.Number)
+	fmt.Println("文章列表",articlelists)
+	fmt.Println("错误",err)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"articlelists":articlelists,
+	})
+}
+
+func (this *Micro) GetActivities()  {
+	orgid, _ := this.GetInt64("orgid")
+	fmt.Println("活动id",orgid)
+	//addactivity, err := micro_service.GetActivitiesById(orgid)
+	addactivity, err := micro_service.GetLastActivitiesLast(orgid)
+	activity, err := micro_service.GetAllActivities(orgid,addactivity.Number)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"activity":activity,
+	})
+}
+
+func (this *Micro) GetArticlistDetail()  {
+	id, _ := this.GetInt64("id")
+	fmt.Println("id是设么",id)
+	orgid, _ := this.GetInt64("orgid")
+	fmt.Println("文章id",orgid)
+	articlelist, err := micro_service.GetArticlelistById(id, orgid)
+	fmt.Println(articlelist,err)
+	//fmt.Println(err)
+	articlelists, err := micro_service.GetAllArticles(orgid, articlelist.Number)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"articlelists":articlelists,
+	})
+}
+
+func (this *Micro) GetActivitesDetail()  {
+	id, _ := this.GetInt64("id")
+	fmt.Println("id是设么",id)
+	orgid, _ := this.GetInt64("orgid")
+	fmt.Println("活动id",orgid)
+	//addactivity, err := micro_service.GetAllActivitiById(id, orgid)
+	//	fmt.Println("err",err)
+	addactivity, err := micro_service.GetLastActivitiesLast(orgid)
+	activity, err := micro_service.GetAllActivities(orgid,addactivity.Number)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"activity":activity,
+	})
+}
+
+
+func (this *Micro) GetDefalutNavigationData()  {
+	orgid, _ := this.GetInt64("orgid")
+	fmt.Println("活动id",orgid)
+	navigation, err := micro_service.GetDefalutNavigationData(orgid)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"navigation":navigation,
+	})
+}
+
+
+func (this *Micro) GetOrderData(){
+	orgid, _ := this.GetInt64("orgid")
+	fmt.Println("活动id",orgid)
+	ordmodel, err := micro_service.GetOrederModel(orgid)
+	fmt.Println("ordemodel是社没什么",ordmodel)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"ordmodel":ordmodel,
+	})
+}
+
+func  (this *Micro) GetContactWay(){
+	orgid, _ := this.GetInt64("orgid")
+	fmt.Println("联系方式id",orgid)
+	connect, err := micro_service.GetAllConnecway(orgid)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"connect":connect,
+	})
+}
+
+func  (this *Micro) GetActivitDetail()  {
+	id, _ := this.GetInt64("id")
+	fmt.Println("活动id",id)
+	orgid, _ := this.GetInt64("orgid")
+	fmt.Println("机构id",orgid)
+	activity, err := micro_service.GetActivitDetail(id, orgid)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"activity":activity,
+	})
+}
+
+func  (this *Micro) GetArticlesDetail()  {
+	id, _ := this.GetInt64("id")
+	fmt.Println("文章id",id)
+	orgid, _ := this.GetInt64("orgid")
+	fmt.Println("机构id",orgid)
+	articles, err := micro_service.GetArticlesDetail(id, orgid)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"articles":articles,
+	})
+}
+
+func (this *Micro) GetDoctorInfo()  {
+	id, _ := this.GetInt64("id")
+	fmt.Println("医生id",id)
+	orgid, _ := this.GetInt64("orgid")
+	fmt.Println("机构id",orgid)
+	editdoctor, err := micro_service.GetDoctorInfo(id, orgid)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"editdoctor":editdoctor,
+	})
+}

controllers/micro/router_collector.go

@@ -0,0 +1,5 @@
+package micro
+
+func RegisterRouters() {
+	microRouters()
+}

controllers/mpwechat/menu_controller.go

@@ -10,6 +10,7 @@ import (
 	"encoding/json"
 
 	"github.com/astaxie/beego"
+	"fmt"
 )
 
 func MpMenusCtlRegistRouters() {
@@ -107,6 +108,8 @@ func (c *MpMenusAPIController) GetMenus() {
 func (c *MpMenusAPIController) SaveMenus() {
 	adminUserInfo := c.GetAdminUserInfo()
 	authorization, err := wechat_service.GetAuthorizationByOrgID(adminUserInfo.CurrentOrgId)
+	fmt.Println("authorization是什么",authorization)
+	fmt.Println("错误",err)
 	if err != nil {
 		c.ServeFailJsonSend(enums.ErrorCodeDataException, "保存菜单失败:（"+err.Error()+"）")
 		return
@@ -215,6 +218,7 @@ func (c *MpMenusAPIController) SaveMenus() {
 		return
 	}
 	err = wechat_service.SendMpWechatMenus(authorization.AuthorizerAccessToken, buttonFileds)
+	fmt.Println("公众号错误是什么",err)
 	if err != nil {
 		c.ServeFailJsonSend(enums.ErrorCodeDBUpdate, "保存菜单成功，但发布菜单到公众号失败:（"+err.Error()+"）")
 		return

controllers/mpwechat/mpwechat_controller.go

@@ -42,6 +42,7 @@ func (c *MpWechatAPIController) GetAuthUrl() {
 	adminUserInfo := c.GetAdminUserInfo()
 
 	vcode, vtime := utils.GetOrgIdCode(adminUserInfo.CurrentOrgId, 0)
+
 	url := fmt.Sprintf("%s%s?id=%d&vcode=%s&vtime=%d", beego.AppConfig.String("httpdomain"), "/openwechat/mp/authorization", adminUserInfo.CurrentOrgId, vtime, vcode)
 
 	returnData := make(map[string]interface{}, 0)

jobcron/open_wechat_job.go

@@ -101,6 +101,7 @@ func RequestComponentAccessToken() {
 	}
 
 	err = redisClient.Set("sgj_patient:component_access_token", access_token.ComponentAccessToken, time.Second*7000).Err()
+	fmt.Println("err错误是哦",err)
 	if err != nil {
 		utils.ErrorLog("redis set failed：%s", err)
 		return

models/activity_models.go

@@ -24,7 +24,7 @@ type Activity struct {
 	IsRecommend      int8   `gorm:"column:is_recommend;" json:"is_recommend"`            // 0:未推荐;1:已推荐
 	CreateTime       int64  `gorm:"column:ctime" json:"-"`                               // 创建时间
 	ModifyTime       int64  `gorm:"column:mtime" json:"-"`                               // 修改时间
-	UserOrgId        int64  `gorm:"column:user_org_id" json:"-"`                         // 所属发布机构 ID
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	UserAppId        int64  `gorm:"column:user_app_id" json:"-"`                         // 所属发布应用 ID
 	CommentNum       int    `gorm:"column:comment_num;" json:"comment_num"`              // 评论数
 	StarNum          int    `gorm:"column:star_num" json:"star_num"`                     // 点赞书

models/site_models.go

@@ -28,11 +28,11 @@ type SgjPatientModel struct {
 	ModeType int64 `gorm:"column:mode_type" json:"mode_type" form:"mode_type"`
 	Hospitals     SgjPatientHospital `gorm:"ForeignKey:Modleid"`
 	Offices     SgjPatientOffices `gorm:"ForeignKey:Modleid"`
-	Doctors     SgjPatientDocinfo `gorm:"ForeignKey:Modelid"`
+	//Doctors     SgjPatientDocinfo `gorm:"ForeignKey:Modelid"`
 	OfficeEnviroment   SgjPatientOffenvironment  `gorm:"ForeignKey:Modelid"`
 	Editdoctor   []SgjPatientEditdoctor  `gorm:"ForeignKey:Modleid"`
-	Rotation     SgjPatientRotation  `gorm:"ForeignKey:ModelId"`
-	Macnavigation  SgjPatientMacnavigation `gorm:"ForeignKey:Modeid"`
+	//Rotation     SgjPatientRotation  `gorm:"ForeignKey:ModelId"`
+	//Macnavigation  SgjPatientMacnavigation `gorm:"ForeignKey:Modeid"`
 	Addactivity  SgjPatientAddactivity `gorm:"ForeignKey:Modeid"`
 	Articlelist  SgjPatientArticlelist `gorm:"ForeignKey:Modeid"`
 	Editmargin  []SgjPatientEditmargin `gorm:"ForeignKey:Modeid"`
@@ -131,6 +131,7 @@ type SgjPatientEditdoctor struct {
 	Status int64 `gorm:"column:status" json:"status" form:"status"`
 	DocName string `gorm:"column:doc_name" json:"doc_name" form:"doc_name"`
 	Modleid int64 `gorm:"column:modleid" json:"modleid" form:"modleid"`
+	ImgShow int64 `gorm:"column:img_show" json:"img_show" form:"img_show"`
 }
 
 func (SgjPatientEditdoctor) TableName() string  {
@@ -374,6 +375,8 @@ type SgjPatientEditpiclink struct {
 	Linkid int64 `gorm:"column:linkid" json:"linkid" form:"linkid"`
 }
 
+
+
 func (SgjPatientEditpiclink) TableName() string  {
 
 	return "sgj_patient_editpiclink"

models/user_customer_models.go

@@ -1,33 +1,33 @@
 package models
 
 type UserCustomer struct {
-	ID              int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId       int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	UserId          int64  `gorm:"column:user_id" json:"user_id" form:"user_id"`
-	Mobile          string `gorm:"column:mobile" json:"mobile" form:"mobile"`
-	Name            string `gorm:"column:name" json:"name" form:"name"`
-	Gender          int64  `gorm:"column:gender" json:"gender" form:"gender"`
-	ProvinceId      int64  `gorm:"column:province_id" json:"province_id" form:"province_id"`
-	CityId          int64  `gorm:"column:city_id" json:"city_id" form:"city_id"`
-	Address         string `gorm:"column:address" json:"address" form:"address"`
-	Birthday        int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
-	TreatType       int64  `gorm:"column:treat_type" json:"treat_type" form:"treat_type"`
-	Relationship    int64  `gorm:"column:relationship" json:"relationship" form:"relationship"`
-	IllnessId       int64  `gorm:"column:illness_id" json:"illness_id" form:"illness_id"`
-	WechatOpenid    string `gorm:"column:wechat_openid" json:"wechat_openid" form:"wechat_openid"`
-	Membership      int64  `gorm:"column:membership" json:"membership" form:"membership"`
-	Sources         int64  `gorm:"column:sources" json:"sources" form:"sources"`
-	Status          int64  `gorm:"column:status" json:"status" form:"status"`
-	CreatedTime     int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdatedTime     int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
-	Avatar          string `gorm:"column:avatar" json:"avatar" form:"avatar"`
-	WechatUnionid   string `gorm:"column:wechat_unionid" json:"wechat_unionid" form:"wechat_unionid"`
-	Remark          string `gorm:"column:remark" json:"remark" form:"remark"`
+	ID int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	UserId int64 `gorm:"column:user_id" json:"user_id" form:"user_id"`
+	Mobile string `gorm:"column:mobile" json:"mobile" form:"mobile"`
+	Name string `gorm:"column:name" json:"name" form:"name"`
+	Gender int64 `gorm:"column:gender" json:"gender" form:"gender"`
+	ProvinceId int64 `gorm:"column:province_id" json:"province_id" form:"province_id"`
+	CityId int64 `gorm:"column:city_id" json:"city_id" form:"city_id"`
+	Address string `gorm:"column:address" json:"address" form:"address"`
+	Birthday int64 `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	TreatType int64 `gorm:"column:treat_type" json:"treat_type" form:"treat_type"`
+	Relationship int64 `gorm:"column:relationship" json:"relationship" form:"relationship"`
+	IllnessId int64 `gorm:"column:illness_id" json:"illness_id" form:"illness_id"`
+	WechatOpenid string `gorm:"column:wechat_openid" json:"wechat_openid" form:"wechat_openid"`
+	Membership int64 `gorm:"column:membership" json:"membership" form:"membership"`
+	Sources int64 `gorm:"column:sources" json:"sources" form:"sources"`
+	Status int64 `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	Avatar string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	WechatUnionid string `gorm:"column:wechat_unionid" json:"wechat_unionid" form:"wechat_unionid"`
+	Remark string `gorm:"column:remark" json:"remark" form:"remark"`
 	MedicalDiagnose string `gorm:"column:medical_diagnose" json:"medical_diagnose" form:"medical_diagnose"`
-	YzUid           int64  `gorm:"column:yz_uid" json:"yz_uid" form:"yz_uid"`
-	Tttime          int64  `gorm:"column:tttime" json:"tttime" form:"tttime"`
-	IllDate         int64  `gorm:"column:ill_date" json:"ill_date" form:"ill_date"`
-	DistrictId      int64  `gorm:"column:district_id" json:"district_id" form:"district_id"`
+	YzUid int64 `gorm:"column:yz_uid" json:"yz_uid" form:"yz_uid"`
+	Tttime int64 `gorm:"column:tttime" json:"tttime" form:"tttime"`
+	IllDate int64 `gorm:"column:ill_date" json:"ill_date" form:"ill_date"`
+	DistrictId int64 `gorm:"column:district_id" json:"district_id" form:"district_id"`
 }
 
 func (UserCustomer) TableName() string {

routers/router.go

@@ -16,17 +16,21 @@ import (
 	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/plugins/cors"
 	"SCRM/controllers/site"
+	"SCRM/controllers/micro"
+	"github.com/astaxie/beego/context"
 )
 
 func init() {
 	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
-		AllowOrigins:     []string{"http://jk.kuyicloud.com", "http://localhost:8090", "http://test1.sgjyun.com", "https://www.ucpaas.com"},
+		AllowOrigins:     []string{"http://jk.kuyicloud.com", "http://localhost:8090","http://localhost:8091", "http://test1.sgjyun.com", "https://www.ucpaas.com","http://microweb.kuyicloud.com"},
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
 		AllowHeaders:     []string{"Origin", "Authorization", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},
 		ExposeHeaders:    []string{"Content-Length", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},
 		AllowCredentials: true,
 	}))
-
+	beego.Get("/MP_verify_JiWyx0d2U4nzjGX5.txt", func(ctx *context.Context) {
+		ctx.Output.Body([]byte("JiWyx0d2U4nzjGX5"))
+	})
 	global.RegisterRouters()
 	admin_user.RegisterRouters()
 	login.RegisterRouters()
@@ -39,4 +43,5 @@ func init() {
 	staff.RegisterRouters()
 	kefu.RegisterRouters()
 	site.RegisterRouters()
+	micro.RegisterRouters()
 }

service/member_service/member_service.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/jinzhu/gorm"
+	"fmt"
 )
 
 func GetMemberList(orgID, page, limit, level, source, tag, startTime, endTime int64, isStartTime, isEndTime bool, searchKey string) (members []*Members, total int64, err error) {
@@ -187,6 +188,7 @@ func GetAllMemberList(orgID int64) (members []*Members, err error) {
 
 	err = db.Order("c.created_time desc").
 		Select("c.id, c.user_org_id, c.user_id, c.mobile, c.name, c.gender, c.province_id, c.city_id, c.address, c.birthday, c.treat_type, c.relationship, c.illness_id, c.wechat_openid, c.membership, c.sources, c.status, c.created_time, c.updated_time, c.avatar, c.wechat_unionid, c.remark, c.medical_diagnose, c.yz_uid, c.ill_date, c.district_id").Find(&members).Error
+    fmt.Println("错误是什么",err)
 	if err != nil {
 		return
 	}

service/micro_service/micro_service.go

@@ -0,0 +1,143 @@
+package micro_service
+
+import (
+	"SCRM/models"
+	"SCRM/service"
+	"fmt"
+)
+
+func GetData(orgid int64)(model []*models.SgjPatientModel,err error)  {
+	db := service.PatientReadDB().Table("sgj_patient_model as m").Where(" m.status = ?", 1)
+	fmt.Println("db是什么?",db)
+	if(orgid > 0){
+		db = db.Where("user_org_id = ? ", orgid)
+	}
+	err = db.Preload("Hospitals").Preload("Offices").Preload("OfficeEnviroment").
+		Preload("Editdoctor").Preload("Editmargin").Preload("Enviroimages").Preload("PatientEditpiclink").
+		Select("m.id,m.title,m.sort,m.ctime,m.mtime,m.user_org_id,m.status,m.mode_type").Order("sort").Find(&model).Error
+	return
+}
+
+func GetArticlelist(orgid int64)(models.SgjPatientArticlelist,error)  {
+	articlelist := models.SgjPatientArticlelist{}
+	err := service.PatientReadDB().Where("user_org_id = ? AND Status = ?", orgid, 1).Last(&articlelist).Error
+	fmt.Println("错误",err)
+	return articlelist,err
+}
+
+//func GetArticlelistlimit(orgid int64)(models.SgjPatientArticlelist,error)  {
+//	articlelist := models.SgjPatientArticlelist{}
+//	service.PatientReadDB().Model(&articlelist).Where("")
+//}
+
+func GetlastLimit(orgid int64)(models.SgjPatientArticlelist,error)   {
+	articlelist := models.SgjPatientArticlelist{}
+	err := service.PatientReadDB().Model(&articlelist).Where("user_org_id = ? AND status = ?", orgid, 1).Last(&articlelist).Error
+	return articlelist,err
+}
+
+func GetAllArticeList(orgid int64,limit int64)(articles []models.Articles,err error)  {
+	err = service.PatientReadDB().Model(&articles).Where("user_org_id = ? AND status = ?", orgid, 1).Limit(limit).Find(&articles).Error
+	return articles,err
+}
+
+func GetActivitiesById(orgid int64)(models.SgjPatientAddactivity,error)  {
+	addactivity := models.SgjPatientAddactivity{}
+	err := service.PatientReadDB().Where("user_org_id = ? AND status = ?", orgid, 1).Last(&addactivity).Error
+	fmt.Println("查询活动列表错误",err)
+	return addactivity,err
+}
+
+func GetLastActivitiesLast(orgid int64)(models.SgjPatientAddactivity,error)  {
+	addactivity := models.SgjPatientAddactivity{}
+	err := service.PatientReadDB().Model(&addactivity).Where("user_org_id = ? AND status = ?", orgid, 1).Last(&addactivity).Error
+	return addactivity,err
+}
+
+func GetAllActivities(orgid int64,limit int64)(activity []models.Activity,err error)  {
+	err = service.PatientReadDB().Model(activity).Where("user_org_id = ? AND status = ?", orgid, 1).Limit(limit).Find(&activity).Error
+	return
+}
+
+
+func GetAllActivitiestwo(orgid int64)(activity []models.Activity,err error)  {
+	err = service.PatientReadDB().Model(activity).Where("user_org_id = ? AND status = ?", orgid, 1).Find(&activity).Error
+	return activity,err
+}
+
+func QueryHispitalDetail(orgid int64,id int64)(models.SgjPatientHospital,error)  {
+	hospital := models.SgjPatientHospital{}
+	err := service.PatientReadDB().Model(&hospital).Where("user_org_id = ?  AND modleid = ? AND status = ?", orgid, id, 1).Find(&hospital).Error
+	return  hospital,err
+}
+
+func GetOfficeDetail(orgid int64,id int64)(models.SgjPatientOffices,error) {
+	offices := models.SgjPatientOffices{}
+	err := service.PatientReadDB().Model(&offices).Where("user_org_id = ? AND modleid = ? AND status = ?", orgid, id, 1).Find(&offices).Error
+	return offices,err
+}
+
+func GetDoctorDetail(orgid int64,id int64)(editdoctor []*models.SgjPatientEditdoctor,err error)  {
+	err = service.PatientReadDB().Model(&editdoctor).Where("user_org_id = ? AND modleid = ? AND status = ?", orgid, id, 1).Order("doc_sort").Find(&editdoctor).Error
+	return
+}
+
+func GetOfficEnviromentDetail(orgid int64,id int64)(offenvironment []models.SgjPatientEnviroimages,err error)  {
+	err = service.PatientReadDB().Model(&offenvironment).Where("user_org_id = ? AND modeid = ? AND status = ?", orgid, id, 1).Order("sort").Find(&offenvironment).Error
+	return offenvironment,err
+}
+func GetArticlelistById(modeid int64,orgID int64)(models.SgjPatientArticlelist,error)  {
+	articlelist := models.SgjPatientArticlelist{}
+	err := service.PatientReadDB().Model(articlelist).Where("modeid = ? AND user_org_id = ? AND Status = ?", modeid, orgID, 1).Find(&articlelist).Error
+	return articlelist,err
+}
+
+func GetAllArticles(orgid int64,limit int64)(articlelist []models.Articles,err error)  {
+	err = service.PatientReadDB().Model(articlelist).Where("user_org_id = ? AND Status = ?", orgid, 1).Limit(limit).Find(&articlelist).Error
+	return
+}
+
+func GetAllActivitiById(modeid int64,orgID int64)(models.SgjPatientAddactivity,error)  {
+	addactivity := models.SgjPatientAddactivity{}
+	err := service.PatientReadDB().Model(addactivity).Where("modeid = ? AND user_org_id = ? AND Status = ?", modeid, orgID, 1).Find(&addactivity).Error
+	return addactivity,err
+}
+
+func GetDefalutNavigationData(orgid int64)(navigation []models.SgjPatientNavigation,err error) {
+	err = service.PatientReadDB().Where("user_org_id = ? AND status = ?", orgid, 1).Find(&navigation).Error
+	return navigation,err
+}
+func GetOrederModel(orgid int64)(model []*models.SgjPatientOrdmodel,err error)  {
+	db := service.PatientReadDB().Table("sgj_patient_ordmodel as o").Where("o.status = ?", 1)
+	if(orgid > 0){
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	err = db.Preload("Hosaddress").Preload("Connectway").Preload("Worktime").Preload("Rideway").Preload("Oldration").Preload("Conrotation").
+		Select("o.id,o.title,o.sort,o.ctime,o.mtime,o.mode_type").Order("sort").Find(&model).Error
+	fmt.Println("sql错误是什么",err)
+	return
+
+}
+
+func GetAllConnecway(orgid int64)(connect []models.SgjPatientConnection,err error)  {
+	err = service.PatientReadDB().Model(&connect).Where("user_org_id = ? AND status = ?", orgid, 1).Find(&connect).Error
+	return
+}
+
+func GetActivitDetail(id int64,orgid int64)(models.Activity,error)  {
+	activity := models.Activity{}
+	err := service.PatientReadDB().Model(&activity).Where(" id = ? AND user_org_id = ?", id, orgid).Find(&activity).Error
+	return activity,err
+}
+
+func GetArticlesDetail(id int64,orgid int64)(models.Articles,error)  {
+	articles := models.Articles{}
+	err := service.PatientReadDB().Model(&articles).Where("id = ? AND user_org_id = ?", id, orgid).Find(&articles).Error
+	return articles,err
+}
+
+func GetDoctorInfo(id int64,orgid int64)(models.SgjPatientEditdoctor,error)  {
+	editdoctor := models.SgjPatientEditdoctor{}
+	err := service.PatientReadDB().Model(&editdoctor).Where("id = ? AND user_org_id = ?", id, orgid).Find(&editdoctor).Error
+	return editdoctor,err
+}

service/redis.go

@@ -15,7 +15,7 @@ func RedisClient() *redis.Client {
 		DB:       0,                                       // use default DB
 	})
 
-	// pong, err := client.Ping().Result()
-	// fmt.Println(pong, err)
+	pong, err := client.Ping().Result()
+	fmt.Println(pong, err)
 	return client
 }

service/site_service/site_microwebsite_service.go

@@ -5,6 +5,7 @@ import (
 	"SCRM/service"
 	"fmt"
 	"time"
+	"github.com/jinzhu/gorm"
 )
 
 func AddPatientModel(model *models.SgjPatientModel)error{
@@ -103,7 +104,7 @@ func GetQueryDocInfo(orgID int64)(doc []*models.SgjUserStaffInfo,err error)  {
 }
 
 func GetQueryDocHead(orgID int64) (doc []*models.SgjPatientEditdoctor,err error) {
-	err = service.PatientReadDB().Where("user_org_id = ? AND status = ?", orgID, 1).Order("doc_sort").Find(&doc).Error
+	err = service.PatientReadDB().Where("user_org_id = ? AND status = ? AND img_show = ?", orgID, 1,1).Order("doc_sort").Find(&doc).Error
 	return
 }
 
@@ -204,7 +205,7 @@ func QueryDocById(orgID int64,id int64)(models.SgjUserStaffInfo,error)  {
 }
 
 func DeleteDoctor(id int64,orgID int64)(error) {
-	err := service.PatientWriteDB().Model(&models.SgjPatientEditdoctor{}).Where("id = ? AND user_org_id = ?", id, orgID).Update(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	err := service.PatientWriteDB().Model(&models.SgjPatientEditdoctor{}).Where("id = ? AND user_org_id = ?", id, orgID).Update(map[string]interface{}{"status": 0,"img_show":0,"modleid":0, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -276,17 +277,21 @@ func GetData(orgid int64)(model []*models.SgjPatientModel,err error)  {
 	if(orgid > 0){
 		db = db.Where("user_org_id = ? ", orgid)
 	}
-	err = db.Preload("Hospitals").Preload("Offices").Preload("Doctors").Preload("OfficeEnviroment").
-		Preload("Editdoctor").Preload("Rotation").Preload("Macnavigation").Preload("Editmargin").Preload("Enviroimages").Preload("PatientEditpiclink").
+	err = db.Preload("Hospitals").Preload("Offices").Preload("OfficeEnviroment").
+		Preload("Editdoctor").Preload("Editmargin").Preload("Enviroimages").Preload("PatientEditpiclink").
 		Select("m.id,m.title,m.sort,m.ctime,m.mtime,m.user_org_id,m.status,m.mode_type").Order("sort").Find(&model).Error
-	return
+	fmt.Println("err二二err二二err二二err二二err二二err",err)
+
+		return
 }
 
+
+
 func UpdateDoctorsInfo(orgID int64,ids[] int64,editdoctor models.SgjPatientEditdoctor)(err error)  {
 	if(len(ids)==1){
-		err = service.PatientWriteDB().Model(&models.SgjPatientEditdoctor{}).Where("id = ? and user_org_id = ?", ids[0], orgID).Update(map[string]interface{}{ "modleid": editdoctor.Modleid, "status": 1, "mtime": time.Now().Unix()}).Error
+		err = service.PatientWriteDB().Model(&models.SgjPatientEditdoctor{}).Where("id = ? and user_org_id = ?", ids[0], orgID).Update(map[string]interface{}{ "modleid": editdoctor.Modleid, "status": 1,"img_show": 0, "mtime": time.Now().Unix()}).Error
 	}else {
-		err = service.PatientWriteDB().Model(&models.SgjPatientEditdoctor{}).Where("id IN(?) and user_org_id = ?", ids, orgID).Update(map[string]interface{}{"modleid": editdoctor.Modleid, "status": 1, "mtime": time.Now().Unix()}).Error
+		err = service.PatientWriteDB().Model(&models.SgjPatientEditdoctor{}).Where("id IN(?) and user_org_id = ?", ids, orgID).Update(map[string]interface{}{"modleid": editdoctor.Modleid, "status": 1,"img_show": 0, "mtime": time.Now().Unix()}).Error
 	}
 	return
 }
@@ -297,6 +302,17 @@ func QueryEditDoc(mid int64,orgid int64)(models.SgjPatientDocinfo,  error)  {
 	return editdotor,err
 }
 
+func QueryModelByid(id int64,orgid int64)(models.SgjPatientModel,error)  {
+	model := models.SgjPatientModel{}
+	err := service.PatientReadDB().Model(&model).Where("id = ? AND user_org_id = ? AND status =?", id, orgid, 1).Find(&model).Error
+	return model,err
+}
+
+func QuerEditDocByModleid(mid int64,orgid int64)(editdoctor []models.SgjPatientEditdoctor,err error)  {
+	err = service.PatientReadDB().Model(&editdoctor).Where("modleid = ? AND user_org_id = ? AND status = ?", mid, orgid, 1).Find(&editdoctor).Error
+	return editdoctor,err
+}
+
 func QuerEditDocByid(mid int64,orgid int64)(editdoctor []*models.SgjPatientEditdoctor,err error)  {
 	err = service.PatientReadDB().Model(&editdoctor).Where("modleid = ? AND user_org_id = ? AND status = ?", mid, orgid, 1).Order("doc_sort").Find(&editdoctor).Error
 	return
@@ -324,12 +340,20 @@ func Upadatedocdata(orgid int64,id int64,docinfo models.SgjPatientDocinfo) error
 	return  err
 }
 
+func GetQueryModel(id,orgid int64)(models.SgjPatientModel,error)  {
+	model := models.SgjPatientModel{}
+	err := service.PatientReadDB().Model(&model).Where("id = ? AND user_org_id = ? AND status = ?", id, orgid, 1).Find(&model).Error
+	return model,err
+}
+
 func QuerOfficeEnviroment(id int64,orgid int64)(models.SgjPatientOffenvironment,error)  {
 	offenvironment := models.SgjPatientOffenvironment{}
 	err := service.PatientReadDB().Model(&offenvironment).Where("modelid = ? AND user_org_id = ? AND status = ?", id, orgid, 1).Find(&offenvironment).Error
 	return offenvironment,err
 }
 
+
+
 func QueryOfficeformById(modeid int64,orgid int64)(patientenviroimages []*models.SgjPatientEnviroimages,err error)  {
 	err = service.PatientReadDB().Model(&patientenviroimages).Where("modeid = ? AND user_org_id = ? AND status = ?", modeid, orgid, 1).Find(&patientenviroimages).Error
 	return
@@ -454,7 +478,7 @@ func AddRotationpic(conrotation models.SgjPatientConrotation) error  {
 }
 
 func GetRotationImages(orgid int64)(conrotation []models.SgjPatientConrotation,err error)  {
-	err = service.PatientReadDB().Model(&conrotation).Where("user_org_id = ? AND status = ? AND img_show = ?", orgid, 1,1).Find(&conrotation).Error
+	err = service.PatientReadDB().Model(&conrotation).Where("user_org_id = ? AND status = ? AND img_show = ?", orgid, 1,1).Order("sort").Find(&conrotation).Error
 	return conrotation,err
 }
 
@@ -504,7 +528,7 @@ func UpdateEnviroimages(id int64,orgid int64,enviroimages models.SgjPatientEnvir
 }
 
 func GetEditImages(orgid int64)(editpiclink []models.SgjPatientEditpiclink,err error)  {
-	err = service.PatientReadDB().Model(&editpiclink).Where("user_org_id = ? AND status = ? AND img_show = ?",orgid,1,1).Find(&editpiclink).Error
+	err = service.PatientReadDB().Model(&editpiclink).Where("user_org_id = ? AND status = ? AND img_show = ?",orgid,1,1).Order("sort").Find(&editpiclink).Error
 	return editpiclink,err
 }
 
@@ -623,7 +647,7 @@ func AddEditpic(conrotation *models.SgjPatientConrotation)(error)  {
 
 func QueryOldrotion(id int64,orgid int64)(models.SgjPatientOldrotation,error) {
 	conrotation := models.SgjPatientOldrotation{}
-	err := service.PatientReadDB().Model(conrotation).Where("id = ? AND user_org_id = ? ", id, orgid).Find(&conrotation).Error
+	err := service.PatientReadDB().Model(conrotation).Where("id = ? AND user_org_id = ? ", id, orgid).Order("sort").Find(&conrotation).Error
 	return conrotation,err
 }
 
@@ -646,6 +670,12 @@ func GetPatientRotaion(id int64,orgid int64)(models.SgjPatientRotation,error)  {
 	return rotation,err
 }
 
+func GetPatientModel(id int64,orgid int64)(models.SgjPatientModel,error)  {
+	model := models.SgjPatientModel{}
+	err := service.PatientReadDB().Model(&model).Where("id = ? AND user_org_id = ?", id, orgid).Order("sort").Find(&model).Error
+	return model,err
+}
+
 func GetPatientRotationById(id int64,orgid int64)(models.SgjPatientRotation,error)  {
 	rotation := models.SgjPatientRotation{}
 	err := service.PatientReadDB().Model(&rotation).Where("id = ? AND user_org_id =?", id, orgid).Find(&rotation).Error
@@ -677,6 +707,11 @@ func UpdateEditPatPicLink(id int64,orgid int64,editpiclink models.SgjPatientEdit
 	return  err
 }
 
+func UpdateEditPicLinkTwo(moid int64,orgid int64,)(error)  {
+	err := service.PatientWriteDB().Model(models.SgjPatientEditpiclink{}).Where("modeid = ? AND user_org_id = ? AND status = ?", moid, orgid, 1).Update(map[string]interface{}{"img_show": 0}).Error
+	return err
+}
+
 func GetPatientRotations(id int64,orgid int64)(models.SgjPatientRotation,error)  {
 	rotation := models.SgjPatientRotation{}
 	err := service.PatientReadDB().Model(&rotation).Where("id = ? AND user_org_id = ?", id, orgid).Find(&rotation).Error
@@ -741,9 +776,7 @@ func GetAllArticles(orgid int64,limit int64)(articlelist []models.Articles,err e
 	return
 }
 
-//func GetAllArticlesDetail(id int64)  {
-//
-//}
+
 
 func GetArticlelistById(modeid int64,orgID int64)(models.SgjPatientArticlelist,error)  {
 	articlelist := models.SgjPatientArticlelist{}
@@ -785,6 +818,13 @@ func AddOfficeThree(enviroimages *models.SgjPatientEnviroimages)(error)  {
 	err := service.PatientWriteDB().Model(&enviroimages).Create(&enviroimages).Error
 	return err
 }
+
+func GetQueryImages(mid int64,orgid int64)(enviroimages []models.SgjPatientEnviroimages,err error)  {
+
+	err = service.PatientReadDB().Model(enviroimages).Where("modeid = ? AND user_org_id = ? AND status = ?", mid, orgid, 1).Order("sort").Find(&enviroimages).Error
+	return enviroimages,err
+}
+
 func GetOfficeTwoVisible(orgid int64,id int64)(models.SgjPatientEnviroimages,error)  {
 	enviroimages := models.SgjPatientEnviroimages{}
 	err := service.PatientReadDB().Where("user_org_id = ? AND id = ? AND status = ?", orgid, id, 1).Find(&enviroimages).Error
@@ -924,9 +964,8 @@ func AddMagiclinkData(magiclink *models.SgjPatientMagiclink)error  {
 	return err
 }
 
-func GetMacLinkAddress(orgid int64)(models.SgjPatientMagiclink,error) {
-	patientMagiclink := models.SgjPatientMagiclink{}
-	err := service.PatientReadDB().Model(&patientMagiclink).Where("user_org_id = ? AND status = ?", orgid, 1).Last(&patientMagiclink).Error
+func GetMacLinkAddressTwo (orgid int64)(patientMagiclink []models.SgjPatientMagiclink,err error) {
+	err = service.PatientReadDB().Model(&patientMagiclink).Where("user_org_id = ? AND status = ?", orgid, 1).Find(&patientMagiclink).Error
 	return patientMagiclink,err
 }
 
@@ -967,7 +1006,7 @@ func UpdateEditMacFormById(id int64,orgid int64,editmargin models.SgjPatientEdit
 
 func GetLikeMacAddressById(orgid int64,id int64)(models.SgjPatientMagiclink,error)  {
       magiclink := models.SgjPatientMagiclink{}
-	err := service.PatientReadDB().Where("user_org_id = ? AND id = ?", orgid, id).Find(&magiclink).Error
+	err := service.PatientReadDB().Where("user_org_id = ? AND linkaddress = ?", orgid, id).Find(&magiclink).Error
 	return magiclink,err
 }
 
@@ -976,14 +1015,29 @@ func GetAllArticeList(orgid int64)(articles []models.Articles,err error)  {
 	return articles,err
 }
 
+func AddActicles(articles *models.Articles)error  {
+	 err:= service.PatientWriteDB().Create(&articles).Error
+	 return  err
+}
+
 func UpdateLinkAddress(id int64,orgid int64,magiclink models.SgjPatientMagiclink)error  {
 
 	err := service.PatientWriteDB().Model(&models.SgjPatientMagiclink{}).Where("id = ? AND user_org_id = ? ", id, orgid).Update(map[string]interface{}{"linktype": magiclink.Linktype, "instationlink": magiclink.Instationlink, "articetype": magiclink.Articetype, "phone": magiclink.Phone, "outstationlink": magiclink.Outstationlink, "linkaddress": magiclink.Linkaddress, "title": magiclink.Title, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
-func AddMacLinkAddress(magiclink *models.SgjPatientMagiclink)error  {
+func GetUpdateLinkAddress(id int64,orgid int64)(models.SgjPatientMagiclink,error) {
+	editpiclink := models.SgjPatientMagiclink{}
+	err := service.PatientReadDB().Model(&editpiclink).Where("id = ? AND user_org_id = ?",id,orgid).Find(&editpiclink).Error
+	return  editpiclink,err
+}
+
+func GetMacLinkAddress(orgid int64)(magiclink []models.SgjPatientMagiclink,err error)  {
+	err = service.PatientReadDB().Model(&magiclink).Where("user_org_id = ? AND status =?", orgid, 1).Find(&magiclink).Error
+	return magiclink,err
+}
 
+func AddMacLinkAddress(magiclink *models.SgjPatientMagiclink)error  {
 	err := service.PatientWriteDB().Create(&magiclink).Error
 	return  err
 }
@@ -997,7 +1051,11 @@ func GetPatientLinkAddress(id int64,orgid int64)(models.SgjPatientLinkaddress,er
 func GetCountImages(orgid int64)(edipiclink []models.SgjPatientEditpiclink,total int64,err error)  {
 	err = service.PatientReadDB().Where("user_org_id = ? AND img_show = ? AND status = ?", orgid,1,1).Find(&edipiclink).Count(&total).Error
 	return edipiclink,total,err
+}
 
+func GetDeleteImages(orgid int64,modeid int64)(edipiclink []models.SgjPatientEditpiclink,total int64,err error)  {
+	err = service.PatientReadDB().Where("user_org_id = ? AND modeid = ? AND status = ?", orgid, modeid, 1).Find(&edipiclink).Count(&total).Error
+	return edipiclink,total,err
 }
 
 func GetTotalCount(orgid int64)(conrotation []models.SgjPatientConrotation,total int64,err error)  {
@@ -1010,6 +1068,11 @@ func GetCountPicImages(orgid int64,modeid int64)(edipiclink []models.SgjPatientE
 	return edipiclink,total,err
 }
 
+func GetPicImages(orgid int64,modeid int64)(editpiclink []models.SgjPatientEditpiclink,err error)  {
+	err = service.PatientReadDB().Where("user_org_id = ? AND modeid = ? AND status = ?", orgid, modeid, 1).Order("sort").Find(&editpiclink).Error
+	return editpiclink,err
+}
+
 func QueryEditpiclinkCount(mid int64,orgid int64)(editpiclink []models.SgjPatientEditpiclink,total int64,err error)  {
 	err= service.PatientWriteDB().Where("modeid = ? AND user_org_id =? AND status = ?", mid, orgid, 1).Find(&editpiclink).Count(&total).Error
 	return editpiclink,total,err
@@ -1037,4 +1100,97 @@ func UpdateditnavigationLink(orgid int64,id int64,navgationlink models.SgjPatien
 	err := service.PatientWriteDB().Model(&navgationlink).Where("user_org_id = ? AND id =?", orgid, id).Update(map[string]interface{}{"linktype": navgationlink.Linktype, "linktypetwo": navgationlink.Linktypetwo, "articetype": navgationlink.Articetype, "title": navgationlink.Title, "phone": navgationlink.Phone, "outstation":
 	navgationlink.Outstation, "linkaddress": navgationlink.Linkaddress, "mtime": time.Now().Unix()}).Error
 	return err
+}
+
+func AddEditDoctor(editdoctor *models.SgjPatientEditdoctor) error {
+
+	err := service.PatientWriteDB().Create(&editdoctor).Error
+	return err
+}
+
+func QuerEditDoctorInfo(mid int64,orgid int64)(editdoctor []models.SgjPatientEditdoctor,err error)  {
+	err = service.PatientWriteDB().Model(&editdoctor).Where("modleid = ? AND user_org_id = ? AND status = ?", mid, orgid, 1).Find(&editdoctor).Error
+
+	return editdoctor,err
+}
+
+func GetModel(orgid int64)(*models.SgjPatientModel,error)  {
+     var model models.SgjPatientModel
+     var err error
+	err = service.PatientReadDB().Model(&models.SgjPatientModel{}).Where("user_org_id = ? AND status = ?", orgid, 1).Find(&model).Error
+	if err == gorm.ErrRecordNotFound{
+		return nil,err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &model, nil
+}
+
+func AddPatientModelTwo(model *models.SgjPatientModel)error  {
+	err := service.PatientWriteDB().Create(&model).Error
+	return  err
+}
+
+func GetQueryModelByLastData(orgid int64)(models.SgjPatientModel,error){
+	model := models.SgjPatientModel{}
+	err := service.PatientReadDB().Model(&model).Where("user_org_id = ? AND status = ?", orgid, 1).Last(&model).Error
+	return  model,err
+}
+
+func AddPatientEdit(editpiclink *models.SgjPatientEditpiclink)error  {
+	err := service.PatientWriteDB().Create(&editpiclink).Error
+	return err
+}
+
+func AddHospital(hospital *models.SgjPatientHospital) error {
+	err := service.PatientWriteDB().Create(&hospital).Error
+	return err
+}
+
+func AddEditMargin(editmargin *models.SgjPatientEditmargin) error {
+	err := service.PatientWriteDB().Create(&editmargin).Error
+	return err
+}
+
+func AddPatientOffices(offices *models.SgjPatientOffices)error  {
+	err := service.PatientWriteDB().Create(&offices).Error
+	return  err
+}
+
+func GetDefaultNavigation(orgid int64)(navigation []models.SgjPatientNavigation,err error)  {
+
+	err = service.PatientReadDB().Model(navigation).Where("user_org_id = ? AND status = ?", orgid, 1).Find(&navigation).Error
+
+	return navigation,err
+}
+
+func AddDefaultData(navigation *models.SgjPatientNavigation) error {
+	err := service.PatientWriteDB().Create(&navigation).Error
+	return err
+}
+
+func GetAllModelTitle(orgid int64)(models  []models.SgjPatientModel,err error)  {
+
+	err = service.PatientReadDB().Model(models).Where("user_org_id = ? AND status = ?", orgid, 1).Find(&models).Error
+	return models,err
+
+}
+
+func GetDoctorDetailInfo(id int64,orgid int64)(models.SgjPatientEditdoctor,error)  {
+	editdoctor := models.SgjPatientEditdoctor{}
+	err := service.PatientReadDB().Model(&editdoctor).Where("id=? AND user_org_id = ?", id, orgid).Find(&editdoctor).Error
+	return  editdoctor,err
+}
+
+func GetArticleListDetail(id int64,orgid int64)(models.Articles,error)  {
+	articles := models.Articles{}
+	err := service.PatientReadDB().Model(&articles).Where("id=? AND user_org_id =?", id, orgid).Find(&articles).Error
+	return articles,err
+}
+
+func GetActivitiesListDetail(id int64,orgid int64)(models.Activity,error)  {
+	activity := models.Activity{}
+	err := service.PatientReadDB().Model(&activity).Where("id=? AND user_org_id = ?", id, orgid).Find(&activity).Error
+	return activity,err
 }

service/wechat_service/open_wechat_service.go

@@ -314,9 +314,11 @@ func SendClickButtonMessage(appid string, ToUserName string, FromUserName string
 
 func GetReqPreAuthCode() (code string, err error) {
 	redisClient := service.RedisClient()
+	fmt.Println("redisClietent是设么",redisClient)
 	defer redisClient.Close()
 
 	componentAccessToken, err := redisClient.Get("sgj_patient:component_access_token").Result()
+	fmt.Println("componentAccessToken是设么",componentAccessToken)
 	if err != nil {
 		utils.ErrorLog("component_access_token不存在")
 		return
@@ -462,6 +464,8 @@ func PostJSON(uri string, jsonData []byte) ([]byte, error) {
 func SendMpWechatMenus(AuthorizerAccessToken string, jsonData []byte) (err error) {
 	//读取响应
 	body, err := PostJSON("https://api.weixin.qq.com/cgi-bin/menu/create?access_token="+AuthorizerAccessToken, jsonData)
+	fmt.Println("公众徐欧文是树森",err)
+	fmt.Println("body",body)
 	if err != nil {
 		return
 	}