Página inicial Explorar Ajuda
Registrar Entrar
zhangbj
/
scrm-go
Observar 1
Favorito 0
Fork 0
Código Issues 0 Pull Requests 0 Versões 0 Wiki Atividade
Ver código fonte

SCRM

xiaoming_global 5 anos atrás
pai
25e66905f8
commit
7cec96d377
5 arquivos alterados com 185 adições e 99 exclusões
Visão dividida Mostrar estatísticas do Diff
  1. 118 87
      .idea/workspace.xml
  2. 1 1
      conf/app.conf
  3. 29 0
      controllers/micro/micro_controller.go
  4. 25 6
      service/micro_service/micro_service.go
  5. 12 5
      service/site_service/site_microwebsite_service.go

+ 118 - 87
.idea/workspace.xml Ver arquivo 

@@ -2,6 +2,10 @@
2 2 
 <project version="4">
3 3 
   <component name="ChangeListManager">
4 4 
     <list default="true" id="b2adb873-ba08-458c-9357-4c6584e112eb" name="Default" comment="">
5 
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 
+      <change beforePath="$PROJECT_DIR$/conf/app.conf" beforeDir="false" afterPath="$PROJECT_DIR$/conf/app.conf" afterDir="false" />
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" />
5 9 
       <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" />
6 10 
     </list>
7 11 
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
 
@@ -16,8 +20,8 @@
16 20 
       <file leaf-file-name="app.conf" pinned="false" current-in-tab="false">
17 21 
         <entry file="file://$PROJECT_DIR$/conf/app.conf">
18 22 
           <provider selected="true" editor-type-id="text-editor">
19 
-            <state relative-caret-position="22">
20 
-              <caret line="1" column="15" selection-start-line="1" selection-start-column="15" selection-end-line="1" selection-end-column="15" />
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" />
21 25 
             </state>
22 26 
           </provider>
23 27 
         </entry>
 
@@ -25,8 +29,8 @@
25 29 
       <file leaf-file-name="micro_service.go" pinned="false" current-in-tab="false">
26 30 
         <entry file="file://$PROJECT_DIR$/service/micro_service/micro_service.go">
27 31 
           <provider selected="true" editor-type-id="text-editor">
28 
-            <state relative-caret-position="-66">
29 
-              <caret line="15" column="117" selection-start-line="15" selection-start-column="117" selection-end-line="15" selection-end-column="117" />
32 
+            <state relative-caret-position="308">
33 
+              <caret line="41" selection-start-line="41" selection-end-line="41" />
30 34 
               <folding>
31 35 
                 <element signature="e#23#71#0" expanded="true" />
32 36 
               </folding>
 
@@ -34,10 +38,19 @@
34 38 
           </provider>
35 39 
         </entry>
36 40 
       </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 
+          <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>
47 
+          </provider>
48 
+        </entry>
49 
+      </file>
37 50 
       <file leaf-file-name="router.go" pinned="false" current-in-tab="false">
38 51 
         <entry file="file://$PROJECT_DIR$/routers/router.go">
39 52 
           <provider selected="true" editor-type-id="text-editor">
40 
-            <state relative-caret-position="132">
53 
+            <state relative-caret-position="22">
41 54 
               <caret line="24" column="203" selection-start-line="24" selection-start-column="203" selection-end-line="24" selection-end-column="203" />
42 55 
             </state>
43 56 
           </provider>
 
@@ -52,20 +65,11 @@
52 65 
           </provider>
53 66 
         </entry>
54 67 
       </file>
