Преглед изворни кода

Merge remote-tracking branch 'origin/master'

csx пре 4 година
родитељ
комит
01ff48b6d3
2 измењених фајлова са 149 додато и 0 уклоњено
  1. 149 0
      .idea/workspace.xml
  2. BIN
      XT_Admin_Api.exe

+ 149 - 0
.idea/workspace.xml Прегледај датотеку

@@ -3,10 +3,17 @@
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="7aa7cc45-aece-4fa3-9063-5e3df12471b4" name="Default" comment="">
5 5
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6
+<<<<<<< .mine
7
+
8
+
9
+
10
+
11
+=======
6 12
       <change beforePath="$PROJECT_DIR$/XT_Admin_Api.exe" beforeDir="false" afterPath="$PROJECT_DIR$/XT_Admin_Api.exe" afterDir="false" />
7 13
       <change beforePath="$PROJECT_DIR$/controllers/function_api_controllers/function_api_base_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/function_api_controllers/function_api_base_controller.go" afterDir="false" />
8 14
       <change beforePath="$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go" afterDir="false" />
9 15
       <change beforePath="$PROJECT_DIR$/service/function_service.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/function_service.go" afterDir="false" />
16
+>>>>>>> .theirs
10 17
     </list>
11 18
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
12 19
     <option name="TRACKING_ENABLED" value="true" />
@@ -20,7 +27,11 @@
20 27
       <file leaf-file-name="function_api_router_register.go" pinned="false" current-in-tab="false">
21 28
         <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go">
22 29
           <provider selected="true" editor-type-id="text-editor">
30
+<<<<<<< .mine
31
+            <state relative-caret-position="1848">
32
+=======
23 33
             <state relative-caret-position="47">
34
+>>>>>>> .theirs
24 35
               <caret line="87" column="79" selection-start-line="87" selection-start-column="54" selection-end-line="87" selection-end-column="79" />
25 36
               <folding>
26 37
                 <element signature="e#34#79#0" expanded="true" />
@@ -41,8 +52,13 @@
41 52
       <file leaf-file-name="function_service.go" pinned="false" current-in-tab="true">
42 53
         <entry file="file://$PROJECT_DIR$/service/function_service.go">
43 54
           <provider selected="true" editor-type-id="text-editor">
55
+<<<<<<< .mine
56
+            <state relative-caret-position="175">
57
+              <caret line="65" column="138" selection-start-line="65" selection-start-column="122" selection-end-line="65" selection-end-column="138" />
58
+=======
44 59
             <state relative-caret-position="296">
45 60
               <caret line="137" column="248" selection-start-line="137" selection-start-column="248" selection-end-line="137" selection-end-column="248" />
61
+>>>>>>> .theirs
46 62
               <folding>
47 63
                 <element signature="e#17#73#0" expanded="true" />
48 64
               </folding>
@@ -50,6 +66,63 @@
50 66
           </provider>
51 67
         </entry>
52 68
       </file>
69
+<<<<<<< .mine
70
+      <file leaf-file-name="admin_api_router_register.go" pinned="false" current-in-tab="false">
71
+        <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/admin_api_router_register.go">
72
+          <provider selected="true" editor-type-id="text-editor">
73
+            <state relative-caret-position="528">
74
+              <caret line="24" column="62" selection-start-line="24" selection-start-column="46" selection-end-line="24" selection-end-column="62" />
75
+            </state>
76
+          </provider>
77
+        </entry>
78
+      </file>
79
+      <file leaf-file-name="org_api_controller.go" pinned="false" current-in-tab="false">
80
+        <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/org_api_controller.go">
81
+          <provider selected="true" editor-type-id="text-editor">
82
+            <state relative-caret-position="5962">
83
+              <caret line="278" column="72" selection-start-line="278" selection-start-column="47" selection-end-line="278" selection-end-column="72" />
84
+            </state>
85
+          </provider>
86
+        </entry>
87
+      </file>
88
+      <file leaf-file-name="org_service.go" pinned="false" current-in-tab="false">
89
+        <entry file="file://$PROJECT_DIR$/service/org_service.go">
90
+          <provider selected="true" editor-type-id="text-editor">
91
+            <state relative-caret-position="12298">
92
+              <caret line="566" column="267" selection-start-line="566" selection-start-column="176" selection-end-line="566" selection-end-column="267" />
93
+            </state>
94
+          </provider>
95
+        </entry>
96
+      </file>
97
+=======
98
+
99
+
100
+
101
+
102
+
103
+
104
+
105
+
106
+
107
+
108
+
109
+
110
+
111
+
112
+
113
+
114
+
115
+
116
+
117
+
118
+
119
+
120
+
121
+
122
+
123
+
124
+
125
+>>>>>>> .theirs
53 126
       <file leaf-file-name="fuction_query_models.go" pinned="false" current-in-tab="false">
