xiaoming_global 5 years ago
parent
commit
d43a099c65
2 changed files with 105 additions and 128 deletions
  1. 104 127
      .idea/workspace.xml
  2. 1 1
      conf/app.conf

+ 104 - 127
.idea/workspace.xml View File

@@ -4,13 +4,6 @@
4 4
     <list default="true" id="b2adb873-ba08-458c-9357-4c6584e112eb" name="Default" comment="">
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
-      <change beforePath="$PROJECT_DIR$/controllers/article/article_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/article/article_controller.go" afterDir="false" />
8
-      <change beforePath="$PROJECT_DIR$/controllers/micro/micro_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/micro/micro_controller.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$/models/site_models.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/site_models.go" afterDir="false" />
11
-      <change beforePath="$PROJECT_DIR$/service/article_service/article_category_service.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/article_service/article_category_service.go" afterDir="false" />
12
-      <change beforePath="$PROJECT_DIR$/service/micro_service/micro_service.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/micro_service/micro_service.go" afterDir="false" />
13
-      <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" />
14 7
     </list>
15 8
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
16 9
     <option name="TRACKING_ENABLED" value="true" />
@@ -21,62 +14,71 @@
21 14
   </component>
22 15
   <component name="FileEditorManager">
23 16
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
24
-      <file leaf-file-name="app.conf" pinned="false" current-in-tab="true">
17
+      <file leaf-file-name="app.conf" pinned="false" current-in-tab="false">
25 18
         <entry file="file://$PROJECT_DIR$/conf/app.conf">
26 19
           <provider selected="true" editor-type-id="text-editor">
27
-            <state relative-caret-position="154">
28
-              <caret line="7" selection-start-line="7" selection-end-line="7" />
20
+            <state relative-caret-position="22">
21
+              <caret line="1" column="15" selection-start-line="1" selection-start-column="15" selection-end-line="1" selection-end-column="15" />
29 22
             </state>
30 23
           </provider>
31 24
         </entry>
32 25
       </file>
33
-      <file leaf-file-name="site_models.go" pinned="false" current-in-tab="false">
34
-        <entry file="file://$PROJECT_DIR$/models/site_models.go">
26
+      <file leaf-file-name="micro_controller.go" pinned="false" current-in-tab="true">
27
+        <entry file="file://$PROJECT_DIR$/controllers/micro/micro_controller.go">
35 28
           <provider selected="true" editor-type-id="text-editor">
36
-            <state relative-caret-position="396">
37
-              <caret line="476" column="52" selection-start-line="476" selection-start-column="39" selection-end-line="476" selection-end-column="52" />
29
+            <state relative-caret-position="27">
30
+              <caret line="42" column="33" selection-start-line="42" selection-start-column="19" selection-end-line="42" selection-end-column="33" />
38 31
             </state>
39 32
           </provider>
40 33
         </entry>
41 34
       </file>
42
-      <file leaf-file-name="site_controller.go" pinned="false" current-in-tab="false">
43
-        <entry file="file://$PROJECT_DIR$/controllers/site/site_controller.go">
35
+      <file leaf-file-name="micro_service.go" pinned="false" current-in-tab="false">
36
+        <entry file="file://$PROJECT_DIR$/service/micro_service/micro_service.go">
44 37
           <provider selected="true" editor-type-id="text-editor">
45
-            <state relative-caret-position="295">
46
-              <caret line="5603" column="18" selection-start-line="5603" selection-start-column="9" selection-end-line="5603" selection-end-column="18" />
47
-              <folding>
48
-                <element signature="e#14#224#0" expanded="true" />
49
-              </folding>
38
+            <state relative-caret-position="1386">
39
+              <caret line="67" column="5" selection-start-line="67" selection-start-column="5" selection-end-line="67" selection-end-column="5" />
50 40
             </state>
51 41
           </provider>
52 42
         </entry>
53 43
       </file>
54
-      <file leaf-file-name="site_microwebsite_service.go" pinned="false" current-in-tab="false">
55
-        <entry file="file://$PROJECT_DIR$/service/site_service/site_microwebsite_service.go">
44
+      <file leaf-file-name="router.go" pinned="false" current-in-tab="false">
45
+        <entry file="file://$PROJECT_DIR$/routers/router.go">
56 46
           <provider selected="true" editor-type-id="text-editor">