55 
-      <file leaf-file-name="site_microwebsite_service.go" pinned="false" current-in-tab="true">
56 
-        <entry file="file://$PROJECT_DIR$/service/site_service/site_microwebsite_service.go">
57 
-          <provider selected="true" editor-type-id="text-editor">
58 
-            <state relative-caret-position="176">
59 
-              <caret line="17" column="28" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="28" />
60 
-            </state>
61 
-          </provider>
62 
-        </entry>
63 
-      </file>
64 
-      <file leaf-file-name="site_controller.go" pinned="false" current-in-tab="false">
68 
+      <file leaf-file-name="site_controller.go" pinned="false" current-in-tab="true">
65 69 
         <entry file="file://$PROJECT_DIR$/controllers/site/site_controller.go">
66 70 
           <provider selected="true" editor-type-id="text-editor">
67 
-            <state relative-caret-position="-984">
68 
-              <caret line="3211" column="37" selection-start-line="3211" selection-start-column="26" selection-end-line="3211" selection-end-column="37" />
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" />
69 73 
               <folding>
70 74 
                 <element signature="e#14#224#0" expanded="true" />
71 75 
               </folding>
 
@@ -73,11 +77,11 @@
73 77 
           </provider>
74 78 
         </entry>
75 79 
       </file>
76 
-      <file leaf-file-name="article_controller.go" pinned="false" current-in-tab="false">
77 
-        <entry file="file://$PROJECT_DIR$/controllers/article/article_controller.go">
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">
78 82 
           <provider selected="true" editor-type-id="text-editor">
79 
-            <state relative-caret-position="6578">
80 
-              <caret line="311" column="58" selection-start-line="311" selection-start-column="47" selection-end-line="311" selection-end-column="58" />
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" />
81 85 
             </state>
82 86 
           </provider>
83 87 
         </entry>
 
@@ -85,8 +89,17 @@
85 89 
       <file leaf-file-name="article_category_service.go" pinned="false" current-in-tab="false">
86 90 
         <entry file="file://$PROJECT_DIR$/service/article_service/article_category_service.go">
87 91 
           <provider selected="true" editor-type-id="text-editor">
88 
-            <state relative-caret-position="1078">
89 
-              <caret line="55" column="53" selection-start-line="55" selection-start-column="38" selection-end-line="55" selection-end-column="53" />
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" />
94 
+            </state>
95 
+          </provider>
96 
+        </entry>
97 
+      </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">
100 
+          <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" />
90 103 
             </state>
91 104 
           </provider>
92 105 
         </entry>
 
@@ -102,11 +115,6 @@
102 115 
   </component>
103 116 
   <component name="FindInProjectRecents">
104 117 
     <findStrings>
105 
-      <find>for</find>
106 
-      <find>GetCountImages</find>
107 
-      <find>GetNavigationData</find>
108 
-      <find>GetData</find>
109 
-      <find>GetAritclesData</find>
110 118 
       <find>GetArititys</find>
111 119 
       <find>AddActivity</find>
112 120 
       <find>AddActivitys</find>
 
@@ -132,6 +140,11 @@
132 140 
       <find>SgjPatientArticlelist</find>
133 141 
       <find>医院动态</find>
134 142 
       <find>Saveactivit</find>
143 
+      <find>EditStaffInfo</find>
144 
+      <find>/api/staff/EditStaffInfo</find>
145 
+      <find>GetEnviromentImages</find>
146 
+      <find>GetData</find>
147 
+      <find>GetDoctorInfo</find>
135 148 
     </findStrings>
136 149 
   </component>
137 150 
   <component name="GOROOT" path="C:\Go" />
 
@@ -155,15 +168,15 @@
155 168 
         <option value="$PROJECT_DIR$/service/member_service/member_service.go" />
156 169 
         <option value="$PROJECT_DIR$/controllers/mpwechat/menu_controller.go" />
157 170 
         <option value="$PROJECT_DIR$/service/wechat_service/open_wechat_service.go" />
158 
-        <option value="$PROJECT_DIR$/service/article_service/article_category_service.go" />
159 171 
         <option value="$PROJECT_DIR$/controllers/article/article_controller.go" />
160 172 
         <option value="$PROJECT_DIR$/routers/router.go" />
