ホーム エクスプローラ ヘルプ
登録 サインイン
zhangbj
/
scrm-go
Watch 1
Star 0
Fork 0
コード 課題 0 プルリクエスト 0 リリース 0 Wiki Activity
ソースを参照

微网站

xiaoming_global 5 年 前
親
7cec96d377
コミット
637d7a109e
共有7 個のファイルを変更した、289 個の追加 と 196 個の削除を含む
分割表示 差分情報を表示
  1. 155 167
      .idea/workspace.xml
  2. 2 2
      conf/app.conf
  3. 1 0
      controllers/micro/micro_controller.go
  4. 3 0
      controllers/micro/router_collector.go
  5. 18 1
      controllers/site/site_controller.go
  6. 2 0
      routers/router.go
  7. 108 26
      service/site_service/site_microwebsite_service.go

+ 155 - 167
.idea/workspace.xml ファイルの表示 

@@ -5,7 +5,9 @@
5 5 
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 6 
       <change beforePath="$PROJECT_DIR$/conf/app.conf" beforeDir="false" afterPath="$PROJECT_DIR$/conf/app.conf" afterDir="false" />
7 7 
       <change beforePath="$PROJECT_DIR$/controllers/micro/micro_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/micro/micro_controller.go" afterDir="false" />
8 
-      <change beforePath="$PROJECT_DIR$/service/micro_service/micro_service.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/micro_service/micro_service.go" afterDir="false" />
8 
+      <change beforePath="$PROJECT_DIR$/controllers/micro/router_collector.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/micro/router_collector.go" afterDir="false" />
9 
+      <change beforePath="$PROJECT_DIR$/controllers/site/site_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/site/site_controller.go" afterDir="false" />
10 
+      <change beforePath="$PROJECT_DIR$/routers/router.go" beforeDir="false" afterPath="$PROJECT_DIR$/routers/router.go" afterDir="false" />
9 11 
       <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" />
10 12 
     </list>
11 13 
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
 
@@ -17,89 +19,89 @@
17 19 
   </component>
18 20 
   <component name="FileEditorManager">
19 21 
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
20 
-      <file leaf-file-name="app.conf" pinned="false" current-in-tab="false">
21 
-        <entry file="file://$PROJECT_DIR$/conf/app.conf">
22 
+      <file leaf-file-name="micro_controller.go" pinned="false" current-in-tab="false">
23 
+        <entry file="file://$PROJECT_DIR$/controllers/micro/micro_controller.go">
22 24 
           <provider selected="true" editor-type-id="text-editor">
23 
-            <state relative-caret-position="44">
24 
-              <caret line="2" column="15" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
25 
+            <state relative-caret-position="101">
26 
+              <caret line="7" column="1" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
27 
+              <folding>
28 
+                <element signature="e#15#104#0" expanded="true" />
29 
+              </folding>
25 30 
             </state>
26 31 
           </provider>
27 32 
         </entry>
28 33 
       </file>
29 
-      <file leaf-file-name="micro_service.go" pinned="false" current-in-tab="false">
30 
-        <entry file="file://$PROJECT_DIR$/service/micro_service/micro_service.go">
34 
+      <file leaf-file-name="router.go" pinned="false" current-in-tab="false">
35 
+        <entry file="file://$PROJECT_DIR$/routers/router.go">
31 36 
           <provider selected="true" editor-type-id="text-editor">
32 
-            <state relative-caret-position="308">
33 
-              <caret line="41" selection-start-line="41" selection-end-line="41" />
34 
-              <folding>
35 
-                <element signature="e#23#71#0" expanded="true" />
36 
-              </folding>
37 
+            <state relative-caret-position="154">
38 
+              <caret line="35" column="26" selection-start-line="35" selection-start-column="11" selection-end-line="35" selection-end-column="26" />
37 39 
             </state>
38 40 
           </provider>
39 41 
         </entry>
40 42 
       </file>
41 
-      <file leaf-file-name="micro_controller.go" pinned="false" current-in-tab="false">
42 
-        <entry file="file://$PROJECT_DIR$/controllers/micro/micro_controller.go">
43 
+      <file leaf-file-name="base_controller.go" pinned="false" current-in-tab="false">
44 
+        <entry file="file://$PROJECT_DIR$/controllers/base_controller.go">
43 45 
           <provider selected="true" editor-type-id="text-editor">
44 
-            <state relative-caret-position="384">
45 
-              <caret line="297" column="50" selection-start-line="297" selection-start-column="37" selection-end-line="297" selection-end-column="50" />
46 
+            <state relative-caret-position="44">
47 
+              <caret line="2" column="7" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
46 48 
             </state>
47 49 
           </provider>
48 50 
         </entry>
49 51 
       </file>
50 
-      <file leaf-file-name="router.go" pinned="false" current-in-tab="false">
51 
-        <entry file="file://$PROJECT_DIR$/routers/router.go">
52 
+      <file leaf-file-name="router_collector.go" pinned="false" current-in-tab="false">
53 
+        <entry file="file://$PROJECT_DIR$/controllers/micro/router_collector.go">
52 54 
           <provider selected="true" editor-type-id="text-editor">
53 
-            <state relative-caret-position="22">
54 
-              <caret line="24" column="203" selection-start-line="24" selection-start-column="203" selection-end-line="24" selection-end-column="203" />
55 
+            <state relative-caret-position="132">
56 
+              <caret line="6" column="16" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="16" />
55 57 
             </state>
56 58 
           </provider>
57 59 
         </entry>
58 60 
       </file>
59 
-      <file leaf-file-name="site_models.go" pinned="false" current-in-tab="false">
60 
-        <entry file="file://$PROJECT_DIR$/models/site_models.go">
61 
+      <file leaf-file-name="app.conf" pinned="false" current-in-tab="false">
62 
+        <entry file="file://$PROJECT_DIR$/conf/app.conf">
61 63 
           <provider selected="true" editor-type-id="text-editor">
62 
-            <state relative-caret-position="22">
63 
-              <caret line="127" column="45" selection-start-line="127" selection-start-column="45" selection-end-line="127" selection-end-column="45" />
64 
+            <state relative-caret-position="198">
65 
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
64 66 
             </state>
65 67 
           </provider>
66 68 
         </entry>
67 69 
       </file>
68 
-      <file leaf-file-name="site_controller.go" pinned="false" current-in-tab="true">
69 
-        <entry file="file://$PROJECT_DIR$/controllers/site/site_controller.go">
70 
+      <file leaf-file-name="router_collector.go" pinned="false" current-in-tab="false">
71 
+        <entry file="file://$PROJECT_DIR$/controllers/article/router_collector.go">
70 72 
           <provider selected="true" editor-type-id="text-editor">
