微网站

.idea/workspace.xml

@@ -5,7 +5,9 @@
       <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/micro/micro_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/micro/micro_controller.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/micro_service/micro_service.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/micro_service/micro_service.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/controllers/micro/router_collector.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/micro/router_collector.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$/routers/router.go" beforeDir="false" afterPath="$PROJECT_DIR$/routers/router.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" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -17,89 +19,89 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="app.conf" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/conf/app.conf">
+      <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="44">
-              <caret line="2" column="15" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
+            <state relative-caret-position="101">
+              <caret line="7" column="1" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
+              <folding>
+                <element signature="e#15#104#0" expanded="true" />
+              </folding>
             </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">
+      <file leaf-file-name="router.go" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/routers/router.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="41" selection-start-line="41" selection-end-line="41" />
-              <folding>
-                <element signature="e#23#71#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="154">
+              <caret line="35" column="26" selection-start-line="35" selection-start-column="11" selection-end-line="35" 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">
+      <file leaf-file-name="base_controller.go" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/controllers/base_controller.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="384">
-              <caret line="297" column="50" selection-start-line="297" selection-start-column="37" selection-end-line="297" selection-end-column="50" />
+            <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>
       </file>
-      <file leaf-file-name="router.go" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/routers/router.go">
+      <file leaf-file-name="router_collector.go" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/controllers/micro/router_collector.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="22">
-              <caret line="24" column="203" selection-start-line="24" selection-start-column="203" selection-end-line="24" selection-end-column="203" />
+            <state relative-caret-position="132">
+              <caret line="6" column="16" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="16" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="site_models.go" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/models/site_models.go">
+      <file leaf-file-name="app.conf" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/conf/app.conf">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="22">
-              <caret line="127" column="45" selection-start-line="127" selection-start-column="45" selection-end-line="127" selection-end-column="45" />
+            <state relative-caret-position="198">
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="site_controller.go" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/controllers/site/site_controller.go">
+      <file leaf-file-name="router_collector.go" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/controllers/article/router_collector.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="382">
-              <caret line="1805" column="38" selection-start-line="1805" selection-start-column="31" selection-end-line="1805" selection-end-column="38" />
-              <folding>
-                <element signature="e#14#224#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="66">
+              <caret line="3" column="18" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="18" />
             </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">
+      <file leaf-file-name="article_controller.go" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/controllers/article/article_controller.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="176">
-              <caret line="17" column="4" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="4" />
+            <state relative-caret-position="1144">
+              <caret line="64" column="37" selection-start-line="64" selection-start-column="16" selection-end-line="64" selection-end-column="37" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="article_category_service.go" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/service/article_service/article_category_service.go">
+      <file leaf-file-name="base_api_controller.go" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/controllers/base_api_controller.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="107">
-              <caret line="42" column="4" selection-start-line="42" selection-start-column="4" selection-end-line="51" selection-end-column="9" />
+            <state relative-caret-position="-152">
+              <caret line="48" column="35" selection-start-line="48" selection-start-column="35" selection-end-line="48" selection-end-column="35" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="user_models.go" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/models/user_models.go">
+      <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="12">
-              <caret line="38" column="5" selection-start-line="38" selection-start-column="5" selection-end-line="38" selection-end-column="5" />
+            <state relative-caret-position="73436">
+              <caret line="3351" column="28" selection-start-line="3351" selection-start-column="28" selection-end-line="3351" selection-end-column="28" />
+              <folding>
+                <element signature="e#14#224#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -115,23 +117,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>GetArititys</find>
-      <find>AddActivity</find>
-      <find>AddActivitys</find>
-      <find>AddArticelist</find>
-      <find>AddRotationpic</find>
-      <find>GetOrderModel</find>
-      <find>GetContactUsModel</find>
-      <find>AddConnection</find>
-      <find>SaveArticeDetail</find>
-      <find>GetArticlistDetail</find>
-      <find>AddConnetion</find>
-      <find>GetArticlelist</find>
-      <find>AddMagicLinkDataTwo</find>
-      <find>/api/site/addmagiclinkdata</find>
-      <find>Linkaddress</find>
-      <find>formatInt</find>
-      <find>GetPatienModelByModelId</find>
       <find>AddMagiclinkData</find>
       <find>GetCategorys</find>
       <find>/api/acticle/getCategorys</find>