57
-            <state relative-caret-position="258">
58
-              <caret line="1217" column="24" selection-start-line="1217" selection-start-column="24" selection-end-line="1217" selection-end-column="24" />
47
+            <state relative-caret-position="528">
48
+              <caret line="42" column="27" selection-start-line="42" selection-start-column="27" selection-end-line="42" selection-end-column="27" />
49
+            </state>
50
+          </provider>
51
+        </entry>
52
+      </file>
53
+      <file leaf-file-name="site_controller.go" pinned="false" current-in-tab="false">
54
+        <entry file="file://$PROJECT_DIR$/controllers/site/site_controller.go">
55
+          <provider selected="true" editor-type-id="text-editor">
56
+            <state relative-caret-position="186">
57
+              <caret line="3890" selection-start-line="3890" selection-end-line="3890" />
59 58
               <folding>
60
-                <element signature="e#22#104#0" expanded="true" />
59
+                <element signature="e#14#224#0" expanded="true" />
61 60
               </folding>
62 61
             </state>
63 62
           </provider>
64 63
         </entry>
65 64
       </file>
66
-      <file leaf-file-name="micro_service.go" pinned="false" current-in-tab="false">
67
-        <entry file="file://$PROJECT_DIR$/service/micro_service/micro_service.go">
65
+      <file leaf-file-name="site_models.go" pinned="false" current-in-tab="false">
66
+        <entry file="file://$PROJECT_DIR$/models/site_models.go">
68 67
           <provider selected="true" editor-type-id="text-editor">
69
-            <state relative-caret-position="88">
70
-              <caret line="8" column="5" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" />
68
+            <state relative-caret-position="1254">
69
+              <caret line="57" column="6" selection-start-line="57" selection-start-column="6" selection-end-line="57" selection-end-column="6" />
71 70
             </state>
72 71
           </provider>
73 72
         </entry>
74 73
       </file>
75
-      <file leaf-file-name="micro_controller.go" pinned="false" current-in-tab="false">
76
-        <entry file="file://$PROJECT_DIR$/controllers/micro/micro_controller.go">
74
+      <file leaf-file-name="site_microwebsite_service.go" pinned="false" current-in-tab="false">
75
+        <entry file="file://$PROJECT_DIR$/service/site_service/site_microwebsite_service.go">
77 76
           <provider selected="true" editor-type-id="text-editor">
78
-            <state relative-caret-position="145">
79
-              <caret line="46" column="39" selection-start-line="46" selection-start-column="32" selection-end-line="46" selection-end-column="39" />
77
+            <state relative-caret-position="159">
78
+              <caret line="259" column="70" selection-start-line="259" selection-start-column="49" selection-end-line="259" selection-end-column="70" />
79
+              <folding>
80
+                <element signature="e#22#104#0" expanded="true" />
81
+              </folding>
80 82
             </state>
81 83
           </provider>
82 84
         </entry>
@@ -92,36 +94,36 @@
92 94
   </component>
93 95
   <component name="FindInProjectRecents">
94 96
     <findStrings>
95
-      <find>DeleteSingleImages</find>
96
-      <find>magiclink</find>
97
-      <find>UpdateLinkAddress</find>
97
+      <find>GetData</find>
98
+      <find>UpdateditnavigationLink</find>
99
+      <find>SaveNavigation</find>
100
+      <find>AddNavigationLinkform</find>
101
+      <find>AddNavigation</find>
102
+      <find>GetNavgationLinkById</find>
98 103
       <find>UpdateEditMacForm</find>
99
-      <find>AddMacLinkAddress</find>
100
-      <find>GetLikeMacAddressById</find>
101
-      <find>GetActivities</find>
102
-      <find>/api/site/getactivities</find>
103
-      <find>GetArticlistDetail</find>
104
-      <find>GetAllArticles</find>
105
-      <find>GetActivitesDetail</find>
106
-      <find>webim登录成功</find>
107
-      <find>GetArticlelist</find>
108
-      <find>GetAllComment</find>
104
+      <find>Deletemodlebyid</find>
105
+      <find>/api/site/updateeditmacform</find>
106
+      <find>UpdateLinkAddress</find>
107
+      <find>GetDatatwo</find>
108
+      <find>UpdatedRolinkAddress</find>
109
+      <find>GetLinkAddressDetail</find>
110
+      <find>UpdatePicFformThree</find>
111
+      <find>AddPicLinkAddress</find>
112
+      <find>AddData</find>
113
+      <find>GetRotationVisibleByLinkId</find>
114
+      <find>GetOrgTitle</find>
109 115
       <find>GetReplyAllComents</find>