71 
-            <state relative-caret-position="382">
72 
-              <caret line="1805" column="38" selection-start-line="1805" selection-start-column="31" selection-end-line="1805" selection-end-column="38" />
73 
-              <folding>
74 
-                <element signature="e#14#224#0" expanded="true" />
75 
-              </folding>
73 
+            <state relative-caret-position="66">
74 
+              <caret line="3" column="18" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="18" />
76 75 
             </state>
77 76 
           </provider>
78 77 
         </entry>
79 78 
       </file>
80 
-      <file leaf-file-name="site_microwebsite_service.go" pinned="false" current-in-tab="false">
81 
-        <entry file="file://$PROJECT_DIR$/service/site_service/site_microwebsite_service.go">
79 
+      <file leaf-file-name="article_controller.go" pinned="false" current-in-tab="false">
80 
+        <entry file="file://$PROJECT_DIR$/controllers/article/article_controller.go">
82 81 
           <provider selected="true" editor-type-id="text-editor">
83 
-            <state relative-caret-position="176">
84 
-              <caret line="17" column="4" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="4" />
82 
+            <state relative-caret-position="1144">
83 
+              <caret line="64" column="37" selection-start-line="64" selection-start-column="16" selection-end-line="64" selection-end-column="37" />
85 84 
             </state>
86 85 
           </provider>
87 86 
         </entry>
88 87 
       </file>
89 
-      <file leaf-file-name="article_category_service.go" pinned="false" current-in-tab="false">
90 
-        <entry file="file://$PROJECT_DIR$/service/article_service/article_category_service.go">
88 
+      <file leaf-file-name="base_api_controller.go" pinned="false" current-in-tab="true">
89 
+        <entry file="file://$PROJECT_DIR$/controllers/base_api_controller.go">
91 90 
           <provider selected="true" editor-type-id="text-editor">
92 
-            <state relative-caret-position="107">
93 
-              <caret line="42" column="4" selection-start-line="42" selection-start-column="4" selection-end-line="51" selection-end-column="9" />
91 
+            <state relative-caret-position="-152">
92 
+              <caret line="48" column="35" selection-start-line="48" selection-start-column="35" selection-end-line="48" selection-end-column="35" />
94 93 
             </state>
95 94 
           </provider>
96 95 
         </entry>
97 96 
       </file>
98 
-      <file leaf-file-name="user_models.go" pinned="false" current-in-tab="false">
99 
-        <entry file="file://$PROJECT_DIR$/models/user_models.go">
97 
+      <file leaf-file-name="site_controller.go" pinned="false" current-in-tab="false">
98 
+        <entry file="file://$PROJECT_DIR$/controllers/site/site_controller.go">
100 99 
           <provider selected="true" editor-type-id="text-editor">
101 
-            <state relative-caret-position="12">
102 
-              <caret line="38" column="5" selection-start-line="38" selection-start-column="5" selection-end-line="38" selection-end-column="5" />
100 
+            <state relative-caret-position="73436">
101 
+              <caret line="3351" column="28" selection-start-line="3351" selection-start-column="28" selection-end-line="3351" selection-end-column="28" />
102 
+              <folding>
103 
+                <element signature="e#14#224#0" expanded="true" />
104 
+              </folding>
103 105 
             </state>
104 106 
           </provider>
105 107 
         </entry>
 
@@ -115,23 +117,6 @@
115 117 
   </component>
116 118 
   <component name="FindInProjectRecents">
117 119 
     <findStrings>
118 
-      <find>GetArititys</find>
119 
-      <find>AddActivity</find>
120 
-      <find>AddActivitys</find>
121 
-      <find>AddArticelist</find>
122 
-      <find>AddRotationpic</find>
123 
-      <find>GetOrderModel</find>
124 
-      <find>GetContactUsModel</find>
125 
-      <find>AddConnection</find>
126 
-      <find>SaveArticeDetail</find>
127 
-      <find>GetArticlistDetail</find>
128 
-      <find>AddConnetion</find>
129 
-      <find>GetArticlelist</find>
130 
-      <find>AddMagicLinkDataTwo</find>
131 
-      <find>/api/site/addmagiclinkdata</find>
132 
-      <find>Linkaddress</find>
133 
-      <find>formatInt</find>
134 
-      <find>GetPatienModelByModelId</find>
135 120 
       <find>AddMagiclinkData</find>
136 121 
       <find>GetCategorys</find>
137 122 
       <find>/api/acticle/getCategorys</find>
 
@@ -143,8 +128,25 @@
143 128 
       <find>EditStaffInfo</find>
144 129 
       <find>/api/staff/EditStaffInfo</find>
145 130 
       <find>GetEnviromentImages</find>
146 
-      <find>GetData</find>
147 131 
       <find>GetDoctorInfo</find>
132 
+      <find>GetData</find>
133 
+      <find>GetOrderModel</find>
134 
+      <find>AddEditpic</find>
135 
+      <find>GetEnImagesThree</find>
136 
+      <find>GetEditRotationimages</find>
137 
+      <find>GetRotationDetail</find>
138 
+      <find>AddMacLinkAddress</find>
139 
+      <find>GetMacLinkAddressByLastData</find>
140 
+      <find>/api/site/getLikeMacAddressById</find>
141 
+      <find>GetLikeMacAddressById</find>
142 
+      <find>/api/site/updatesingleform</find>
143 
+      <find>UpdateSingleForm</find>
144 
+      <find>/api/site/updatepicformthree</find>
145 
+      <find>AddLinkAddressThree</find>
146 
+      <find>/api/site/saveditpic</find>
147 
+      <find>SaveEditpic</find>
148 
+      <find>UpdatePicFformThree</find>
149 
+      <find>AdminCtlRegistRouters</find>
148 150 
     </findStrings>
149 151 
   </component>
150 152 
   <component name="GOROOT" path="C:\Go" />
 
@@ -162,24 +164,24 @@
162 164 
         <option value="$PROJECT_DIR$/service/redis.go" />
163 165 
         <option value="$PROJECT_DIR$/jobcron/open_wechat_job.go" />
164 166 
         <option value="$PROJECT_DIR$/controllers/global/open_wechat_controller.go" />
165 
-        <option value="$PROJECT_DIR$/controllers/micro/router_collector.go" />
166 167 
         <option value="$PROJECT_DIR$/controllers/members/members_controller.go" />
167 168 
         <option value="$PROJECT_DIR$/models/user_customer_models.go" />
168 169 
         <option value="$PROJECT_DIR$/service/member_service/member_service.go" />
169 170 
         <option value="$PROJECT_DIR$/controllers/mpwechat/menu_controller.go" />
170 171 
         <option value="$PROJECT_DIR$/service/wechat_service/open_wechat_service.go" />
171 172 
         <option value="$PROJECT_DIR$/controllers/article/article_controller.go" />
172 
-        <option value="$PROJECT_DIR$/routers/router.go" />
173 173 
         <option value="$PROJECT_DIR$/main.go" />
174 174 
         <option value="$PROJECT_DIR$/models/activity_models.go" />