@@ -143,8 +128,25 @@
       <find>EditStaffInfo</find>
       <find>/api/staff/EditStaffInfo</find>
       <find>GetEnviromentImages</find>
-      <find>GetData</find>
       <find>GetDoctorInfo</find>
+      <find>GetData</find>
+      <find>GetOrderModel</find>
+      <find>AddEditpic</find>
+      <find>GetEnImagesThree</find>
+      <find>GetEditRotationimages</find>
+      <find>GetRotationDetail</find>
+      <find>AddMacLinkAddress</find>
+      <find>GetMacLinkAddressByLastData</find>
+      <find>/api/site/getLikeMacAddressById</find>
+      <find>GetLikeMacAddressById</find>
+      <find>/api/site/updatesingleform</find>
+      <find>UpdateSingleForm</find>
+      <find>/api/site/updatepicformthree</find>
+      <find>AddLinkAddressThree</find>
+      <find>/api/site/saveditpic</find>
+      <find>SaveEditpic</find>
+      <find>UpdatePicFformThree</find>
+      <find>AdminCtlRegistRouters</find>
     </findStrings>
   </component>
   <component name="GOROOT" path="C:\Go" />
@@ -162,24 +164,24 @@
         <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$/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$/controllers/mpwechat/menu_controller.go" />
         <option value="$PROJECT_DIR$/service/wechat_service/open_wechat_service.go" />
         <option value="$PROJECT_DIR$/controllers/article/article_controller.go" />
-        <option value="$PROJECT_DIR$/routers/router.go" />
         <option value="$PROJECT_DIR$/main.go" />
         <option value="$PROJECT_DIR$/models/activity_models.go" />
         <option value="$PROJECT_DIR$/models/site_models.go" />
         <option value="$PROJECT_DIR$/models/article_models.go" />
-        <option value="$PROJECT_DIR$/controllers/site/site_controller.go" />
-        <option value="$PROJECT_DIR$/controllers/micro/micro_controller.go" />
         <option value="$PROJECT_DIR$/service/article_service/article_category_service.go" />
         <option value="$PROJECT_DIR$/service/micro_service/micro_service.go" />
-        <option value="$PROJECT_DIR$/conf/app.conf" />
         <option value="$PROJECT_DIR$/service/site_service/site_microwebsite_service.go" />
+        <option value="$PROJECT_DIR$/controllers/site/site_controller.go" />
+        <option value="$PROJECT_DIR$/conf/app.conf" />
+        <option value="$PROJECT_DIR$/routers/router.go" />
+        <option value="$PROJECT_DIR$/controllers/micro/router_collector.go" />
+        <option value="$PROJECT_DIR$/controllers/micro/micro_controller.go" />
       </list>
     </option>
   </component>
@@ -189,17 +191,18 @@
     <detection-done>true</detection-done>
     <sorting>DEFINITION_ORDER</sorting>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-10" />
-    <option name="y" value="-10" />
+  <component name="ProjectFrameBounds">
+    <option name="x" value="56" />
+    <option name="y" value="57" />
     <option name="width" value="1785" />
-    <option name="height" value="615" />
+    <option name="height" value="1003" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -220,26 +223,12 @@
             <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="controllers" type="462c0819:PsiDirectoryNode" />
-              <item name="staff" type="462c0819:PsiDirectoryNode" />
+              <item name="routers" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -249,7 +238,7 @@
     <property name="configurable.Project.GOPATH.is.expanded" value="true" />
     <property name="go.gopath.indexing.explicitly.defined" value="true" />
     <property name="go.sdk.automatically.set" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../KYA" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="com.goide.configuration.GoLibrariesConfigurableProvider" />
@@ -272,19 +261,17 @@
     </option>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
-    <editor active="true" />
+    <frame x="45" y="46" width="1428" height="802" extended-state="0" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.6625767" visible="true" weight="0.18766756" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.62564105" visible="true" weight="0.24014598" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.21045576" side_tool="true" visible="true" weight="0.30242512" />
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.14379562" side_tool="true" visible="true" weight="0.41353384" />
       <window_info anchor="right" id="Database" order="3" />