161 173 
         <option value="$PROJECT_DIR$/main.go" />
162 174 
         <option value="$PROJECT_DIR$/models/activity_models.go" />
163 
-        <option value="$PROJECT_DIR$/controllers/micro/micro_controller.go" />
164 175 
         <option value="$PROJECT_DIR$/models/site_models.go" />
165 176 
         <option value="$PROJECT_DIR$/models/article_models.go" />
166 177 
         <option value="$PROJECT_DIR$/controllers/site/site_controller.go" />
178 
+        <option value="$PROJECT_DIR$/controllers/micro/micro_controller.go" />
179 
+        <option value="$PROJECT_DIR$/service/article_service/article_category_service.go" />
167 180 
         <option value="$PROJECT_DIR$/service/micro_service/micro_service.go" />
168 181 
         <option value="$PROJECT_DIR$/conf/app.conf" />
169 182 
         <option value="$PROJECT_DIR$/service/site_service/site_microwebsite_service.go" />
 
@@ -204,6 +217,24 @@
204 217 
               <item name="SCRM" type="462c0819:PsiDirectoryNode" />
205 218 
               <item name="controllers" type="462c0819:PsiDirectoryNode" />
206 219 
             </path>
220 
+            <path>
221 
+              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
222 
+              <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" />
237 
+            </path>
207 238 
           </expand>
208 239 
           <select />
209 240 
         </subPane>
 
@@ -244,15 +275,16 @@
244 275 
     <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
245 276 
     <editor active="true" />
246 277 
     <layout>
247 
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.6631579" visible="true" weight="0.18766756" />
278 
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.6625767" visible="true" weight="0.18766756" />
248 279 
       <window_info anchor="bottom" id="TODO" order="6" />
249 
-      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.288874" side_tool="true" visible="true" weight="0.32239658" />
280 
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.21045576" side_tool="true" visible="true" weight="0.30242512" />
250 281 
       <window_info anchor="right" id="Database" order="3" />
282 
+      <window_info anchor="bottom" id="Find" order="1" />
251 283 
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
252 284 
       <window_info anchor="bottom" id="Version Control" order="9" />
253 285 
       <window_info anchor="bottom" id="Run" order="2" />
254 
-      <window_info id="Structure" order="1" sideWeight="0.33684212" side_tool="true" visible="true" weight="0.18766756" />
255 
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.711126" visible="true" weight="0.32239658" />
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" />
256 288 
       <window_info id="Favorites" order="2" side_tool="true" />
257 289 
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
258 290 
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
 
@@ -261,7 +293,6 @@
261 293 
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
262 294 
       <window_info anchor="bottom" id="Message" order="0" />
263 295 
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
264 
-      <window_info anchor="bottom" id="Find" order="1" />
265 296 
     </layout>
266 297 
   </component>
267 298 
   <component name="TypeScriptGeneratedFilesManager">
 
@@ -276,13 +307,6 @@
276 307 
     </breakpoint-manager>
277 308 
   </component>
278 309 
   <component name="editorHistoryManager">
279 
-    <entry file="file://$PROJECT_DIR$/routers/router.go">
280 
-      <provider selected="true" editor-type-id="text-editor">
281 
-        <state relative-caret-position="308">
282 
-          <caret line="30" column="32" selection-start-line="30" selection-start-column="32" selection-end-line="30" selection-end-column="32" />
283 
-        </state>
284 
-      </provider>
285 
-    </entry>
286 310 
     <entry file="file://$PROJECT_DIR$/conf/app.conf">
287 311 
       <provider selected="true" editor-type-id="text-editor">
288 312 
         <state relative-caret-position="2596">
 
@@ -528,20 +552,6 @@
528 552 
         </state>
529 553 
       </provider>
530 554 
     </entry>