175 175 
         <option value="$PROJECT_DIR$/models/site_models.go" />
176 176 
         <option value="$PROJECT_DIR$/models/article_models.go" />
177 
-        <option value="$PROJECT_DIR$/controllers/site/site_controller.go" />
178 
-        <option value="$PROJECT_DIR$/controllers/micro/micro_controller.go" />
179 177 
         <option value="$PROJECT_DIR$/service/article_service/article_category_service.go" />
180 178 
         <option value="$PROJECT_DIR$/service/micro_service/micro_service.go" />
181 
-        <option value="$PROJECT_DIR$/conf/app.conf" />
182 179 
         <option value="$PROJECT_DIR$/service/site_service/site_microwebsite_service.go" />
180 
+        <option value="$PROJECT_DIR$/controllers/site/site_controller.go" />
181 
+        <option value="$PROJECT_DIR$/conf/app.conf" />
182 
+        <option value="$PROJECT_DIR$/routers/router.go" />
183 
+        <option value="$PROJECT_DIR$/controllers/micro/router_collector.go" />
184 
+        <option value="$PROJECT_DIR$/controllers/micro/micro_controller.go" />
183 185 
       </list>
184 186 
     </option>
185 187 
   </component>
 
@@ -189,17 +191,18 @@
189 191 
     <detection-done>true</detection-done>
190 192 
     <sorting>DEFINITION_ORDER</sorting>
191 193 
   </component>
192 
-  <component name="ProjectFrameBounds" extendedState="6">
193 
-    <option name="x" value="-10" />
194 
-    <option name="y" value="-10" />
194 
+  <component name="ProjectFrameBounds">
195 
+    <option name="x" value="56" />
196 
+    <option name="y" value="57" />
195 197 
     <option name="width" value="1785" />
196 
-    <option name="height" value="615" />
198 
+    <option name="height" value="1003" />
197 199 
   </component>
198 200 
   <component name="ProjectView">
199 201 
     <navigator proportions="" version="1">
200 202 
       <foldersAlwaysOnTop value="true" />
201 203 
     </navigator>
202 204 
     <panes>
205 
+      <pane id="Scope" />
203 206 
       <pane id="ProjectPane">
204 207 
         <subPane>
205 208 
           <expand>
 
@@ -220,26 +223,12 @@
220 223 
             <path>
221 224 
               <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
222 225 
               <item name="SCRM" type="462c0819:PsiDirectoryNode" />
223 
-              <item name="controllers" type="462c0819:PsiDirectoryNode" />
224 
-              <item name="micro" type="462c0819:PsiDirectoryNode" />
225 
-            </path>
226 
-            <path>
227 
-              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
228 
-              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
229 
-              <item name="controllers" type="462c0819:PsiDirectoryNode" />
230 
-              <item name="site" type="462c0819:PsiDirectoryNode" />
231 
-            </path>
232 
-            <path>
233 
-              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
234 
-              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
235 
-              <item name="controllers" type="462c0819:PsiDirectoryNode" />
236 
-              <item name="staff" type="462c0819:PsiDirectoryNode" />
226 
+              <item name="routers" type="462c0819:PsiDirectoryNode" />
237 227 
             </path>
238 228 
           </expand>
239 229 
           <select />
240 230 
         </subPane>
241 231 
       </pane>
242 
-      <pane id="Scope" />
243 232 
     </panes>
244 233 
   </component>
245 234 
   <component name="PropertiesComponent">
 
@@ -249,7 +238,7 @@
249 238 
     <property name="configurable.Project.GOPATH.is.expanded" value="true" />
250 239 
     <property name="go.gopath.indexing.explicitly.defined" value="true" />
251 240 
     <property name="go.sdk.automatically.set" value="true" />
252 
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
241 
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../KYA" />
253 242 
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
254 243 
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
255 244 
     <property name="settings.editor.selected.configurable" value="com.goide.configuration.GoLibrariesConfigurableProvider" />
 
@@ -272,19 +261,17 @@
272 261 
     </option>
273 262 
   </component>
274 263 
   <component name="ToolWindowManager">
275 
-    <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
276 
-    <editor active="true" />
264 
+    <frame x="45" y="46" width="1428" height="802" extended-state="0" />
277 265 
     <layout>
278 
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.6625767" visible="true" weight="0.18766756" />
266 
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.62564105" visible="true" weight="0.24014598" />
279 267 
       <window_info anchor="bottom" id="TODO" order="6" />
280 
-      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.21045576" side_tool="true" visible="true" weight="0.30242512" />
268 
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.14379562" side_tool="true" visible="true" weight="0.41353384" />
281 269 
       <window_info anchor="right" id="Database" order="3" />
282 
-      <window_info anchor="bottom" id="Find" order="1" />
283 270 
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
284 271 
       <window_info anchor="bottom" id="Version Control" order="9" />
285 272 
       <window_info anchor="bottom" id="Run" order="2" />
286 
-      <window_info id="Structure" order="1" sideWeight="0.33742332" side_tool="true" visible="true" weight="0.18766756" />
287 
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.7895442" visible="true" weight="0.30242512" />
273 
+      <window_info id="Structure" order="1" sideWeight="0.37435898" side_tool="true" visible="true" weight="0.24014598" />
274 
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.8562044" visible="true" weight="0.41353384" />
288 275 
       <window_info id="Favorites" order="2" side_tool="true" />
289 276 
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
290 277 
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
 
@@ -293,6 +280,7 @@
293 280 
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
294 281 
       <window_info anchor="bottom" id="Message" order="0" />
295 282 
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
283 
+      <window_info anchor="bottom" id="Find" order="1" />
296 284 
     </layout>
297 285 
   </component>
298 286 
   <component name="TypeScriptGeneratedFilesManager">
 
@@ -307,27 +295,6 @@
307 295 
     </breakpoint-manager>
308 296 
   </component>
309 297 
   <component name="editorHistoryManager">
310 
-    <entry file="file://$PROJECT_DIR$/conf/app.conf">
311 
-      <provider selected="true" editor-type-id="text-editor">
312 
-        <state relative-caret-position="2596">
313 
-          <caret line="118" column="16" selection-start-line="118" selection-start-column="16" selection-end-line="118" selection-end-column="16" />
314 
-        </state>
315 
-      </provider>
316 
-    </entry>
317 
-    <entry file="file://$PROJECT_DIR$/routers/router.go">
318 
-      <provider selected="true" editor-type-id="text-editor">
319 
-        <state relative-caret-position="308">
320 
-          <caret line="30" column="32" selection-start-line="30" selection-start-column="32" selection-end-line="30" selection-end-column="32" />
321 
-        </state>
322 
-      </provider>
323 
-    </entry>
324 
-    <entry file="file://$PROJECT_DIR$/conf/app.conf">
325 
-      <provider selected="true" editor-type-id="text-editor">
326 
-        <state relative-caret-position="2596">
327 
-          <caret line="118" column="16" selection-start-line="118" selection-start-column="16" selection-end-line="118" selection-end-column="16" />
328 
-        </state>
329 
-      </provider>
330 
-    </entry>
331 298 
     <entry file="file://$PROJECT_DIR$/routers/router.go">