110
-      <find>/api/site/addlinkaddress</find>
111
-      <find>AddRotaionChart</find>
112
-      <find>/api/site/singledoctorinfo</find>
113
-      <find>GetDoctorInfo</find>
114
-      <find>AddImageslink</find>
115
-      <find>AddLinkAddressThree</find>
116
-      <find>AddLinkAddress</find>
117
-      <find>UpdateSingleForm</find>
118
-      <find>AddLinkAddressFour</find>
119
-      <find>AddEditPicForm</find>
120
-      <find>AddMagiclinkData</find>
121
-      <find>GetRotationLinkAddress</find>
122
-      <find>/api/site/addlinkaddresstwo</find>
123
-      <find>GetData</find>
116
+      <find>CreateArticle</find>
117
+      <find>Addvido</find>
118
+      <find>UpdateVidoInfo</find>
119
+      <find>GetCountImages</find>
120
+      <find>Getlinkaddress</find>
124 121
       <find>AddMagicNavi</find>
122
+      <find>/api/site/deletemodle</find>
123
+      <find>DeleteModle</find>
124
+      <find>/api/site/addeditpicform</find>
125
+      <find>AddEditPicForm</find>
126
+      <find>GetDataByOrgId</find>
125 127
     </findStrings>
126 128
   </component>
127 129
   <component name="GOROOT" path="C:\Go" />
@@ -147,13 +149,14 @@
147 149
         <option value="$PROJECT_DIR$/controllers/mpwechat/menu_controller.go" />
148 150
         <option value="$PROJECT_DIR$/service/wechat_service/open_wechat_service.go" />
149 151
         <option value="$PROJECT_DIR$/models/activity_models.go" />
150
-        <option value="$PROJECT_DIR$/controllers/article/article_controller.go" />
151
-        <option value="$PROJECT_DIR$/service/article_service/article_category_service.go" />
152
+        <option value="$PROJECT_DIR$/models/article_models.go" />
152 153
         <option value="$PROJECT_DIR$/models/site_models.go" />
153
-        <option value="$PROJECT_DIR$/controllers/micro/micro_controller.go" />
154 154
         <option value="$PROJECT_DIR$/service/micro_service/micro_service.go" />
155
-        <option value="$PROJECT_DIR$/service/site_service/site_microwebsite_service.go" />
155
+        <option value="$PROJECT_DIR$/controllers/micro/micro_controller.go" />
156
+        <option value="$PROJECT_DIR$/service/article_service/article_category_service.go" />
157
+        <option value="$PROJECT_DIR$/controllers/article/article_controller.go" />
156 158
         <option value="$PROJECT_DIR$/controllers/site/site_controller.go" />
159
+        <option value="$PROJECT_DIR$/service/site_service/site_microwebsite_service.go" />
157 160
         <option value="$PROJECT_DIR$/conf/app.conf" />
158 161
       </list>
159 162
     </option>
@@ -165,7 +168,8 @@
165 168
     <sorting>DEFINITION_ORDER</sorting>
166 169
   </component>
167 170
   <component name="ProjectFrameBounds" extendedState="6">
168
-    <option name="x" value="525" />
171
+    <option name="x" value="350" />
172
+    <option name="y" value="285" />
169 173
     <option name="width" value="1230" />
170 174
     <option name="height" value="1040" />
171 175
   </component>
@@ -187,33 +191,6 @@
187 191
               <item name="SCRM" type="462c0819:PsiDirectoryNode" />
188 192
               <item name="conf" type="462c0819:PsiDirectoryNode" />
189 193
             </path>
190
-            <path>
191
-              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
192
-              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
193
-              <item name="controllers" type="462c0819:PsiDirectoryNode" />
194
-            </path>
195
-            <path>
196
-              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
197
-              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
198
-              <item name="controllers" type="462c0819:PsiDirectoryNode" />
199
-              <item name="article" type="462c0819:PsiDirectoryNode" />
200
-            </path>
201
-            <path>
202
-              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
203
-              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
204
-              <item name="models" type="462c0819:PsiDirectoryNode" />
205
-            </path>
206
-            <path>
207
-              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
208
-              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
209
-              <item name="service" type="462c0819:PsiDirectoryNode" />
210
-            </path>
211
-            <path>
212
-              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
213
-              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
214
-              <item name="service" type="462c0819:PsiDirectoryNode" />
215
-              <item name="micro_service" type="462c0819:PsiDirectoryNode" />
216
-            </path>
217 194
           </expand>