-      <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" sideWeight="0.33742332" side_tool="true" visible="true" weight="0.18766756" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.7895442" visible="true" weight="0.30242512" />
+      <window_info id="Structure" order="1" sideWeight="0.37435898" side_tool="true" visible="true" weight="0.24014598" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.8562044" visible="true" weight="0.41353384" />
       <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" />
@@ -293,6 +280,7 @@
       <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">
@@ -307,27 +295,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <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">
@@ -482,20 +449,6 @@
         </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">
@@ -503,13 +456,6 @@
         </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">
@@ -573,13 +519,6 @@
         </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="6578">
-          <caret line="311" column="58" selection-start-line="311" selection-start-column="47" selection-end-line="311" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/models/article_models.go">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
@@ -589,7 +528,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/models/user_models.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="12">
+        <state relative-caret-position="836">
           <caret line="38" column="5" selection-start-line="38" selection-start-column="5" selection-end-line="38" selection-end-column="5" />
         </state>
       </provider>
@@ -610,65 +549,114 @@
     </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="107">
+        <state relative-caret-position="792">
           <caret line="42" column="4" selection-start-line="42" selection-start-column="4" selection-end-line="51" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/service/site_service/site_microwebsite_service.go">
+    <entry file="file://$PROJECT_DIR$/models/site_models.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="17" column="4" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="4" />
+        <state relative-caret-position="6182">
+          <caret line="281" column="15" selection-start-line="281" selection-start-column="4" selection-end-line="281" selection-end-column="15" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/conf/app.conf">
+    <entry file="file://$PROJECT_DIR$/service/micro_service/micro_service.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="44">
-          <caret line="2" column="15" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
+        <state relative-caret-position="330">
+          <caret line="20" column="6" selection-start-line="18" selection-start-column="76" selection-end-line="20" selection-end-column="6" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/service/micro_service/micro_service.go">
+    <entry file="file://$PROJECT_DIR$/service/site_service/site_microwebsite_service.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="41" selection-start-line="41" selection-end-line="41" />
+        <state relative-caret-position="26180">
+          <caret line="1199" column="57" selection-start-line="1199" selection-start-column="57" selection-end-line="1199" selection-end-column="57" />
+        </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="73436">
+          <caret line="3351" column="28" selection-start-line="3351" selection-start-column="28" selection-end-line="3351" selection-end-column="28" />
           <folding>
-            <element signature="e#23#71#0" expanded="true" />
+            <element signature="e#14#224#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/controllers/micro/micro_controller.go">
+    <entry file="file://$PROJECT_DIR$/controllers/admin_user/admin_controller.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="384">
-          <caret line="297" column="50" selection-start-line="297" selection-start-column="37" selection-end-line="297" selection-end-column="50" />
+        <state relative-caret-position="242">
+          <caret line="22" column="34" selection-start-line="22" selection-start-column="34" selection-end-line="22" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/routers/router.go">
+    <entry file="file://$PROJECT_DIR$/controllers/admin_user/router_collector.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="24" column="203" selection-start-line="24" selection-start-column="203" selection-end-line="24" selection-end-column="203" />
+        <state relative-caret-position="44">
+          <caret line="2" column="5" selection-start-line="2" selection-start-column="5" selection-end-line="2" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/models/site_models.go">
+    <entry file="file://$PROJECT_DIR$/controllers/article/router_collector.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="127" column="45" selection-start-line="127" selection-start-column="45" selection-end-line="127" selection-end-column="45" />
+        <state relative-caret-position="66">
+          <caret line="3" column="18" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="18" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/controllers/site/site_controller.go">
+    <entry file="file://$PROJECT_DIR$/controllers/article/article_controller.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1144">
+          <caret line="64" column="37" selection-start-line="64" selection-start-column="16" selection-end-line="64" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/conf/app.conf">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </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="132">
+          <caret line="6" column="16" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="16" />
+        </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="382">
-          <caret line="1805" column="38" selection-start-line="1805" selection-start-column="31" selection-end-line="1805" selection-end-column="38" />
+        <state relative-caret-position="101">
+          <caret line="7" column="1" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
           <folding>