332 299 
       <provider selected="true" editor-type-id="text-editor">
333 300 
         <state relative-caret-position="132">
 
@@ -482,20 +449,6 @@
482 449 
         </state>
483 450 
       </provider>
484 451 
     </entry>
485 
-    <entry file="file://$PROJECT_DIR$/controllers/micro/router_collector.go">
486 
-      <provider selected="true" editor-type-id="text-editor">
487 
-        <state relative-caret-position="44">
488 
-          <caret line="2" column="24" selection-start-line="2" selection-start-column="24" selection-end-line="2" selection-end-column="24" />
489 
-        </state>
490 
-      </provider>
491 
-    </entry>
492 
-    <entry file="file://$PROJECT_DIR$/controllers/base_controller.go">
493 
-      <provider selected="true" editor-type-id="text-editor">
494 
-        <state relative-caret-position="-317">
495 
-          <caret line="8" selection-start-line="8" selection-end-line="8" />
496 
-        </state>
497 
-      </provider>
498 
-    </entry>
499 452 
     <entry file="file://$PROJECT_DIR$/controllers/site/router_collector.go">
500 453 
       <provider selected="true" editor-type-id="text-editor">
501 454 
         <state relative-caret-position="66">
 
@@ -503,13 +456,6 @@
503 456 
         </state>
504 457 
       </provider>
505 458 
     </entry>
506 
-    <entry file="file://$PROJECT_DIR$/controllers/base_api_controller.go">
507 
-      <provider selected="true" editor-type-id="text-editor">
508 
-        <state relative-caret-position="137">
509 
-          <caret line="8" column="5" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" />
510 
-        </state>
511 
-      </provider>
512 
-    </entry>
513 459 
     <entry file="file://$PROJECT_DIR$/service/member_service/models.go">
514 460 
       <provider selected="true" editor-type-id="text-editor">
515 461 
         <state relative-caret-position="110">
 
@@ -573,13 +519,6 @@
573 519 
         </state>
574 520 
       </provider>
575 521 
     </entry>
576 
-    <entry file="file://$PROJECT_DIR$/controllers/article/article_controller.go">
577 
-      <provider selected="true" editor-type-id="text-editor">
578 
-        <state relative-caret-position="6578">
579 
-          <caret line="311" column="58" selection-start-line="311" selection-start-column="47" selection-end-line="311" selection-end-column="58" />
580 
-        </state>
581 
-      </provider>
582 
-    </entry>
583 522 
     <entry file="file://$PROJECT_DIR$/models/article_models.go">
584 523 
       <provider selected="true" editor-type-id="text-editor">
585 524 
         <state relative-caret-position="286">
 
@@ -589,7 +528,7 @@
589 528 
     </entry>
590 529 
     <entry file="file://$PROJECT_DIR$/models/user_models.go">
591 530 
       <provider selected="true" editor-type-id="text-editor">
592 
-        <state relative-caret-position="12">
531 
+        <state relative-caret-position="836">
593 532 
           <caret line="38" column="5" selection-start-line="38" selection-start-column="5" selection-end-line="38" selection-end-column="5" />
594 533 
         </state>
595 534 
       </provider>
 
@@ -610,65 +549,114 @@
610 549 
     </entry>
611 550 
     <entry file="file://$PROJECT_DIR$/service/article_service/article_category_service.go">
612 551 
       <provider selected="true" editor-type-id="text-editor">
613 
-        <state relative-caret-position="107">
552 
+        <state relative-caret-position="792">
614 553 
           <caret line="42" column="4" selection-start-line="42" selection-start-column="4" selection-end-line="51" selection-end-column="9" />
615 554 
         </state>
616 555 
       </provider>
617 556 
     </entry>
618 
-    <entry file="file://$PROJECT_DIR$/service/site_service/site_microwebsite_service.go">
557 
+    <entry file="file://$PROJECT_DIR$/models/site_models.go">
619 558 
       <provider selected="true" editor-type-id="text-editor">
620 
-        <state relative-caret-position="176">
621 
-          <caret line="17" column="4" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="4" />
559 
+        <state relative-caret-position="6182">
560 
+          <caret line="281" column="15" selection-start-line="281" selection-start-column="4" selection-end-line="281" selection-end-column="15" />
622 561 
         </state>
623 562 
       </provider>
624 563 
     </entry>
625 
-    <entry file="file://$PROJECT_DIR$/conf/app.conf">
564 
+    <entry file="file://$PROJECT_DIR$/service/micro_service/micro_service.go">
626 565 
       <provider selected="true" editor-type-id="text-editor">
627 
-        <state relative-caret-position="44">
628 
-          <caret line="2" column="15" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
566 
+        <state relative-caret-position="330">
567 
+          <caret line="20" column="6" selection-start-line="18" selection-start-column="76" selection-end-line="20" selection-end-column="6" />
629 568 
         </state>
630 569 
       </provider>
631 570 
     </entry>
632 
-    <entry file="file://$PROJECT_DIR$/service/micro_service/micro_service.go">
571 
+    <entry file="file://$PROJECT_DIR$/service/site_service/site_microwebsite_service.go">
633 572 
       <provider selected="true" editor-type-id="text-editor">
634 
-        <state relative-caret-position="308">
635 
-          <caret line="41" selection-start-line="41" selection-end-line="41" />
573 
+        <state relative-caret-position="26180">
574 
+          <caret line="1199" column="57" selection-start-line="1199" selection-start-column="57" selection-end-line="1199" selection-end-column="57" />
575 
+        </state>
576 
+      </provider>
577 
+    </entry>
578 
+    <entry file="file://$PROJECT_DIR$/controllers/site/site_controller.go">
579 
+      <provider selected="true" editor-type-id="text-editor">
580 
+        <state relative-caret-position="73436">
581 
+          <caret line="3351" column="28" selection-start-line="3351" selection-start-column="28" selection-end-line="3351" selection-end-column="28" />
636 582 
           <folding>
637 
-            <element signature="e#23#71#0" expanded="true" />
583 
+            <element signature="e#14#224#0" expanded="true" />
638 584 
           </folding>
639 585 
         </state>
640 586 
       </provider>
641 587 
     </entry>
642 
-    <entry file="file://$PROJECT_DIR$/controllers/micro/micro_controller.go">
588 
+    <entry file="file://$PROJECT_DIR$/controllers/admin_user/admin_controller.go">
643 589 
       <provider selected="true" editor-type-id="text-editor">