531 
-    <entry file="file://$PROJECT_DIR$/controllers/staff/staff_controller.go">
532 
-      <provider selected="true" editor-type-id="text-editor">
533 
-        <state relative-caret-position="-1746">
534 
-          <caret line="141" column="62" selection-start-line="141" selection-start-column="47" selection-end-line="141" selection-end-column="62" />
535 
-        </state>
536 
-      </provider>
537 
-    </entry>
538 
-    <entry file="file://$PROJECT_DIR$/service/staff_service/staff_manager_service.go">
539 
-      <provider selected="true" editor-type-id="text-editor">
540 
-        <state relative-caret-position="242">
541 
-          <caret line="15" column="17" selection-start-line="15" selection-start-column="10" selection-end-line="15" selection-end-column="17" />
542 
-        </state>
543 
-      </provider>
544 
-    </entry>
545 555 
     <entry file="file://$PROJECT_DIR$/utils/stringtool.go">
546 556 
       <provider selected="true" editor-type-id="text-editor">
547 557 
         <state relative-caret-position="214">
 
@@ -563,55 +573,83 @@
563 573 
         </state>
564 574 
       </provider>
565 575 
     </entry>
566 
-    <entry file="file://$PROJECT_DIR$/controllers/micro/micro_controller.go">
576 
+    <entry file="file://$PROJECT_DIR$/controllers/article/article_controller.go">
567 577 
       <provider selected="true" editor-type-id="text-editor">
568 
-        <state relative-caret-position="211">
569 
-          <caret line="189" column="26" selection-start-line="189" selection-start-column="26" selection-end-line="189" selection-end-column="26" />
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" />
570 580 
         </state>
571 581 
       </provider>
572 582 
     </entry>
573 
-    <entry file="file://$PROJECT_DIR$/controllers/article/article_controller.go">
583 
+    <entry file="file://$PROJECT_DIR$/models/article_models.go">
574 584 
       <provider selected="true" editor-type-id="text-editor">
575 
-        <state relative-caret-position="6578">
576 
-          <caret line="311" column="58" selection-start-line="311" selection-start-column="47" selection-end-line="311" selection-end-column="58" />
585 
+        <state relative-caret-position="286">
586 
+          <caret line="13" column="55" selection-start-line="13" selection-start-column="55" selection-end-line="13" selection-end-column="55" />
587 
+        </state>
588 
+      </provider>
589 
+    </entry>
590 
+    <entry file="file://$PROJECT_DIR$/models/user_models.go">
591 
+      <provider selected="true" editor-type-id="text-editor">
592 
+        <state relative-caret-position="12">
593 
+          <caret line="38" column="5" selection-start-line="38" selection-start-column="5" selection-end-line="38" selection-end-column="5" />
594 
+        </state>
595 
+      </provider>
596 
+    </entry>
597 
+    <entry file="file://$PROJECT_DIR$/controllers/staff/staff_controller.go">
598 
+      <provider selected="true" editor-type-id="text-editor">
599 
+        <state relative-caret-position="302">
600 
+          <caret line="240" column="33" selection-start-line="240" selection-start-column="18" selection-end-line="240" selection-end-column="33" />
601 
+        </state>
602 
+      </provider>
603 
+    </entry>
604 
+    <entry file="file://$PROJECT_DIR$/service/staff_service/staff_manager_service.go">
605 
+      <provider selected="true" editor-type-id="text-editor">
606 
+        <state relative-caret-position="130">
607 
+          <caret line="35" column="20" selection-start-line="35" selection-start-column="5" selection-end-line="35" selection-end-column="20" />
577 608 
         </state>
578 609 
       </provider>
579 610 
     </entry>
580 611 
     <entry file="file://$PROJECT_DIR$/service/article_service/article_category_service.go">
581 612 
       <provider selected="true" editor-type-id="text-editor">