-            <element signature="e#14#224#0" expanded="true" />
+            <element signature="e#15#104#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/routers/router.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="35" column="26" selection-start-line="35" selection-start-column="11" selection-end-line="35" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/controllers/base_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$/controllers/base_api_controller.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-152">
+          <caret line="48" column="35" selection-start-line="48" selection-start-column="35" selection-end-line="48" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

conf/app.conf

@@ -1,6 +1,6 @@
 appname = SCRM
-httpport = 9534
-runmode =  prod
+httpport = 9535
+runmode =  dev
 
 copyrequestbody = true
 sessionon = true

controllers/micro/micro_controller.go

@@ -8,6 +8,7 @@ import (
 )
 
 func microRouters(){
+	fmt.Println("ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo")
 	beego.Router("/api/site/getdatabyorgid",&Micro{},"Get:GetDataByOrgId")
 	beego.Router("/api/site/getdatatwo",&Micro{},"Get:GetDatatwo")
 	beego.Router("/api/site/getdatathree",&Micro{},"Get:GetOfficeDetail")

controllers/micro/router_collector.go

@@ -1,5 +1,8 @@
 package micro
 
+import "fmt"
+
 func RegisterRouters() {
+	fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh")
 	microRouters()
 }

controllers/site/site_controller.go

@@ -3345,11 +3345,19 @@ func (this *Microwebsite) SaveEditpic()  {
 	fmt.Println("链接地址",linkaddress)
 	modeid := int64(dataBody["modeid"].(float64))
 	fmt.Println("天梦中",modeid)
+	linkid := int64(dataBody["linkid"].(float64))
+	fmt.Println("linkid",linkid)
+	if(piclink == 1){
+		conlinkaddress, err := site_service.UpdatedConAddress(linkid, userOrgID)
+		fmt.Println("错误",err)
+		fmt.Println("conlinkaddress",conlinkaddress)
+	}
 	conrotation := models.SgjPatientConrotation{
 		Images:      images,
 		Sort:        sort,
 		Piclink:     piclink,
 		Linkaddress: linkaddress,
+		Linkid:linkid,
 	}
 	err = site_service.UpdateEditpic(id, userOrgID,conrotation)
 	fmt.Println("err错误",err)
@@ -3532,6 +3540,11 @@ func (this *Microwebsite) UpdateSingleForm()  {
     fmt.Println("链接地址",linkaddress)
 	modelid := int64(dataBody["modeid"].(float64))
 	linkid := int64(dataBody["linkid"].(float64))
+	if(piclink == 1){
+		patientLinkaddress, err := site_service.UpdatedPatientLinkAddress(linkid, userOrgID)
+		fmt.Println("hhhhhhhhhhhhhhhhhhherr错误",err)
+		fmt.Println("patientlinkaddress",patientLinkaddress)
+	}
 	editpiclink := models.SgjPatientEditpiclink{
 		Images:      images,
 		Sort:        sort,
@@ -4444,8 +4457,12 @@ func (this *Microwebsite) UpdatePicFformThree()  {
 	fmt.Println("defineaddress",defineaddress)
 	conlinkaddress := models.SgjPatientConlinkaddress{
 		Defineaddress: defineaddress,
+		UserOrgId:userOrgID,
+		Status:1,
+		Ctime:time.Now().Unix(),
 	}
-	err = site_service.UpdatedConlinkAddress(id, userOrgID, conlinkaddress)
+	//err = site_service.UpdatedConlinkAddress(id, userOrgID, conlinkaddress)
+	err = site_service.AddConlinkAddress(&conlinkaddress)
 	if err !=nil{
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
 		return

routers/router.go

@@ -18,9 +18,11 @@ import (
 	"SCRM/controllers/site"
 	"SCRM/controllers/micro"
 	"github.com/astaxie/beego/context"
+	"fmt"
 )
 
 func init() {
+	fmt.Println("开始啦看hi啊啊阿道夫放大阿发大是大非身份地方阿斯蒂芬撒旦法暗室逢灯沙发发顺丰阿萨法撒旦法沙发阿萨法阿发法啊阿打发打发")
 	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
 		AllowOrigins:     []string{"http://jk.kuyicloud.com", "http://localhost:8090","http://localhost:8091", "http://test1.sgjyun.com", "https://www.ucpaas.com","http://microweb.kuyicloud.com","http://jk.test.sgjyun.com"},
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},

service/site_service/site_microwebsite_service.go

@@ -15,7 +15,7 @@ import (
 var createDefalutDataCronJob *cron.Cron
 
 func BeginAutoCreateDefalutData() {
-	createDefalutDataCronJob.Start()
+	//createDefalutDataCronJob.Start()
 }
 
 func init()  {
@@ -130,14 +130,60 @@ func AutoCreateDefalutSchedules()  {
 			ID :=int64(sgjpatietnmodelfour.ID + 1)
 			fmt.Println("ID是多少",ID)
 			modeid := strconv.FormatInt(ID, 10)
+			magiclink := models.SgjPatientMagiclink{
+				UserOrgId:     userOrgID,
+				Linktype:      2,
+				Instationlink: ID,
+				Ctime:         time.Now().Unix(),
+				Status:        1,
+			}
+			AddMacLinkAddress(&magiclink)
+			patientMagiclink, err := GetMacLinkAddressByLastData(userOrgID)
+
 			orgid := strconv.FormatInt(userOrgID, 10)
 			KeID :=int64(sgjpatietnmodelfour.ID + 3)
 			OfficeID := strconv.FormatInt(KeID, 10)
+			magiclinktwo := models.SgjPatientMagiclink{
+				UserOrgId:     userOrgID,
+				Linktype:      2,
+				Instationlink: KeID,
+				Ctime:         time.Now().Unix(),
+				Status:        1,
+			}
+			AddMacLinkAddress(&magiclinktwo)
+			patientMagiclinktwo, err := GetMacLinkAddressByLastData(userOrgID)
 			ActiID :=int64(sgjpatietnmodelfour.ID + 5)
+			magiclinkthree := models.SgjPatientMagiclink{
+				UserOrgId:     userOrgID,
+				Linktype:      2,
+				Instationlink: ActiID,
+				Ctime:         time.Now().Unix(),
+				Status:        1,
+			}
+			AddMacLinkAddress(&magiclinkthree)
+			patientMagiclinkthree, err := GetMacLinkAddressByLastData(userOrgID)
 			ActisID := strconv.FormatInt(ActiID, 10)
 			ActivID :=int64(sgjpatietnmodelfour.ID + 6)
+			magiclinkfour := models.SgjPatientMagiclink{
+				UserOrgId:     userOrgID,
+				Linktype:      2,
+				Instationlink: ActivID,
+				Ctime:         time.Now().Unix(),
+				Status:        1,
+			}
+			AddMacLinkAddress(&magiclinkfour)
+			patientMagiclinkfour, err := GetMacLinkAddressByLastData(userOrgID)
 			ActivsID := strconv.FormatInt(ActivID, 10)
 			EnviID := int64(sgjpatietnmodelfour.ID + 4)
+			magiclinkfive := models.SgjPatientMagiclink{
+				UserOrgId:     userOrgID,
+				Linktype:      2,
+				Instationlink: EnviID,
+				Ctime:         time.Now().Unix(),
+				Status:        1,
+			}
+			AddMacLinkAddress(&magiclinkfive)
+			patientMagiclinkfive, err := GetMacLinkAddressByLastData(userOrgID)
 			EniviIDs := strconv.FormatInt(EnviID, 10)
 			editmargin := models.SgjPatientEditmargin{
 				Margtitle: "医院介绍",
@@ -146,9 +192,10 @@ func AutoCreateDefalutSchedules()  {
 				Status:    1,
 				Ctime:     time.Now().Unix(),
 				Modeid:    sgjpatietnmodelfour.ID,
-				Jumpset:2,
-				//Marginaddress:"http://jk.test.sgjyun.com/#/hospitalIntroduction?id="+modeid+"&orgid="+orgid ,
-				Marginaddress:"http://microweb.kuyicloud.com/#/hospitalIntroduction?id="+modeid+"&orgid="+orgid ,
+				Jumpset:1,
+				Marginaddress:"http://jk.test.sgjyun.com/#/hospitalIntroduction?id="+modeid+"&orgid="+orgid ,
+				Linkid:patientMagiclink.ID,
+				//Marginaddress:"http://microweb.kuyicloud.com/#/hospitalIntroduction?id="+modeid+"&orgid="+orgid ,
 			}
 			err = AddEditMargin(&editmargin)
 			patientEditmargin := models.SgjPatientEditmargin{
@@ -158,9 +205,10 @@ func AutoCreateDefalutSchedules()  {
 				Status:    1,
 				Ctime:     time.Now().Unix(),
 				Modeid:    sgjpatietnmodelfour.ID,
-				Jumpset:2,
-				//Marginaddress:"http://jk.test.sgjyun.com/#/medicalTeam?id="+OfficeID+"&orgid="+orgid,
-				Marginaddress:"http://microweb.kuyicloud.com/#/medicalTeam?id="+OfficeID+"&orgid="+orgid,
+				Jumpset:1,
+				Marginaddress:"http://jk.test.sgjyun.com/#/medicalTeam?id="+OfficeID+"&orgid="+orgid,
+				//Marginaddress:"http://microweb.kuyicloud.com/#/medicalTeam?id="+OfficeID+"&orgid="+orgid,
+				Linkid:patientMagiclinktwo.ID,
 			}
 			err = AddEditMargin(&patientEditmargin)
 			sgjPatientEditmargin := models.SgjPatientEditmargin{
@@ -170,9 +218,10 @@ func AutoCreateDefalutSchedules()  {
 				Status:    1,
 				Ctime:     time.Now().Unix(),
 				Modeid:    sgjpatietnmodelfour.ID,
-				Jumpset:2,
-				//Marginaddress:"http://jk.test.sgjyun.com/#/news?id="+ActisID+"&orgid="+orgid,
-				Marginaddress:"http://microweb.kuyicloud.com/#/news?id="+ActisID+"&orgid="+orgid,
+				Jumpset:1,
+				Marginaddress:"http://jk.test.sgjyun.com/#/news?id="+ActisID+"&orgid="+orgid,
+				//Marginaddress:"http://microweb.kuyicloud.com/#/news?id="+ActisID+"&orgid="+orgid,
+				Linkid:patientMagiclinkthree.ID,
 			}
 			AddEditMargin(&sgjPatientEditmargin)
 			patienteditmarginfour := models.SgjPatientEditmargin{
@@ -182,9 +231,10 @@ func AutoCreateDefalutSchedules()  {
 				Status:    1,
 				Ctime:     time.Now().Unix(),
 				Modeid:    sgjpatietnmodelfour.ID,
-				Jumpset:2,
-				//Marginaddress:"http://jk.test.sgjyun.com/#/activity?id="+ActivsID+"&orgid="+orgid,
-				Marginaddress:"http://microweb.kuyicloud.com/#/activity?id="+ActivsID+"&orgid="+orgid,
+				Jumpset:1,
+				Marginaddress:"http://jk.test.sgjyun.com/#/activity?id="+ActivsID+"&orgid="+orgid,
+				//Marginaddress:"http://microweb.kuyicloud.com/#/activity?id="+ActivsID+"&orgid="+orgid,
+				Linkid:patientMagiclinkfour.ID,
 			}
 			AddEditMargin(&patienteditmarginfour)
 			patienteditmarginfive := models.SgjPatientEditmargin{
@@ -194,9 +244,10 @@ func AutoCreateDefalutSchedules()  {
 				Status:    1,
 				Ctime:     time.Now().Unix(),
 				Modeid:    sgjpatietnmodelfour.ID,
-				Jumpset:2,
-				//Marginaddress:"http://jk.test.sgjyun.com/#/departmentEnvironment?id="+EniviIDs+"&orgid="+orgid,
-				Marginaddress:"http://microweb.kuyicloud.com/#/departmentEnvironment?id="+EniviIDs+"&orgid="+orgid,
+				Jumpset:1,
+				Marginaddress:"http://jk.test.sgjyun.com/#/departmentEnvironment?id="+EniviIDs+"&orgid="+orgid,
+				//Marginaddress:"http://microweb.kuyicloud.com/#/departmentEnvironment?id="+EniviIDs+"&orgid="+orgid,
+				Linkid:patientMagiclinkfive.ID,
 			}
 			AddEditMargin(&patienteditmarginfive)
 			patienteditmarginsix := models.SgjPatientEditmargin{
@@ -206,7 +257,7 @@ func AutoCreateDefalutSchedules()  {
 				Status:    1,
 				Ctime:     time.Now().Unix(),
 				Modeid:    sgjpatietnmodelfour.ID,
-				Jumpset:2,
+				Jumpset:1,
 			}
 			AddEditMargin(&patienteditmarginsix)
 
@@ -217,7 +268,7 @@ func AutoCreateDefalutSchedules()  {
 				Status:    1,
 				Ctime:     time.Now().Unix(),
 				Modeid:    sgjpatietnmodelfour.ID,
-				Jumpset:2,
+				Jumpset:1,
 			}
 			AddEditMargin(&patienteditmarginserven)
 
@@ -266,7 +317,7 @@ func AutoCreateDefalutSchedules()  {
 			datathree, err := GetQueryModelByLastData(userOrgID)
 			offices := models.SgjPatientOffices{
 				Title:     "科室介绍",
-				Sort:      4,
+				Sort:      8,
 				UserOrgId: userOrgID,
 				Ctime:     time.Now().Unix(),
 				Status:    1,
@@ -408,6 +459,8 @@ func AutoCreateDefalutSchedules()  {
 				Modeid:    patientOrdmodel.ID,
 				UserOrgId: userOrgID,
 				Ctime:     time.Now().Unix(),
+				Status:1,
+				Piclink:1,
 			}
 			AddConRotation(&conrotation)
 
@@ -774,13 +827,15 @@ func GetHospital(Orgid int64)(hostital []*models.SgjPatientHospital,err error)
 
 func GetData(orgid int64)(model []*models.SgjPatientModel,err error)  {
 	db := service.PatientReadDB().Table("sgj_patient_model as m").Where(" m.status = ?", 1)
+	dbs := service.PatientReadDB().Table("sgj_patient_editpiclink as s")
 	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
+		Preload("Editdoctor").Preload("Editmargin").Preload("Enviroimages").Preload("PatientEditpiclink", func(db *gorm.DB) *gorm.DB{
+		return dbs.Select("s.id,s.images,s.sort,s.piclink,s.linkaddress,s.user_org_id,s.status,s.ctime,s.mtime,s.modeid,s.img_show,s.linkid").Order("sort")
+	}).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
 	fmt.Println("err二二err二二err二二err二二err二二err",err)
 
 		return
@@ -976,11 +1031,13 @@ func DeleteModleByModeID(orgid int64,mid int64)(error)  {
 
 func GetOrederModel(orgid int64)(model []*models.SgjPatientOrdmodel,err error)  {
 	db := service.PatientReadDB().Table("sgj_patient_ordmodel as o").Where("o.status = ?", 1)
+	con := service.PatientReadDB().Table("sgj_patient_conrotation as s")
 	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
+	err = db.Preload("Hosaddress").Preload("Connectway").Preload("Worktime").Preload("Rideway").Preload("Oldration").Preload("Conrotation", func(db *gorm.DB) *gorm.DB{
+		return con.Select("s.id,s.images,s.sort,s.piclink,s.linkaddress,s.user_org_id,s.status,s.ctime,s.mtime,s.modeid,s.img_show,s.linkid").Order("sort")
+	}).Select("o.id,o.title,o.sort,o.ctime,o.mtime,o.mode_type").Order("sort").Find(&model).Error
     fmt.Println("sql错误是什么",err)
 	return
 
@@ -1128,7 +1185,7 @@ func GetEditRotationImages(id int64,orgid int64)(models.SgjPatientOrdmodel,error
 }
 
 func GetEditConrotion(id int64,orgid int64)(conrotation []models.SgjPatientConrotation, err error)  {
-	err = service.PatientReadDB().Model(conrotation).Where("modeid = ? AND user_org_id = ?", id, orgid).Find(&conrotation).Error
+	err = service.PatientReadDB().Model(conrotation).Where("modeid = ? AND user_org_id = ?", id, orgid).Order("sort").Find(&conrotation).Error
 	return conrotation,err
 }
 
@@ -1138,8 +1195,14 @@ func EditVisibleById(id int64,orgid int64)(models.SgjPatientConrotation,error)
 	return conrotation,err
 }
 
+func UpdatedConAddress(id int64,orgid int64)(models.SgjPatientConlinkaddress,error)  {
+	conlinkaddress := models.SgjPatientConlinkaddress{}
+	err := service.PatientWriteDB().Model(&conlinkaddress).Where("id = ? AND user_org_id = ?", id, orgid).Update(map[string]interface{}{"defineaddress": ""}).Error
+	return conlinkaddress,err
+}
+
 func UpdateEditpic(id int64,orgid int64,conrotation models.SgjPatientConrotation) error  {
-	err := service.PatientWriteDB().Model(conrotation).Where("id = ? AND user_org_id = ? AND status = ?", id, orgid, 1).Update(map[string]interface{}{"images": conrotation.Images, "sort": conrotation.Sort, "piclink": conrotation.Piclink, "linkaddress": conrotation.Linkaddress}).Error
+	err := service.PatientWriteDB().Model(conrotation).Where("id = ? AND user_org_id = ? AND status = ?", id, orgid, 1).Update(map[string]interface{}{"images": conrotation.Images, "sort": conrotation.Sort, "piclink": conrotation.Piclink, "linkaddress": conrotation.Linkaddress,"linkid":conrotation.Linkid}).Error
 	return  err
 }
 
@@ -1215,12 +1278,19 @@ func GetQueryEditpiclink(modeid int64,orgid int64)(editpiclink []models.SgjPatie
 
 }
 
+func UpdatedPatientLinkAddress(id int64,orgid int64)(models.SgjPatientLinkaddress,error)  {
+	linkaddress := models.SgjPatientLinkaddress{}
+	err := service.PatientReadDB().Model(&linkaddress).Where("id = ? AND user_org_id = ? AND status = ?", id, orgid, 1).Update(map[string]interface{}{"defineaddress":"","status": 0}).Error
+	return linkaddress,err
+}
+
 func UpdateEditPatPicLink(id int64,orgid int64,editpiclink models.SgjPatientEditpiclink)(error)  {
 
 	err := service.PatientWriteDB().Model(editpiclink).Where("id = ? AND user_org_id =? AND status = ?", id, orgid, 1).Update(map[string]interface{}{"images": editpiclink.Images, "sort": editpiclink.Sort, "piclink": editpiclink.Piclink, "linkaddress": editpiclink.Linkaddress,"linkid":editpiclink.Linkid, "mtime": time.Now().Unix()}).Error
 	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
@@ -1531,7 +1601,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 linkaddress = ?", orgid, id).Find(&magiclink).Error
+	err := service.PatientReadDB().Where("user_org_id = ? AND id = ?", orgid, id).Find(&magiclink).Error
 	return magiclink,err
 }
 
@@ -1567,6 +1637,12 @@ func AddMacLinkAddress(magiclink *models.SgjPatientMagiclink)error  {
 	return  err
 }
 
+func GetMacLinkAddressByLastData(orgid int64)(models.SgjPatientMagiclink,error)  {
+	magiclink := models.SgjPatientMagiclink{}
+	err := service.PatientReadDB().Model(&magiclink).Where("user_org_id = ? AND status = ?", orgid, 1).Find(&magiclink).Error
+	return  magiclink,err
+}
+
 func AddNavitaionLinkAddress(navgationlink *models.PatientNavgationlink)error  {
 	err := service.PatientWriteDB().Create(&navgationlink).Error
 	return  err
@@ -1783,6 +1859,12 @@ func UpdatedConlinkAddress(id int64,orgid int64,conlinkaddress models.SgjPatient
 	return  err
 }
 
+func AddConlinkAddress(conlinkaddress *models.SgjPatientConlinkaddress) error {
+
+	err := service.PatientWriteDB().Create(&conlinkaddress).Error
+	return err
+}
+
 func UpdatedConrotation(id int64,orgid int64,conrotation models.SgjPatientConrotation) error {
 	err := service.PatientReadDB().Model(&conrotation).Where("id=? AND user_org_id = ?", id, orgid).Update(map[string]interface{}{"images": conrotation.Images, "sort": conrotation.Sort, "piclink": conrotation.Piclink, "linkaddress": conrotation.Linkaddress, "mtime": time.Now().Unix()}).Error
 	return  err