644 
-        <state relative-caret-position="384">
645 
-          <caret line="297" column="50" selection-start-line="297" selection-start-column="37" selection-end-line="297" selection-end-column="50" />
590 
+        <state relative-caret-position="242">
591 
+          <caret line="22" column="34" selection-start-line="22" selection-start-column="34" selection-end-line="22" selection-end-column="34" />
646 592 
         </state>
647 593 
       </provider>
648 594 
     </entry>
649 
-    <entry file="file://$PROJECT_DIR$/routers/router.go">
595 
+    <entry file="file://$PROJECT_DIR$/controllers/admin_user/router_collector.go">
650 596 
       <provider selected="true" editor-type-id="text-editor">
651 
-        <state relative-caret-position="22">
652 
-          <caret line="24" column="203" selection-start-line="24" selection-start-column="203" selection-end-line="24" selection-end-column="203" />
597 
+        <state relative-caret-position="44">
598 
+          <caret line="2" column="5" selection-start-line="2" selection-start-column="5" selection-end-line="2" selection-end-column="5" />
653 599 
         </state>
654 600 
       </provider>
655 601 
     </entry>
656 
-    <entry file="file://$PROJECT_DIR$/models/site_models.go">
602 
+    <entry file="file://$PROJECT_DIR$/controllers/article/router_collector.go">
657 603 
       <provider selected="true" editor-type-id="text-editor">
658 
-        <state relative-caret-position="22">
659 
-          <caret line="127" column="45" selection-start-line="127" selection-start-column="45" selection-end-line="127" selection-end-column="45" />
604 
+        <state relative-caret-position="66">
605 
+          <caret line="3" column="18" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="18" />
660 606 
         </state>
661 607 
       </provider>
662 608 
     </entry>
663 
-    <entry file="file://$PROJECT_DIR$/controllers/site/site_controller.go">
609 
+    <entry file="file://$PROJECT_DIR$/controllers/article/article_controller.go">
610 
+      <provider selected="true" editor-type-id="text-editor">
611 
+        <state relative-caret-position="1144">
612 
+          <caret line="64" column="37" selection-start-line="64" selection-start-column="16" selection-end-line="64" selection-end-column="37" />
613 
+        </state>
614 
+      </provider>
615 
+    </entry>
616 
+    <entry file="file://$PROJECT_DIR$/conf/app.conf">
617 
+      <provider selected="true" editor-type-id="text-editor">
618 
+        <state relative-caret-position="198">
619 
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
620 
+        </state>
621 
+      </provider>
622 
+    </entry>
623 
+    <entry file="file://$PROJECT_DIR$/controllers/micro/router_collector.go">
624 
+      <provider selected="true" editor-type-id="text-editor">
625 
+        <state relative-caret-position="132">
626 
+          <caret line="6" column="16" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="16" />
627 
+        </state>
628 
+      </provider>
629 
+    </entry>
630 
+    <entry file="file://$PROJECT_DIR$/controllers/micro/micro_controller.go">
664 631 
       <provider selected="true" editor-type-id="text-editor">
665 
-        <state relative-caret-position="382">
666 
-          <caret line="1805" column="38" selection-start-line="1805" selection-start-column="31" selection-end-line="1805" selection-end-column="38" />
632 
+        <state relative-caret-position="101">
633 
+          <caret line="7" column="1" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
667 634 
           <folding>
668 
-            <element signature="e#14#224#0" expanded="true" />
635 
+            <element signature="e#15#104#0" expanded="true" />
669 636 
           </folding>
670 637 
         </state>
671 638 
       </provider>
672 639 
     </entry>
640 
+    <entry file="file://$PROJECT_DIR$/routers/router.go">
641 
+      <provider selected="true" editor-type-id="text-editor">
642 
+        <state relative-caret-position="154">
643 
+          <caret line="35" column="26" selection-start-line="35" selection-start-column="11" selection-end-line="35" selection-end-column="26" />
644 
+        </state>
645 
+      </provider>
646 
+    </entry>
647 
+    <entry file="file://$PROJECT_DIR$/controllers/base_controller.go">
648 
+      <provider selected="true" editor-type-id="text-editor">
649 
+        <state relative-caret-position="44">
650 
+          <caret line="2" column="7" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
651 
+        </state>
652 
+      </provider>
653 
+    </entry>
654 
+    <entry file="file://$PROJECT_DIR$/controllers/base_api_controller.go">
655 
+      <provider selected="true" editor-type-id="text-editor">
656 
+        <state relative-caret-position="-152">
657 
+          <caret line="48" column="35" selection-start-line="48" selection-start-column="35" selection-end-line="48" selection-end-column="35" />
658 
+        </state>
659 
+      </provider>
660 
+    </entry>
673 661 
   </component>
674 662 
 </project>

+ 2 - 2
conf/app.conf ファイルの表示 

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

+ 1 - 0
controllers/micro/micro_controller.go ファイルの表示 

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

+ 3 - 0
controllers/micro/router_collector.go ファイルの表示 

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

+ 18 - 1
controllers/site/site_controller.go ファイルの表示 