582 
-        <state relative-caret-position="1078">
583 
-          <caret line="55" column="53" selection-start-line="55" selection-start-column="38" selection-end-line="55" selection-end-column="53" />
613 
+        <state relative-caret-position="107">
614 
+          <caret line="42" column="4" selection-start-line="42" selection-start-column="4" selection-end-line="51" selection-end-column="9" />
584 615 
         </state>
585 616 
       </provider>
586 617 
     </entry>
587 
-    <entry file="file://$PROJECT_DIR$/models/article_models.go">
618 
+    <entry file="file://$PROJECT_DIR$/service/site_service/site_microwebsite_service.go">
588 619 
       <provider selected="true" editor-type-id="text-editor">
589 
-        <state relative-caret-position="286">
590 
-          <caret line="13" column="55" selection-start-line="13" selection-start-column="55" selection-end-line="13" selection-end-column="55" />
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" />
591 622 
         </state>
592 623 
       </provider>
593 624 
     </entry>
594 
-    <entry file="file://$PROJECT_DIR$/routers/router.go">
625 
+    <entry file="file://$PROJECT_DIR$/conf/app.conf">
595 626 
       <provider selected="true" editor-type-id="text-editor">
596 
-        <state relative-caret-position="132">
597 
-          <caret line="24" column="203" selection-start-line="24" selection-start-column="203" selection-end-line="24" selection-end-column="203" />
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" />
598 629 
         </state>
599 630 
       </provider>
600 631 
     </entry>
601 
-    <entry file="file://$PROJECT_DIR$/controllers/site/site_controller.go">
632 
+    <entry file="file://$PROJECT_DIR$/service/micro_service/micro_service.go">
602 633 
       <provider selected="true" editor-type-id="text-editor">
603 
-        <state relative-caret-position="-984">
604 
-          <caret line="3211" column="37" selection-start-line="3211" selection-start-column="26" selection-end-line="3211" selection-end-column="37" />
634 
+        <state relative-caret-position="308">
635 
+          <caret line="41" selection-start-line="41" selection-end-line="41" />
605 636 
           <folding>
606 
-            <element signature="e#14#224#0" expanded="true" />
637 
+            <element signature="e#23#71#0" expanded="true" />
607 638 
           </folding>
608 639 
         </state>
609 640 
       </provider>
610 641 
     </entry>
611 
-    <entry file="file://$PROJECT_DIR$/conf/app.conf">
642 
+    <entry file="file://$PROJECT_DIR$/controllers/micro/micro_controller.go">
643 
+      <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" />
646 
+        </state>
647 
+      </provider>
648 
+    </entry>
649 
+    <entry file="file://$PROJECT_DIR$/routers/router.go">
612 650 
       <provider selected="true" editor-type-id="text-editor">
613 651 
         <state relative-caret-position="22">
614 
-          <caret line="1" column="15" selection-start-line="1" selection-start-column="15" selection-end-line="1" selection-end-column="15" />
652 
+          <caret line="24" column="203" selection-start-line="24" selection-start-column="203" selection-end-line="24" selection-end-column="203" />
615 653 
         </state>
616 654 
       </provider>
617 655 
     </entry>
 
@@ -622,22 +660,15 @@
622 660 
         </state>
623 661 
       </provider>
624 662 
     </entry>
625 
-    <entry file="file://$PROJECT_DIR$/service/micro_service/micro_service.go">
663 
+    <entry file="file://$PROJECT_DIR$/controllers/site/site_controller.go">
626 664 
       <provider selected="true" editor-type-id="text-editor">
627 
-        <state relative-caret-position="-66">
628 
-          <caret line="15" column="117" selection-start-line="15" selection-start-column="117" selection-end-line="15" selection-end-column="117" />
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" />
629 667 
           <folding>
630 
-            <element signature="e#23#71#0" expanded="true" />
668 
+            <element signature="e#14#224#0" expanded="true" />
631 669 
           </folding>
632 670 
         </state>
633 671 
       </provider>
634 672 
     </entry>