54 127
         <entry file="file://$PROJECT_DIR$/models/function_models/fuction_query_models.go">
55 128
           <provider selected="true" editor-type-id="text-editor">
@@ -229,7 +302,11 @@
229 302
   <component name="ToolWindowManager">
230 303
     <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
231 304
     <layout>
305
+<<<<<<< .mine
306
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22050938" />
307
+=======
232 308
       <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20710456" />
309
+>>>>>>> .theirs
233 310
       <window_info anchor="bottom" id="TODO" order="6" />
234 311
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.113270774" side_tool="true" visible="true" weight="0.39372325" />
235 312
       <window_info anchor="right" id="Database" order="3" />
@@ -237,7 +314,11 @@
237 314
       <window_info anchor="bottom" id="Version Control" order="9" />
238 315
       <window_info anchor="bottom" id="Run" order="2" />
239 316
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
317
+<<<<<<< .mine
318
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.88538873" visible="true" weight="0.0014265336" />
319
+=======
240 320
       <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.88672924" visible="true" weight="0.39372325" />
321
+>>>>>>> .theirs
241 322
       <window_info id="Favorites" order="2" side_tool="true" />
242 323
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
243 324
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -613,9 +694,72 @@
613 694
         </state>
614 695
       </provider>
615 696
     </entry>
697
+<<<<<<< .mine
698
+    <entry file="file://$PROJECT_DIR$/models/function_models/fuction_query_models.go">
699
+      <provider selected="true" editor-type-id="text-editor">
700
+        <state relative-caret-position="11264">
701
+          <caret line="512" column="5" selection-start-line="512" selection-start-column="5" selection-end-line="512" selection-end-column="5" />
702
+        </state>
703
+      </provider>
704
+    </entry>
705
+    <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/admin_api_router_register.go">
706
+      <provider selected="true" editor-type-id="text-editor">
707
+        <state relative-caret-position="528">
708
+          <caret line="24" column="62" selection-start-line="24" selection-start-column="46" selection-end-line="24" selection-end-column="62" />
709
+        </state>
710
+      </provider>
711
+    </entry>
712
+    <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/org_api_controller.go">
713
+      <provider selected="true" editor-type-id="text-editor">
714
+        <state relative-caret-position="5962">
715
+          <caret line="278" column="72" selection-start-line="278" selection-start-column="47" selection-end-line="278" selection-end-column="72" />
716
+        </state>
717
+      </provider>
718
+    </entry>
719
+    <entry file="file://$PROJECT_DIR$/service/org_service.go">
720
+      <provider selected="true" editor-type-id="text-editor">
721
+        <state relative-caret-position="12298">
722
+          <caret line="566" column="267" selection-start-line="566" selection-start-column="176" selection-end-line="566" selection-end-column="267" />
723
+        </state>
724
+      </provider>
725
+    </entry>
726
+=======
727
+
728
+
729
+
730
+
731
+
732
+
733
+
734
+
735
+
736
+
737
+
738
+
739
+
740
+
741
+
742
+
743
+
744
+
745
+
746
+
747
+
748
+
749
+
750
+
751
+
752
+
753
+
754
+
755
+>>>>>>> .theirs
616 756
     <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go">
617 757
       <provider selected="true" editor-type-id="text-editor">
758
+<<<<<<< .mine
759
+        <state relative-caret-position="1848">
760
+=======
618 761
         <state relative-caret-position="47">
762
+>>>>>>> .theirs
619 763
           <caret line="87" column="79" selection-start-line="87" selection-start-column="54" selection-end-line="87" selection-end-column="79" />
620 764
           <folding>
621 765
             <element signature="e#34#79#0" expanded="true" />
@@ -625,8 +769,13 @@
625 769
     </entry>
626 770
     <entry file="file://$PROJECT_DIR$/service/function_service.go">
627 771
       <provider selected="true" editor-type-id="text-editor">
772
+<<<<<<< .mine
773
+        <state relative-caret-position="175">
774
+          <caret line="65" column="138" selection-start-line="65" selection-start-column="122" selection-end-line="65" selection-end-column="138" />
775
+=======
628 776
         <state relative-caret-position="296">
629 777
           <caret line="137" column="248" selection-start-line="137" selection-start-column="248" selection-end-line="137" selection-end-column="248" />
778
+>>>>>>> .theirs
630 779
           <folding>
631 780
             <element signature="e#17#73#0" expanded="true" />
632 781
           </folding>