218 195
           <select />
219 196
         </subPane>
@@ -252,15 +229,15 @@
252 229
   <component name="ToolWindowManager">
253 230
     <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
254 231
     <layout>
255
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.81006867" visible="true" weight="0.19571045" />
232
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.6819484" visible="true" weight="0.18364611" />
256 233
       <window_info anchor="bottom" id="TODO" order="6" />
257
-      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.14745308" side_tool="true" visible="true" weight="0.12125535" />
234
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.23391421" side_tool="true" weight="0.22396576" />
258 235
       <window_info anchor="right" id="Database" order="3" />
259 236
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
260 237
       <window_info anchor="bottom" id="Version Control" order="9" />
261 238
       <window_info anchor="bottom" id="Run" order="2" />
262
-      <window_info id="Structure" order="1" sideWeight="0.18993135" side_tool="true" weight="0.288874" />
263
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.85254693" visible="true" weight="0.12125535" />
239
+      <window_info id="Structure" order="1" sideWeight="0.31805158" side_tool="true" visible="true" weight="0.18364611" />
240
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.7660858" visible="true" weight="0.5021398" />
264 241
       <window_info id="Favorites" order="2" side_tool="true" />
265 242
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
266 243
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -564,59 +541,59 @@
564 541
         </state>
565 542
       </provider>
566 543
     </entry>
567
-    <entry file="file://$PROJECT_DIR$/routers/router.go">
544
+    <entry file="file://$PROJECT_DIR$/models/activity_models.go">
568 545
       <provider selected="true" editor-type-id="text-editor">
569
-        <state relative-caret-position="22">
570
-          <caret line="33" column="28" selection-start-line="33" selection-start-column="28" selection-end-line="33" selection-end-column="28" />
546
+        <state relative-caret-position="-775">
547
+          <caret line="30" column="95" selection-start-line="30" selection-start-column="95" selection-end-line="30" selection-end-column="95" />
571 548
         </state>
572 549
       </provider>
573 550
     </entry>
574 551
     <entry file="file://$PROJECT_DIR$/models/article_models.go">
575 552
       <provider selected="true" editor-type-id="text-editor">
576
-        <state relative-caret-position="110">
577
-          <caret line="50" column="11" selection-start-line="50" selection-start-column="4" selection-end-line="50" selection-end-column="11" />
553
+        <state relative-caret-position="330">
554
+          <caret line="15" column="1" selection-start-line="15" selection-start-column="1" selection-end-line="15" selection-end-column="1" />
578 555
         </state>
579 556
       </provider>
580 557
     </entry>
581
-    <entry file="file://$PROJECT_DIR$/service/article_service/article_category_service.go">
558
+    <entry file="file://$PROJECT_DIR$/models/site_models.go">
582 559
       <provider selected="true" editor-type-id="text-editor">
583
-        <state relative-caret-position="197">
584
-          <caret line="310" column="110" selection-start-line="310" selection-start-column="99" selection-end-line="310" selection-end-column="110" />
560
+        <state relative-caret-position="1254">
561
+          <caret line="57" column="6" selection-start-line="57" selection-start-column="6" selection-end-line="57" selection-end-column="6" />
585 562
         </state>
586 563
       </provider>
587 564
     </entry>
588
-    <entry file="file://$PROJECT_DIR$/controllers/article/article_controller.go">
565
+    <entry file="file://$PROJECT_DIR$/routers/router.go">
589 566
       <provider selected="true" editor-type-id="text-editor">
590
-        <state relative-caret-position="-193">
591
-          <caret line="1181" column="61" selection-start-line="1181" selection-start-column="43" selection-end-line="1181" selection-end-column="61" />
567
+        <state relative-caret-position="528">
568
+          <caret line="42" column="27" selection-start-line="42" selection-start-column="27" selection-end-line="42" selection-end-column="27" />
592 569
         </state>
593 570
       </provider>
594 571
     </entry>
595
-    <entry file="file://$PROJECT_DIR$/models/activity_models.go">
572
+    <entry file="file://$PROJECT_DIR$/service/micro_service/micro_service.go">
596 573
       <provider selected="true" editor-type-id="text-editor">