635 
-    <entry file="file://$PROJECT_DIR$/service/site_service/site_microwebsite_service.go">
636 
-      <provider selected="true" editor-type-id="text-editor">
637 
-        <state relative-caret-position="176">
638 
-          <caret line="17" column="28" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="28" />
639 
-        </state>
640 
-      </provider>
641 
-    </entry>
642 673 
   </component>
643 674 
 </project>

+ 1 - 1
conf/app.conf Ver arquivo 

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

+ 29 - 0
controllers/micro/micro_controller.go Ver arquivo 

@@ -24,6 +24,8 @@ func microRouters(){
24 24 
 	beego.Router("/api/site/singlearticleinfo",&Micro{},"Get:GetArticlesDetail")
25 25 
    beego.Router("/api/site/singledoctorinfo",&Micro{},"Get:GetDoctorInfo")
26 26 
    beego.Router("/api/site/getdata",&Micro{},"Get:GetData")
27 
+	beego.Router("/api/site/getenviromentimages",&Micro{},"Get:GetEnviromentImages")
28 
+	beego.Router("/api/site/getalldoctors",&Micro{},"Get:GetAllDoctors")
27 29 
 }
28 30
29 31 
 type Micro struct {
 
@@ -321,4 +323,31 @@ func (this *Micro) GetRotationLinkAddress()  {
321 323 
 	})
322 324 
 }
323 325
326 
+func (this *Micro) GetEnviromentImages()  {
327 
+	id, _ := this.GetInt64("id")
328 
+	fmt.Println("id是设么",id)
329 
+	orgid, _ := this.GetInt64("orgid")
330 
+	enviro, err := micro_service.GetEnviromentImages(id, orgid)
331 
+	if err !=nil{
332 
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
333 
+		return
334 
+	}
335 
+	this.ServeSuccessJSON(map[string]interface{}{
336 
+		"enviro":enviro,
337 
+	})
338 
+}
324 339
340 
+func (this *Micro) GetAllDoctors()  {
341 
+	orgid, _ := this.GetInt64("orgid")
342 
+	fmt.Println("orgid失身东西",orgid)
343 
+	info, err := micro_service.GetAllDoctors(orgid)
344 
+	fmt.Println("info是什么",info)
345 
+	fmt.Println("err是什么",err)
346 
+	if err !=nil{
347 
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
348 
+		return
349 
+	}
350 
+	this.ServeSuccessJSON(map[string]interface{}{
351 
+		"info":info,
352 
+	})
353 
+}

+ 25 - 6
service/micro_service/micro_service.go Ver arquivo 

@@ -4,17 +4,21 @@ import (
4 4 
 	"SCRM/models"
5 5 
 	"SCRM/service"
6 6 
 	"fmt"
7 
+	"github.com/jinzhu/gorm"
7 8 
 )
8 9
9 10 
 func GetData(orgid int64)(model []*models.SgjPatientModel,err error)  {
10 11 
 	db := service.PatientReadDB().Table("sgj_patient_model as m").Where(" m.status = ?", 1)
12 
+	dbs := service.PatientReadDB().Table("sgj_patient_editpiclink as s")
11 13 
 	fmt.Println("db是什么?",db)
14 
+
12 15 
 	if(orgid > 0){
13 16 
 		db = db.Where("user_org_id = ? ", orgid)
14 17 
 	}
15 18 
 	err = db.Preload("Hospitals").Preload("Offices").Preload("OfficeEnviroment").
16 
-		Preload("Editdoctor").Preload("Editmargin").Preload("Enviroimages").Preload("PatientEditpiclink").Order("sort").
17 
-		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
19 
+		Preload("Editdoctor").Preload("Editmargin").Preload("Enviroimages").Preload("PatientEditpiclink", func(db *gorm.DB) *gorm.DB{
20 
+			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")
21 
+	}).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
18 22 
 	return
19 23 
 }
20 24 
 