@@ -3345,11 +3345,19 @@ func (this *Microwebsite) SaveEditpic()  {
3345 3345 
 	fmt.Println("链接地址",linkaddress)
3346 3346 
 	modeid := int64(dataBody["modeid"].(float64))
3347 3347 
 	fmt.Println("天梦中",modeid)
3348 
+	linkid := int64(dataBody["linkid"].(float64))
3349 
+	fmt.Println("linkid",linkid)
3350 
+	if(piclink == 1){
3351 
+		conlinkaddress, err := site_service.UpdatedConAddress(linkid, userOrgID)
3352 
+		fmt.Println("错误",err)
3353 
+		fmt.Println("conlinkaddress",conlinkaddress)
3354 
+	}
3348 3355 
 	conrotation := models.SgjPatientConrotation{
3349 3356 
 		Images:      images,
3350 3357 
 		Sort:        sort,
3351 3358 
 		Piclink:     piclink,
3352 3359 
 		Linkaddress: linkaddress,
3360 
+		Linkid:linkid,
3353 3361 
 	}
3354 3362 
 	err = site_service.UpdateEditpic(id, userOrgID,conrotation)
3355 3363 
 	fmt.Println("err错误",err)
 
@@ -3532,6 +3540,11 @@ func (this *Microwebsite) UpdateSingleForm()  {
3532 3540 
     fmt.Println("链接地址",linkaddress)
3533 3541 
 	modelid := int64(dataBody["modeid"].(float64))
3534 3542 
 	linkid := int64(dataBody["linkid"].(float64))
3543 
+	if(piclink == 1){
3544 
+		patientLinkaddress, err := site_service.UpdatedPatientLinkAddress(linkid, userOrgID)
3545 
+		fmt.Println("hhhhhhhhhhhhhhhhhhherr错误",err)
3546 
+		fmt.Println("patientlinkaddress",patientLinkaddress)
3547 
+	}
3535 3548 
 	editpiclink := models.SgjPatientEditpiclink{
3536 3549 
 		Images:      images,
3537 3550 
 		Sort:        sort,
 
@@ -4444,8 +4457,12 @@ func (this *Microwebsite) UpdatePicFformThree()  {
4444 4457 
 	fmt.Println("defineaddress",defineaddress)
4445 4458 
 	conlinkaddress := models.SgjPatientConlinkaddress{
4446 4459 
 		Defineaddress: defineaddress,
4460 
+		UserOrgId:userOrgID,
4461 
+		Status:1,
4462 
+		Ctime:time.Now().Unix(),
4447 4463 
 	}
4448 
-	err = site_service.UpdatedConlinkAddress(id, userOrgID, conlinkaddress)
4464 
+	//err = site_service.UpdatedConlinkAddress(id, userOrgID, conlinkaddress)
4465 
+	err = site_service.AddConlinkAddress(&conlinkaddress)
4449 4466 
 	if err !=nil{
4450 4467 
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
4451 4468 
 		return

+ 2 - 0
routers/router.go ファイルの表示 

@@ -18,9 +18,11 @@ import (
18 18 
 	"SCRM/controllers/site"
19 19 
 	"SCRM/controllers/micro"
20 20 
 	"github.com/astaxie/beego/context"
21 
+	"fmt"
21 22 
 )
22 23
23 24 
 func init() {
25 
+	fmt.Println("开始啦看hi啊啊阿道夫放大阿发大是大非身份地方阿斯蒂芬撒旦法暗室逢灯沙发发顺丰阿萨法撒旦法沙发阿萨法阿发法啊阿打发打发")
24 26 
 	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
25 27 
 		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"},
26 28 
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},

+ 108 - 26
service/site_service/site_microwebsite_service.go ファイルの表示 

@@ -15,7 +15,7 @@ import (
15 15 
 var createDefalutDataCronJob *cron.Cron
16 16
17 17 
 func BeginAutoCreateDefalutData() {
18 
-	createDefalutDataCronJob.Start()
18 
+	//createDefalutDataCronJob.Start()
19 19 
 }
20 20
21 21 
 func init()  {
 
@@ -130,14 +130,60 @@ func AutoCreateDefalutSchedules()  {
130 130 
 			ID :=int64(sgjpatietnmodelfour.ID + 1)
131 131 
 			fmt.Println("ID是多少",ID)
132 132 
 			modeid := strconv.FormatInt(ID, 10)
133 
+			magiclink := models.SgjPatientMagiclink{
134 
+				UserOrgId:     userOrgID,
135 
+				Linktype:      2,
136 
+				Instationlink: ID,
137 
+				Ctime:         time.Now().Unix(),
138 
+				Status:        1,
139 
+			}
140 
+			AddMacLinkAddress(&magiclink)
141 
+			patientMagiclink, err := GetMacLinkAddressByLastData(userOrgID)
142 
+
133 143 
 			orgid := strconv.FormatInt(userOrgID, 10)
134 144 
 			KeID :=int64(sgjpatietnmodelfour.ID + 3)
135 145 
 			OfficeID := strconv.FormatInt(KeID, 10)
146 
+			magiclinktwo := models.SgjPatientMagiclink{
147 
+				UserOrgId:     userOrgID,
148 
+				Linktype:      2,
149 
+				Instationlink: KeID,
150 
+				Ctime:         time.Now().Unix(),
151 
+				Status:        1,
152 
+			}
153 
+			AddMacLinkAddress(&magiclinktwo)
154 
+			patientMagiclinktwo, err := GetMacLinkAddressByLastData(userOrgID)
136 155 
 			ActiID :=int64(sgjpatietnmodelfour.ID + 5)
156 
+			magiclinkthree := models.SgjPatientMagiclink{
157 
+				UserOrgId:     userOrgID,
158 
+				Linktype:      2,
159 
+				Instationlink: ActiID,
160 
+				Ctime:         time.Now().Unix(),
161 
+				Status:        1,
162 
+			}
163 
+			AddMacLinkAddress(&magiclinkthree)
164 
+			patientMagiclinkthree, err := GetMacLinkAddressByLastData(userOrgID)
137 165 
 			ActisID := strconv.FormatInt(ActiID, 10)
138 166 
 			ActivID :=int64(sgjpatietnmodelfour.ID + 6)
167 
+			magiclinkfour := models.SgjPatientMagiclink{
168 
+				UserOrgId:     userOrgID,
169 
+				Linktype:      2,
170 
+				Instationlink: ActivID,
171 
+				Ctime:         time.Now().Unix(),
172 
+				Status:        1,
173 
+			}
174 
+			AddMacLinkAddress(&magiclinkfour)
175 
+			patientMagiclinkfour, err := GetMacLinkAddressByLastData(userOrgID)
139 176 
 			ActivsID := strconv.FormatInt(ActivID, 10)
140 177 
 			EnviID := int64(sgjpatietnmodelfour.ID + 4)
178 
+			magiclinkfive := models.SgjPatientMagiclink{
179 
+				UserOrgId:     userOrgID,
180 
+				Linktype:      2,
181 
+				Instationlink: EnviID,
182 
+				Ctime:         time.Now().Unix(),
183 
+				Status:        1,
184 
+			}
185 
+			AddMacLinkAddress(&magiclinkfive)
186 
+			patientMagiclinkfive, err := GetMacLinkAddressByLastData(userOrgID)
141 187 
 			EniviIDs := strconv.FormatInt(EnviID, 10)
142 188 
 			editmargin := models.SgjPatientEditmargin{
143 189 
 				Margtitle: "医院介绍",
 
@@ -146,9 +192,10 @@ func AutoCreateDefalutSchedules()  {
146 192 
 				Status:    1,
147 193 
 				Ctime:     time.Now().Unix(),
148 194 
 				Modeid:    sgjpatietnmodelfour.ID,
149 
-				Jumpset:2,
150 
-				//Marginaddress:"http://jk.test.sgjyun.com/#/hospitalIntroduction?id="+modeid+"&orgid="+orgid ,
151 
-				Marginaddress:"http://microweb.kuyicloud.com/#/hospitalIntroduction?id="+modeid+"&orgid="+orgid ,
195 
+				Jumpset:1,
196 
+				Marginaddress:"http://jk.test.sgjyun.com/#/hospitalIntroduction?id="+modeid+"&orgid="+orgid ,
197 
+				Linkid:patientMagiclink.ID,
198 
+				//Marginaddress:"http://microweb.kuyicloud.com/#/hospitalIntroduction?id="+modeid+"&orgid="+orgid ,
152 199 
 			}
153 200 
 			err = AddEditMargin(&editmargin)
154 201 
 			patientEditmargin := models.SgjPatientEditmargin{
 
@@ -158,9 +205,10 @@ func AutoCreateDefalutSchedules()  {
158 205 
 				Status:    1,
159 206 
 				Ctime:     time.Now().Unix(),
160 207 
 				Modeid:    sgjpatietnmodelfour.ID,
161 
-				Jumpset:2,
162 
-				//Marginaddress:"http://jk.test.sgjyun.com/#/medicalTeam?id="+OfficeID+"&orgid="+orgid,
163 
-				Marginaddress:"http://microweb.kuyicloud.com/#/medicalTeam?id="+OfficeID+"&orgid="+orgid,
208 
+				Jumpset:1,
209 
+				Marginaddress:"http://jk.test.sgjyun.com/#/medicalTeam?id="+OfficeID+"&orgid="+orgid,
210 
+				//Marginaddress:"http://microweb.kuyicloud.com/#/medicalTeam?id="+OfficeID+"&orgid="+orgid,
211 
+				Linkid:patientMagiclinktwo.ID,
164 212 
 			}
165 213 
 			err = AddEditMargin(&patientEditmargin)
166 214 
 			sgjPatientEditmargin := models.SgjPatientEditmargin{
 
@@ -170,9 +218,10 @@ func AutoCreateDefalutSchedules()  {
170 218 
 				Status:    1,
171 219 
 				Ctime:     time.Now().Unix(),
172 220 
 				Modeid:    sgjpatietnmodelfour.ID,
173 
-				Jumpset:2,
174 
-				//Marginaddress:"http://jk.test.sgjyun.com/#/news?id="+ActisID+"&orgid="+orgid,
175 
-				Marginaddress:"http://microweb.kuyicloud.com/#/news?id="+ActisID+"&orgid="+orgid,
221 
+				Jumpset:1,
222 
+				Marginaddress:"http://jk.test.sgjyun.com/#/news?id="+ActisID+"&orgid="+orgid,
223 
+				//Marginaddress:"http://microweb.kuyicloud.com/#/news?id="+ActisID+"&orgid="+orgid,
224 
+				Linkid:patientMagiclinkthree.ID,
176 225 
 			}
177 226 
 			AddEditMargin(&sgjPatientEditmargin)
178 227 
 			patienteditmarginfour := models.SgjPatientEditmargin{
 
@@ -182,9 +231,10 @@ func AutoCreateDefalutSchedules()  {
182 231 
 				Status:    1,
183 232 
 				Ctime:     time.Now().Unix(),
184 233 
 				Modeid:    sgjpatietnmodelfour.ID,
185 
-				Jumpset:2,
186 
-				//Marginaddress:"http://jk.test.sgjyun.com/#/activity?id="+ActivsID+"&orgid="+orgid,
187 
-				Marginaddress:"http://microweb.kuyicloud.com/#/activity?id="+ActivsID+"&orgid="+orgid,
234 
+				Jumpset:1,
235 
+				Marginaddress:"http://jk.test.sgjyun.com/#/activity?id="+ActivsID+"&orgid="+orgid,
236 
+				//Marginaddress:"http://microweb.kuyicloud.com/#/activity?id="+ActivsID+"&orgid="+orgid,
237 
+				Linkid:patientMagiclinkfour.ID,
188 238 
 			}
189 239 
 			AddEditMargin(&patienteditmarginfour)
190 240 
 			patienteditmarginfive := models.SgjPatientEditmargin{
 
@@ -194,9 +244,10 @@ func AutoCreateDefalutSchedules()  {
194 244 
 				Status:    1,
195 245 
 				Ctime:     time.Now().Unix(),
196 246 
 				Modeid:    sgjpatietnmodelfour.ID,
197 
-				Jumpset:2,
198 
-				//Marginaddress:"http://jk.test.sgjyun.com/#/departmentEnvironment?id="+EniviIDs+"&orgid="+orgid,
199 
-				Marginaddress:"http://microweb.kuyicloud.com/#/departmentEnvironment?id="+EniviIDs+"&orgid="+orgid,
247 
+				Jumpset:1,
248 
+				Marginaddress:"http://jk.test.sgjyun.com/#/departmentEnvironment?id="+EniviIDs+"&orgid="+orgid,
249 
+				//Marginaddress:"http://microweb.kuyicloud.com/#/departmentEnvironment?id="+EniviIDs+"&orgid="+orgid,
250 
+				Linkid:patientMagiclinkfive.ID,
200 251 
 			}
201 252 
 			AddEditMargin(&patienteditmarginfive)
202 253 
 			patienteditmarginsix := models.SgjPatientEditmargin{
 
@@ -206,7 +257,7 @@ func AutoCreateDefalutSchedules()  {
206 257 
 				Status:    1,
207 258 
 				Ctime:     time.Now().Unix(),
208 259 
 				Modeid:    sgjpatietnmodelfour.ID,
209 
-				Jumpset:2,
260 
+				Jumpset:1,
210 261 
 			}
211 262 
 			AddEditMargin(&patienteditmarginsix)
212 263 
 
@@ -217,7 +268,7 @@ func AutoCreateDefalutSchedules()  {
217 268 
 				Status:    1,
218 269 
 				Ctime:     time.Now().Unix(),
219 270 
 				Modeid:    sgjpatietnmodelfour.ID,
220 
-				Jumpset:2,
271 
+				Jumpset:1,
221 272 
 			}
222 273 
 			AddEditMargin(&patienteditmarginserven)
223 274 
 
@@ -266,7 +317,7 @@ func AutoCreateDefalutSchedules()  {
266 317 
 			datathree, err := GetQueryModelByLastData(userOrgID)
267 318 
 			offices := models.SgjPatientOffices{
268 319 
 				Title:     "科室介绍",
269 
-				Sort:      4,
320 
+				Sort:      8,
270 321 
 				UserOrgId: userOrgID,
271 322 
 				Ctime:     time.Now().Unix(),
272 323 
 				Status:    1,
 
@@ -408,6 +459,8 @@ func AutoCreateDefalutSchedules()  {
408 459 
 				Modeid:    patientOrdmodel.ID,
409 460 
 				UserOrgId: userOrgID,
410 461 
 				Ctime:     time.Now().Unix(),
462 
+				Status:1,
463 
+				Piclink:1,
411 464 
 			}
412 465 
 			AddConRotation(&conrotation)
413 466 
 
@@ -774,13 +827,15 @@ func GetHospital(Orgid int64)(hostital []*models.SgjPatientHospital,err error)
774 827
775 828 
 func GetData(orgid int64)(model []*models.SgjPatientModel,err error)  {
776 829 
 	db := service.PatientReadDB().Table("sgj_patient_model as m").Where(" m.status = ?", 1)
830 
+	dbs := service.PatientReadDB().Table("sgj_patient_editpiclink as s")
777 831 
 	fmt.Println("db是什么?",db)
778 832 
 	if(orgid > 0){
779 833 
 		db = db.Where("user_org_id = ? ", orgid)
780 834 
 	}
781 835 
 	err = db.Preload("Hospitals").Preload("Offices").Preload("OfficeEnviroment").
782 
-		Preload("Editdoctor").Preload("Editmargin").Preload("Enviroimages").Preload("PatientEditpiclink").
783 
-		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
836 
+		Preload("Editdoctor").Preload("Editmargin").Preload("Enviroimages").Preload("PatientEditpiclink", func(db *gorm.DB) *gorm.DB{
837 
+		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")
838 
+	}).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
784 839 
 	fmt.Println("err二二err二二err二二err二二err二二err",err)
785 840
786 841 
 		return
 
@@ -976,11 +1031,13 @@ func DeleteModleByModeID(orgid int64,mid int64)(error)  {
976 1031
977 1032 
 func GetOrederModel(orgid int64)(model []*models.SgjPatientOrdmodel,err error)  {
978 1033 
 	db := service.PatientReadDB().Table("sgj_patient_ordmodel as o").Where("o.status = ?", 1)
1034 
+	con := service.PatientReadDB().Table("sgj_patient_conrotation as s")
979 1035 
 	if(orgid > 0){
980 1036 
 		db = db.Where("user_org_id = ?", orgid)
981 1037 
 	}
982 
-	err = db.Preload("Hosaddress").Preload("Connectway").Preload("Worktime").Preload("Rideway").Preload("Oldration").Preload("Conrotation").
983 
-		Select("o.id,o.title,o.sort,o.ctime,o.mtime,o.mode_type").Order("sort").Find(&model).Error
1038 
+	err = db.Preload("Hosaddress").Preload("Connectway").Preload("Worktime").Preload("Rideway").Preload("Oldration").Preload("Conrotation", func(db *gorm.DB) *gorm.DB{
1039 
+		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")
1040 
+	}).Select("o.id,o.title,o.sort,o.ctime,o.mtime,o.mode_type").Order("sort").Find(&model).Error
984 1041 
     fmt.Println("sql错误是什么",err)
985 1042 
 	return
986 1043 
 
@@ -1128,7 +1185,7 @@ func GetEditRotationImages(id int64,orgid int64)(models.SgjPatientOrdmodel,error
1128 1185 
 }
1129 1186
1130 1187 
 func GetEditConrotion(id int64,orgid int64)(conrotation []models.SgjPatientConrotation, err error)  {
1131 
-	err = service.PatientReadDB().Model(conrotation).Where("modeid = ? AND user_org_id = ?", id, orgid).Find(&conrotation).Error
1188 
+	err = service.PatientReadDB().Model(conrotation).Where("modeid = ? AND user_org_id = ?", id, orgid).Order("sort").Find(&conrotation).Error
1132 1189 
 	return conrotation,err
1133 1190 
 }
1134 1191 
 
@@ -1138,8 +1195,14 @@ func EditVisibleById(id int64,orgid int64)(models.SgjPatientConrotation,error)
1138 1195 
 	return conrotation,err
1139 1196 
 }
1140 1197
1198 
+func UpdatedConAddress(id int64,orgid int64)(models.SgjPatientConlinkaddress,error)  {
1199 
+	conlinkaddress := models.SgjPatientConlinkaddress{}
1200 
+	err := service.PatientWriteDB().Model(&conlinkaddress).Where("id = ? AND user_org_id = ?", id, orgid).Update(map[string]interface{}{"defineaddress": ""}).Error
1201 
+	return conlinkaddress,err
1202 
+}
1203 
+
1141 1204 
 func UpdateEditpic(id int64,orgid int64,conrotation models.SgjPatientConrotation) error  {
1142 
-	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
1205 
+	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
1143 1206 
 	return  err
1144 1207 
 }
1145 1208 
 
@@ -1215,12 +1278,19 @@ func GetQueryEditpiclink(modeid int64,orgid int64)(editpiclink []models.SgjPatie
1215 1278
1216 1279 
 }
1217 1280
1281 
+func UpdatedPatientLinkAddress(id int64,orgid int64)(models.SgjPatientLinkaddress,error)  {
1282 
+	linkaddress := models.SgjPatientLinkaddress{}
1283 
+	err := service.PatientReadDB().Model(&linkaddress).Where("id = ? AND user_org_id = ? AND status = ?", id, orgid, 1).Update(map[string]interface{}{"defineaddress":"","status": 0}).Error
1284 
+	return linkaddress,err
1285 
+}
1286 
+
1218 1287 
 func UpdateEditPatPicLink(id int64,orgid int64,editpiclink models.SgjPatientEditpiclink)(error)  {
1219 1288
1220 1289 
 	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
1221 1290 
 	return  err
1222 1291 
 }
1223 1292
1293 
+
1224 1294 
 func UpdateEditPicLinkTwo(moid int64,orgid int64,)(error)  {
1225 1295 
 	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
1226 1296 
 	return err
 
@@ -1531,7 +1601,7 @@ func UpdateEditMacFormById(id int64,orgid int64,editmargin models.SgjPatientEdit
1531 1601
1532 1602 
 func GetLikeMacAddressById(orgid int64,id int64)(models.SgjPatientMagiclink,error)  {
1533 1603 
       magiclink := models.SgjPatientMagiclink{}
1534 
-	err := service.PatientReadDB().Where("user_org_id = ? AND linkaddress = ?", orgid, id).Find(&magiclink).Error
1604 
+	err := service.PatientReadDB().Where("user_org_id = ? AND id = ?", orgid, id).Find(&magiclink).Error
1535 1605 
 	return magiclink,err
1536 1606 
 }
1537 1607 
 
@@ -1567,6 +1637,12 @@ func AddMacLinkAddress(magiclink *models.SgjPatientMagiclink)error  {
1567 1637 
 	return  err
1568 1638 
 }
1569 1639
1640 
+func GetMacLinkAddressByLastData(orgid int64)(models.SgjPatientMagiclink,error)  {
1641 
+	magiclink := models.SgjPatientMagiclink{}
1642 
+	err := service.PatientReadDB().Model(&magiclink).Where("user_org_id = ? AND status = ?", orgid, 1).Find(&magiclink).Error
1643 
+	return  magiclink,err
1644 
+}
1645 
+
1570 1646 
 func AddNavitaionLinkAddress(navgationlink *models.PatientNavgationlink)error  {
1571 1647 
 	err := service.PatientWriteDB().Create(&navgationlink).Error
1572 1648 
 	return  err
 
@@ -1783,6 +1859,12 @@ func UpdatedConlinkAddress(id int64,orgid int64,conlinkaddress models.SgjPatient
1783 1859 
 	return  err
1784 1860 
 }
1785 1861
1862 
+func AddConlinkAddress(conlinkaddress *models.SgjPatientConlinkaddress) error {
1863 
+
1864 
+	err := service.PatientWriteDB().Create(&conlinkaddress).Error
1865 
+	return err
1866 
+}
1867 
+
1786 1868 
 func UpdatedConrotation(id int64,orgid int64,conrotation models.SgjPatientConrotation) error {
1787 1869 
 	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
1788 1870 
 	return  err