597
-        <state relative-caret-position="-775">
598
-          <caret line="30" column="95" selection-start-line="30" selection-start-column="95" selection-end-line="30" selection-end-column="95" />
574
+        <state relative-caret-position="1386">
575
+          <caret line="67" column="5" selection-start-line="67" selection-start-column="5" selection-end-line="67" selection-end-column="5" />
599 576
         </state>
600 577
       </provider>
601 578
     </entry>
602
-    <entry file="file://$PROJECT_DIR$/service/micro_service/micro_service.go">
579
+    <entry file="file://$PROJECT_DIR$/service/article_service/article_category_service.go">
603 580
       <provider selected="true" editor-type-id="text-editor">
604
-        <state relative-caret-position="88">
605
-          <caret line="8" column="5" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" />
581
+        <state relative-caret-position="81">
582
+          <caret line="315" column="29" selection-start-line="315" selection-start-column="20" selection-end-line="315" selection-end-column="29" />
606 583
         </state>
607 584
       </provider>
608 585
     </entry>
609
-    <entry file="file://$PROJECT_DIR$/controllers/micro/micro_controller.go">
586
+    <entry file="file://$PROJECT_DIR$/controllers/article/article_controller.go">
610 587
       <provider selected="true" editor-type-id="text-editor">
611
-        <state relative-caret-position="145">
612
-          <caret line="46" column="39" selection-start-line="46" selection-start-column="32" selection-end-line="46" selection-end-column="39" />
588
+        <state relative-caret-position="402">
589
+          <caret line="974" column="31" selection-start-line="974" selection-start-column="24" selection-end-line="974" selection-end-column="31" />
613 590
         </state>
614 591
       </provider>
615 592
     </entry>
616 593
     <entry file="file://$PROJECT_DIR$/service/site_service/site_microwebsite_service.go">
617 594
       <provider selected="true" editor-type-id="text-editor">
618
-        <state relative-caret-position="258">
619
-          <caret line="1217" column="24" selection-start-line="1217" selection-start-column="24" selection-end-line="1217" selection-end-column="24" />
595
+        <state relative-caret-position="159">
596
+          <caret line="259" column="70" selection-start-line="259" selection-start-column="49" selection-end-line="259" selection-end-column="70" />
620 597
           <folding>
621 598
             <element signature="e#22#104#0" expanded="true" />
622 599
           </folding>
@@ -625,25 +602,25 @@
625 602
     </entry>
626 603
     <entry file="file://$PROJECT_DIR$/controllers/site/site_controller.go">
627 604
       <provider selected="true" editor-type-id="text-editor">
628
-        <state relative-caret-position="295">
629
-          <caret line="5603" column="18" selection-start-line="5603" selection-start-column="9" selection-end-line="5603" selection-end-column="18" />
605
+        <state relative-caret-position="186">
606
+          <caret line="3890" selection-start-line="3890" selection-end-line="3890" />
630 607
           <folding>
631 608
             <element signature="e#14#224#0" expanded="true" />
632 609
           </folding>
633 610
         </state>
634 611
       </provider>
635 612
     </entry>
636
-    <entry file="file://$PROJECT_DIR$/models/site_models.go">
613
+    <entry file="file://$PROJECT_DIR$/conf/app.conf">
637 614
       <provider selected="true" editor-type-id="text-editor">
638
-        <state relative-caret-position="396">
639
-          <caret line="476" column="52" selection-start-line="476" selection-start-column="39" selection-end-line="476" selection-end-column="52" />
615
+        <state relative-caret-position="22">
616
+          <caret line="1" column="15" selection-start-line="1" selection-start-column="15" selection-end-line="1" selection-end-column="15" />
640 617
         </state>
641 618
       </provider>
642 619
     </entry>
643
-    <entry file="file://$PROJECT_DIR$/conf/app.conf">
620
+    <entry file="file://$PROJECT_DIR$/controllers/micro/micro_controller.go">
644 621
       <provider selected="true" editor-type-id="text-editor">
645
-        <state relative-caret-position="154">
646
-          <caret line="7" selection-start-line="7" selection-end-line="7" />
622
+        <state relative-caret-position="27">
623
+          <caret line="42" column="33" selection-start-line="42" selection-start-column="19" selection-end-line="42" selection-end-column="33" />
647 624
         </state>
648 625
       </provider>
649 626
     </entry>

+ 1 - 1
conf/app.conf View File

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