@@ -142,10 +146,15 @@ func GetArticlesDetail(id int64,orgid int64)(models.Articles,error)  {
142 146 
 	return articles,err
143 147 
 }
144 148
145 
-func GetDoctorInfo(id int64,orgid int64)(models.SgjPatientEditdoctor,error)  {
146 
-	editdoctor := models.SgjPatientEditdoctor{}
147 
-	err := service.PatientReadDB().Model(&editdoctor).Where("id = ? AND user_org_id = ?", id, orgid).Find(&editdoctor).Error
148 
-	return editdoctor,err
149 
+//func GetDoctorInfo(id int64,orgid int64)(models.SgjPatientEditdoctor,error)  {
150 
+//	editdoctor := models.SgjPatientEditdoctor{}
151 
+//	err := service.PatientReadDB().Model(&editdoctor).Where("id = ? AND user_org_id = ?", id, orgid).Find(&editdoctor).Error
152 
+//	return editdoctor,err
153 
+//}
154 
+func GetDoctorInfo(id int64,orgid int64)(models.SgjUserStaffInfo,error)  {
155 
+	info := models.SgjUserStaffInfo{}
156 
+	err := service.UserReadDB().Model(&info).Where("id = ? AND user_org_id = ?", id, orgid).Find(&info).Error
157 
+	return info,err
149 158 
 }
150 159
151 160 
 func GetRotationLinkAddress(orgid int64,linkid int64)(models.SgjPatientLinkaddress,error)  {
 
@@ -158,4 +167,14 @@ func GetNavigationLinkAddressById(id int64,orgid int64)(models.SgjPatientEditmar
158 167 
 	editmargin := models.SgjPatientEditmargin{}
159 168 
 	err := service.PatientReadDB().Model(&editmargin).Where("id=? and user_org_id = ?", id, orgid).Find(&editmargin).Error
160 169 
 	return editmargin,err
170 
+}
171 
+
172 
+func GetEnviromentImages(mid int64,orgid int64)(enviro []models.SgjPatientEnviroimages,err error)  {
173 
+	err = service.PatientReadDB().Model(&enviro).Where(" modeid = ? AND user_org_id = ?", mid, orgid).Find(&enviro).Error
174 
+	return
175 
+}
176 
+
177 
+func GetAllDoctors(orgid int64)(staff []models.SgjUserStaffInfo,err error)  {
178 
+	err = service.UserReadDB().Model(&staff).Where("user_org_id = ? AND status = ? AND user_type <> ? AND user_title <> ? AND user_title <> ?", orgid,1,3, 12,13).Find(&staff).Error
179 
+	return staff,err
161 180 
 }

+ 12 - 5
service/site_service/site_microwebsite_service.go Ver arquivo 

@@ -137,6 +137,8 @@ func AutoCreateDefalutSchedules()  {
137 137 
 			ActisID := strconv.FormatInt(ActiID, 10)
138 138 
 			ActivID :=int64(sgjpatietnmodelfour.ID + 6)
139 139 
 			ActivsID := strconv.FormatInt(ActivID, 10)
140 
+			EnviID := int64(sgjpatietnmodelfour.ID + 4)
141 
+			EniviIDs := strconv.FormatInt(EnviID, 10)
140 142 
 			editmargin := models.SgjPatientEditmargin{
141 143 
 				Margtitle: "医院介绍",
142 144 
 				Margimage: "https://images.shengws.com/2162_o_1571992616722.png",
 
@@ -145,7 +147,8 @@ func AutoCreateDefalutSchedules()  {
145 147 
 				Ctime:     time.Now().Unix(),
146 148 
 				Modeid:    sgjpatietnmodelfour.ID,
147 149 
 				Jumpset:2,
148 
-				Marginaddress:"http://jk.test.sgjyun.com/#/hospitalIntroduction?id="+modeid+"&orgid="+orgid ,
150 
+				//Marginaddress:"http://jk.test.sgjyun.com/#/hospitalIntroduction?id="+modeid+"&orgid="+orgid ,
151 
+				Marginaddress:"http://microweb.kuyicloud.com/#/hospitalIntroduction?id="+modeid+"&orgid="+orgid ,
149 152 
 			}
150 153 
 			err = AddEditMargin(&editmargin)
151 154 
 			patientEditmargin := models.SgjPatientEditmargin{
 
@@ -156,7 +159,8 @@ func AutoCreateDefalutSchedules()  {
156 159 
 				Ctime:     time.Now().Unix(),
157 160 
 				Modeid:    sgjpatietnmodelfour.ID,
158 161 
 				Jumpset:2,
159 
-				Marginaddress:"http://jk.test.sgjyun.com/#/medicalTeam?id="+OfficeID+"&orgid="+orgid,
162 
+				//Marginaddress:"http://jk.test.sgjyun.com/#/medicalTeam?id="+OfficeID+"&orgid="+orgid,
163 
+				Marginaddress:"http://microweb.kuyicloud.com/#/medicalTeam?id="+OfficeID+"&orgid="+orgid,
160 164 
 			}
161 165 
 			err = AddEditMargin(&patientEditmargin)
162 166 
 			sgjPatientEditmargin := models.SgjPatientEditmargin{
 
@@ -167,7 +171,8 @@ func AutoCreateDefalutSchedules()  {
167 171 
 				Ctime:     time.Now().Unix(),
168 172 
 				Modeid:    sgjpatietnmodelfour.ID,
169 173 
 				Jumpset:2,
170 
-				Marginaddress:"http://jk.test.sgjyun.com/#/news?id="+ActisID+"&orgid="+orgid,
174 
+				//Marginaddress:"http://jk.test.sgjyun.com/#/news?id="+ActisID+"&orgid="+orgid,
175 
+				Marginaddress:"http://microweb.kuyicloud.com/#/news?id="+ActisID+"&orgid="+orgid,
171 176 
 			}
172 177 
 			AddEditMargin(&sgjPatientEditmargin)
173 178 
 			patienteditmarginfour := models.SgjPatientEditmargin{
 
@@ -178,7 +183,8 @@ func AutoCreateDefalutSchedules()  {
178 183 
 				Ctime:     time.Now().Unix(),
179 184 
 				Modeid:    sgjpatietnmodelfour.ID,
180 185 
 				Jumpset:2,
181 
-				Marginaddress:"http://jk.test.sgjyun.com/#/activity?id="+ActivsID+"&orgid="+orgid,
186 
+				//Marginaddress:"http://jk.test.sgjyun.com/#/activity?id="+ActivsID+"&orgid="+orgid,
187 
+				Marginaddress:"http://microweb.kuyicloud.com/#/activity?id="+ActivsID+"&orgid="+orgid,
182 188 
 			}
183 189 
 			AddEditMargin(&patienteditmarginfour)
184 190 
 			patienteditmarginfive := models.SgjPatientEditmargin{
 
@@ -189,7 +195,8 @@ func AutoCreateDefalutSchedules()  {
189 195 
 				Ctime:     time.Now().Unix(),
190 196 
 				Modeid:    sgjpatietnmodelfour.ID,
191 197 
 				Jumpset:2,
192 
-				Marginaddress:"http://jk.test.sgjyun.com/#/hospitalIntroduction?id="+modeid+"&orgid="+orgid,
198 
+				//Marginaddress:"http://jk.test.sgjyun.com/#/departmentEnvironment?id="+EniviIDs+"&orgid="+orgid,
199 
+				Marginaddress:"http://microweb.kuyicloud.com/#/departmentEnvironment?id="+EniviIDs+"&orgid="+orgid,
193 200 
 			}
194 201 
 			AddEditMargin(&patienteditmarginfive)
195 202 
 			patienteditmarginsix := models.SgjPatientEditmargin{