Commit 9cc79d0aa3ae71639ea42691626baab903ecc21a
1 parent
a70f2037
Exists in
master
commit mybatis setting
Showing
11 changed files
with
351 additions
and
34 deletions
Show diff stats
@@ -0,0 +1,6 @@ | @@ -0,0 +1,6 @@ | ||
1 | +<component name="InspectionProjectProfileManager"> | ||
2 | + <profile version="1.0"> | ||
3 | + <option name="myName" value="Project Default" /> | ||
4 | + <inspection_tool class="LossyEncoding" enabled="false" level="WARNING" enabled_by_default="false" /> | ||
5 | + </profile> | ||
6 | +</component> | ||
0 | \ No newline at end of file | 7 | \ No newline at end of file |
.idea/misc.xml
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | <project version="4"> | 2 | <project version="4"> |
3 | + <component name="ProjectPlainTextFileTypeManager"> | ||
4 | + <file url="file://$PROJECT_DIR$/springboot/morning-check/src/main/resources/application.properties" /> | ||
5 | + </component> | ||
3 | <component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK" /> | 6 | <component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK" /> |
4 | </project> | 7 | </project> |
5 | \ No newline at end of file | 8 | \ No newline at end of file |
.idea/workspace.xml
@@ -2,11 +2,11 @@ | @@ -2,11 +2,11 @@ | ||
2 | <project version="4"> | 2 | <project version="4"> |
3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
4 | <list default="true" id="3d777fc9-3797-4a37-8968-b32bb87dfc27" name="Default Changelist" comment=""> | 4 | <list default="true" id="3d777fc9-3797-4a37-8968-b32bb87dfc27" name="Default Changelist" comment=""> |
5 | - <change afterPath="$PROJECT_DIR$/.idea/javassm.iml" afterDir="false" /> | ||
6 | - <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" /> | ||
7 | - <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" /> | ||
8 | - <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" /> | ||
9 | - <change beforePath="$PROJECT_DIR$/springboot/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/springboot/pom.xml" afterDir="false" /> | 5 | + <change afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" /> |
6 | + <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" /> | ||
7 | + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> | ||
8 | + <change beforePath="$PROJECT_DIR$/springboot/src/main/java/com/sincre/springboot/controller/BaiduController.java" beforeDir="false" afterPath="$PROJECT_DIR$/springboot/src/main/java/com/sincre/springboot/controller/BaiduController.java" afterDir="false" /> | ||
9 | + <change beforePath="$PROJECT_DIR$/springboot/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/springboot/src/main/resources/application.properties" afterDir="false" /> | ||
10 | </list> | 10 | </list> |
11 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 11 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
12 | <option name="SHOW_DIALOG" value="false" /> | 12 | <option name="SHOW_DIALOG" value="false" /> |
@@ -15,35 +15,108 @@ | @@ -15,35 +15,108 @@ | ||
15 | <option name="LAST_RESOLUTION" value="IGNORE" /> | 15 | <option name="LAST_RESOLUTION" value="IGNORE" /> |
16 | </component> | 16 | </component> |
17 | <component name="DefaultGradleProjectSettings"> | 17 | <component name="DefaultGradleProjectSettings"> |
18 | - <option name="testRunner" value="GRADLE" /> | ||
19 | - <option name="delegatedBuild" value="true" /> | 18 | + <option name="isMigrated" value="true" /> |
20 | </component> | 19 | </component> |
21 | <component name="FileEditorManager"> | 20 | <component name="FileEditorManager"> |
22 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | 21 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
23 | <file pinned="false" current-in-tab="false"> | 22 | <file pinned="false" current-in-tab="false"> |
24 | - <entry file="file://$PROJECT_DIR$/springboot/src/main/resources/application.properties"> | 23 | + <entry file="file://$PROJECT_DIR$/springboot/morning-check/src/main/java/com/sincere/morningcheck/model/FileEntity.java"> |
25 | <provider selected="true" editor-type-id="text-editor"> | 24 | <provider selected="true" editor-type-id="text-editor"> |
26 | - <state relative-caret-position="180"> | ||
27 | - <caret line="12" column="40" selection-start-line="12" selection-start-column="40" selection-end-line="12" selection-end-column="40" /> | 25 | + <state relative-caret-position="240"> |
26 | + <caret line="19" column="12" selection-start-line="19" selection-start-column="12" selection-end-line="19" selection-end-column="12" /> | ||
27 | + <folding> | ||
28 | + <element signature="imports" expanded="true" /> | ||
29 | + </folding> | ||
30 | + </state> | ||
31 | + </provider> | ||
32 | + </entry> | ||
33 | + </file> | ||
34 | + <file pinned="false" current-in-tab="false"> | ||
35 | + <entry file="file://$PROJECT_DIR$/springboot/morning-check/src/main/resources/mapper/filemapper.xml"> | ||
36 | + <provider selected="true" editor-type-id="text-editor"> | ||
37 | + <state> | ||
38 | + <caret column="22" selection-start-column="22" selection-end-column="22" /> | ||
39 | + </state> | ||
40 | + </provider> | ||
41 | + </entry> | ||
42 | + </file> | ||
43 | + <file pinned="false" current-in-tab="false"> | ||
44 | + <entry file="file://$PROJECT_DIR$/springboot/morning-check/src/main/resources/mapper/StudentCheckReport.xml"> | ||
45 | + <provider selected="true" editor-type-id="text-editor"> | ||
46 | + <state relative-caret-position="414"> | ||
47 | + <caret line="33" column="85" lean-forward="true" selection-start-line="33" selection-start-column="85" selection-end-line="33" selection-end-column="85" /> | ||
28 | </state> | 48 | </state> |
29 | </provider> | 49 | </provider> |
30 | </entry> | 50 | </entry> |
31 | </file> | 51 | </file> |
32 | <file pinned="false" current-in-tab="true"> | 52 | <file pinned="false" current-in-tab="true"> |
33 | - <entry file="file://$PROJECT_DIR$/springboot/src/main/java/com/sincre/springboot/SpringbootApplication.java"> | 53 | + <entry file="file://$PROJECT_DIR$/springboot/pom.xml"> |
54 | + <provider selected="true" editor-type-id="text-editor"> | ||
55 | + <state relative-caret-position="358"> | ||
56 | + <caret line="57" column="43" lean-forward="true" selection-start-line="57" selection-start-column="43" selection-end-line="57" selection-end-column="43" /> | ||
57 | + </state> | ||
58 | + </provider> | ||
59 | + </entry> | ||
60 | + </file> | ||
61 | + <file pinned="false" current-in-tab="false"> | ||
62 | + <entry file="file://$PROJECT_DIR$/springboot/morning-check/src/main/java/com/sincere/morningcheck/service/impl/FileUpAndDownServiceImpl.java"> | ||
34 | <provider selected="true" editor-type-id="text-editor"> | 63 | <provider selected="true" editor-type-id="text-editor"> |
35 | - <state relative-caret-position="210"> | ||
36 | - <caret line="26" selection-start-line="26" selection-end-line="26" /> | 64 | + <state relative-caret-position="1170"> |
65 | + <caret line="93" column="51" selection-start-line="93" selection-start-column="51" selection-end-line="93" selection-end-column="51" /> | ||
37 | </state> | 66 | </state> |
38 | </provider> | 67 | </provider> |
39 | </entry> | 68 | </entry> |
40 | </file> | 69 | </file> |
70 | + <file pinned="false" current-in-tab="false"> | ||
71 | + <entry file="file://$PROJECT_DIR$/springboot/morning-check/src/main/resources/application.properties"> | ||
72 | + <provider selected="true" editor-type-id="text-editor"> | ||
73 | + <state relative-caret-position="225"> | ||
74 | + <caret line="15" selection-start-line="15" selection-end-line="15" /> | ||
75 | + </state> | ||
76 | + </provider> | ||
77 | + </entry> | ||
78 | + </file> | ||
79 | + <file pinned="false" current-in-tab="false"> | ||
80 | + <entry file="file://$PROJECT_DIR$/springboot/morning-check/src/main/resources/application-dev.properties"> | ||
81 | + <provider selected="true" editor-type-id="text-editor" /> | ||
82 | + </entry> | ||
83 | + </file> | ||
84 | + <file pinned="false" current-in-tab="false"> | ||
85 | + <entry file="file://$PROJECT_DIR$/springboot/morning-check/src/main/resources/application-prod.properties"> | ||
86 | + <provider selected="true" editor-type-id="text-editor" /> | ||
87 | + </entry> | ||
88 | + </file> | ||
89 | + <file pinned="false" current-in-tab="false"> | ||
90 | + <entry file="file://$PROJECT_DIR$/springboot/morning-check/src/main/resources/file-message.properties"> | ||
91 | + <provider selected="true" editor-type-id="text-editor" /> | ||
92 | + </entry> | ||
93 | + </file> | ||
94 | + <file pinned="false" current-in-tab="false"> | ||
95 | + <entry file="file://$PROJECT_DIR$/springboot/morning-check/src/main/resources/logback.xml"> | ||
96 | + <provider selected="true" editor-type-id="text-editor" /> | ||
97 | + </entry> | ||
98 | + </file> | ||
41 | </leaf> | 99 | </leaf> |
42 | </component> | 100 | </component> |
101 | + <component name="FindInProjectRecents"> | ||
102 | + <findStrings> | ||
103 | + <find>mybatis</find> | ||
104 | + <find>jdbc</find> | ||
105 | + <find>Sql</find> | ||
106 | + <find>student</find> | ||
107 | + <find>sql</find> | ||
108 | + </findStrings> | ||
109 | + </component> | ||
43 | <component name="Git.Settings"> | 110 | <component name="Git.Settings"> |
44 | <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> | 111 | <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> |
45 | </component> | 112 | </component> |
46 | - <component name="ProjectFrameBounds"> | 113 | + <component name="MavenProjectNavigator"> |
114 | + <treeState> | ||
115 | + <expand /> | ||
116 | + <select /> | ||
117 | + </treeState> | ||
118 | + </component> | ||
119 | + <component name="ProjectFrameBounds" extendedState="6"> | ||
47 | <option name="y" value="23" /> | 120 | <option name="y" value="23" /> |
48 | <option name="width" value="1280" /> | 121 | <option name="width" value="1280" /> |
49 | <option name="height" value="777" /> | 122 | <option name="height" value="777" /> |
@@ -53,6 +126,8 @@ | @@ -53,6 +126,8 @@ | ||
53 | <foldersAlwaysOnTop value="true" /> | 126 | <foldersAlwaysOnTop value="true" /> |
54 | </navigator> | 127 | </navigator> |
55 | <panes> | 128 | <panes> |
129 | + <pane id="PackagesPane" /> | ||
130 | + <pane id="Scope" /> | ||
56 | <pane id="ProjectPane"> | 131 | <pane id="ProjectPane"> |
57 | <subPane> | 132 | <subPane> |
58 | <expand> | 133 | <expand> |
@@ -65,12 +140,147 @@ | @@ -65,12 +140,147 @@ | ||
65 | <item name="javassm" type="462c0819:PsiDirectoryNode" /> | 140 | <item name="javassm" type="462c0819:PsiDirectoryNode" /> |
66 | <item name="springboot" type="462c0819:PsiDirectoryNode" /> | 141 | <item name="springboot" type="462c0819:PsiDirectoryNode" /> |
67 | </path> | 142 | </path> |
143 | + <path> | ||
144 | + <item name="javassm" type="b2602c69:ProjectViewProjectNode" /> | ||
145 | + <item name="javassm" type="462c0819:PsiDirectoryNode" /> | ||
146 | + <item name="springboot" type="462c0819:PsiDirectoryNode" /> | ||
147 | + <item name="morning-check" type="462c0819:PsiDirectoryNode" /> | ||
148 | + </path> | ||
149 | + <path> | ||
150 | + <item name="javassm" type="b2602c69:ProjectViewProjectNode" /> | ||
151 | + <item name="javassm" type="462c0819:PsiDirectoryNode" /> | ||
152 | + <item name="springboot" type="462c0819:PsiDirectoryNode" /> | ||
153 | + <item name="morning-check" type="462c0819:PsiDirectoryNode" /> | ||
154 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
155 | + </path> | ||
156 | + <path> | ||
157 | + <item name="javassm" type="b2602c69:ProjectViewProjectNode" /> | ||
158 | + <item name="javassm" type="462c0819:PsiDirectoryNode" /> | ||
159 | + <item name="springboot" type="462c0819:PsiDirectoryNode" /> | ||
160 | + <item name="morning-check" type="462c0819:PsiDirectoryNode" /> | ||
161 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
162 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
163 | + </path> | ||
164 | + <path> | ||
165 | + <item name="javassm" type="b2602c69:ProjectViewProjectNode" /> | ||
166 | + <item name="javassm" type="462c0819:PsiDirectoryNode" /> | ||
167 | + <item name="springboot" type="462c0819:PsiDirectoryNode" /> | ||
168 | + <item name="morning-check" type="462c0819:PsiDirectoryNode" /> | ||
169 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
170 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
171 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | ||
172 | + </path> | ||
173 | + <path> | ||
174 | + <item name="javassm" type="b2602c69:ProjectViewProjectNode" /> | ||
175 | + <item name="javassm" type="462c0819:PsiDirectoryNode" /> | ||
176 | + <item name="springboot" type="462c0819:PsiDirectoryNode" /> | ||
177 | + <item name="morning-check" type="462c0819:PsiDirectoryNode" /> | ||
178 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
179 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
180 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | ||
181 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | ||
182 | + </path> | ||
183 | + <path> | ||
184 | + <item name="javassm" type="b2602c69:ProjectViewProjectNode" /> | ||
185 | + <item name="javassm" type="462c0819:PsiDirectoryNode" /> | ||
186 | + <item name="springboot" type="462c0819:PsiDirectoryNode" /> | ||
187 | + <item name="morning-check" type="462c0819:PsiDirectoryNode" /> | ||
188 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
189 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
190 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | ||
191 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | ||
192 | + <item name="sincere" type="462c0819:PsiDirectoryNode" /> | ||
193 | + </path> | ||
194 | + <path> | ||
195 | + <item name="javassm" type="b2602c69:ProjectViewProjectNode" /> | ||
196 | + <item name="javassm" type="462c0819:PsiDirectoryNode" /> | ||
197 | + <item name="springboot" type="462c0819:PsiDirectoryNode" /> | ||
198 | + <item name="morning-check" type="462c0819:PsiDirectoryNode" /> | ||
199 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
200 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
201 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | ||
202 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | ||
203 | + <item name="sincere" type="462c0819:PsiDirectoryNode" /> | ||
204 | + <item name="morningcheck" type="462c0819:PsiDirectoryNode" /> | ||
205 | + </path> | ||
206 | + <path> | ||
207 | + <item name="javassm" type="b2602c69:ProjectViewProjectNode" /> | ||
208 | + <item name="javassm" type="462c0819:PsiDirectoryNode" /> | ||
209 | + <item name="springboot" type="462c0819:PsiDirectoryNode" /> | ||
210 | + <item name="morning-check" type="462c0819:PsiDirectoryNode" /> | ||
211 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
212 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
213 | + <item name="resources" type="462c0819:PsiDirectoryNode" /> | ||
214 | + </path> | ||
215 | + <path> | ||
216 | + <item name="javassm" type="b2602c69:ProjectViewProjectNode" /> | ||
217 | + <item name="javassm" type="462c0819:PsiDirectoryNode" /> | ||
218 | + <item name="springboot" type="462c0819:PsiDirectoryNode" /> | ||
219 | + <item name="morning-check" type="462c0819:PsiDirectoryNode" /> | ||
220 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
221 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
222 | + <item name="resources" type="462c0819:PsiDirectoryNode" /> | ||
223 | + <item name="mapper" type="462c0819:PsiDirectoryNode" /> | ||
224 | + </path> | ||
225 | + <path> | ||
226 | + <item name="javassm" type="b2602c69:ProjectViewProjectNode" /> | ||
227 | + <item name="javassm" type="462c0819:PsiDirectoryNode" /> | ||
228 | + <item name="springboot" type="462c0819:PsiDirectoryNode" /> | ||
229 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
230 | + </path> | ||
231 | + <path> | ||
232 | + <item name="javassm" type="b2602c69:ProjectViewProjectNode" /> | ||
233 | + <item name="javassm" type="462c0819:PsiDirectoryNode" /> | ||
234 | + <item name="springboot" type="462c0819:PsiDirectoryNode" /> | ||
235 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
236 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
237 | + </path> | ||
238 | + <path> | ||
239 | + <item name="javassm" type="b2602c69:ProjectViewProjectNode" /> | ||
240 | + <item name="javassm" type="462c0819:PsiDirectoryNode" /> | ||
241 | + <item name="springboot" type="462c0819:PsiDirectoryNode" /> | ||
242 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
243 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
244 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | ||
245 | + </path> | ||
246 | + <path> | ||
247 | + <item name="javassm" type="b2602c69:ProjectViewProjectNode" /> | ||
248 | + <item name="javassm" type="462c0819:PsiDirectoryNode" /> | ||
249 | + <item name="springboot" type="462c0819:PsiDirectoryNode" /> | ||
250 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
251 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
252 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | ||
253 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | ||
254 | + </path> | ||
255 | + <path> | ||
256 | + <item name="javassm" type="b2602c69:ProjectViewProjectNode" /> | ||
257 | + <item name="javassm" type="462c0819:PsiDirectoryNode" /> | ||
258 | + <item name="springboot" type="462c0819:PsiDirectoryNode" /> | ||
259 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
260 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
261 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | ||
262 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | ||
263 | + <item name="sincre" type="462c0819:PsiDirectoryNode" /> | ||
264 | + </path> | ||
265 | + <path> | ||
266 | + <item name="javassm" type="b2602c69:ProjectViewProjectNode" /> | ||
267 | + <item name="javassm" type="462c0819:PsiDirectoryNode" /> | ||
268 | + <item name="springboot" type="462c0819:PsiDirectoryNode" /> | ||
269 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
270 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
271 | + <item name="resources" type="462c0819:PsiDirectoryNode" /> | ||
272 | + </path> | ||
273 | + <path> | ||
274 | + <item name="javassm" type="b2602c69:ProjectViewProjectNode" /> | ||
275 | + <item name="javassm" type="462c0819:PsiDirectoryNode" /> | ||
276 | + <item name="springboot" type="462c0819:PsiDirectoryNode" /> | ||
277 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
278 | + <item name="test" type="462c0819:PsiDirectoryNode" /> | ||
279 | + </path> | ||
68 | </expand> | 280 | </expand> |
69 | <select /> | 281 | <select /> |
70 | </subPane> | 282 | </subPane> |
71 | </pane> | 283 | </pane> |
72 | - <pane id="Scope" /> | ||
73 | - <pane id="PackagesPane" /> | ||
74 | </panes> | 284 | </panes> |
75 | </component> | 285 | </component> |
76 | <component name="PropertiesComponent"> | 286 | <component name="PropertiesComponent"> |
@@ -104,9 +314,10 @@ | @@ -104,9 +314,10 @@ | ||
104 | <servers /> | 314 | <servers /> |
105 | </component> | 315 | </component> |
106 | <component name="ToolWindowManager"> | 316 | <component name="ToolWindowManager"> |
107 | - <frame x="0" y="23" width="1280" height="777" extended-state="0" /> | 317 | + <frame x="0" y="23" width="1280" height="777" extended-state="6" /> |
318 | + <editor active="true" /> | ||
108 | <layout> | 319 | <layout> |
109 | - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.3206785" /> | 320 | + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.19709209" /> |
110 | <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> | 321 | <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> |
111 | <window_info id="Image Layers" order="2" /> | 322 | <window_info id="Image Layers" order="2" /> |
112 | <window_info id="Designer" order="3" /> | 323 | <window_info id="Designer" order="3" /> |
@@ -120,32 +331,109 @@ | @@ -120,32 +331,109 @@ | ||
120 | <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> | 331 | <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> |
121 | <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> | 332 | <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> |
122 | <window_info anchor="bottom" id="TODO" order="6" /> | 333 | <window_info anchor="bottom" id="TODO" order="6" /> |
123 | - <window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.329927" /> | 334 | + <window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.04379562" /> |
124 | <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" /> | 335 | <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" /> |
125 | <window_info anchor="bottom" id="Version Control" order="9" weight="0.329927" /> | 336 | <window_info anchor="bottom" id="Version Control" order="9" weight="0.329927" /> |
126 | <window_info anchor="bottom" id="Messages" order="10" /> | 337 | <window_info anchor="bottom" id="Messages" order="10" /> |
127 | <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> | 338 | <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> |
128 | - <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> | 339 | + <window_info anchor="right" id="Ant Build" order="1" weight="0.24959612" /> |
129 | <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> | 340 | <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> |
130 | <window_info anchor="right" id="Palette" order="3" /> | 341 | <window_info anchor="right" id="Palette" order="3" /> |
131 | <window_info anchor="right" id="Capture Analysis" order="4" /> | 342 | <window_info anchor="right" id="Capture Analysis" order="4" /> |
132 | <window_info anchor="right" id="Theme Preview" order="5" /> | 343 | <window_info anchor="right" id="Theme Preview" order="5" /> |
133 | - <window_info anchor="right" id="Maven" order="6" /> | 344 | + <window_info anchor="right" id="Maven" order="6" weight="0.32956383" /> |
134 | <window_info anchor="right" id="Palette	" order="7" /> | 345 | <window_info anchor="right" id="Palette	" order="7" /> |
135 | </layout> | 346 | </layout> |
136 | </component> | 347 | </component> |
348 | + <component name="antWorkspaceConfiguration"> | ||
349 | + <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> | ||
350 | + <option name="FILTER_TARGETS" value="false" /> | ||
351 | + </component> | ||
137 | <component name="editorHistoryManager"> | 352 | <component name="editorHistoryManager"> |
353 | + <entry file="file://$PROJECT_DIR$/springboot/src/main/java/com/sincre/springboot/SpringbootApplication.java"> | ||
354 | + <provider selected="true" editor-type-id="text-editor"> | ||
355 | + <state relative-caret-position="210"> | ||
356 | + <caret line="26" selection-start-line="26" selection-end-line="26" /> | ||
357 | + </state> | ||
358 | + </provider> | ||
359 | + </entry> | ||
360 | + <entry file="file://$PROJECT_DIR$/springboot/mvnw.cmd"> | ||
361 | + <provider selected="true" editor-type-id="text-editor" /> | ||
362 | + </entry> | ||
363 | + <entry file="file://$PROJECT_DIR$/springboot/mvnw"> | ||
364 | + <provider selected="true" editor-type-id="text-editor" /> | ||
365 | + </entry> | ||
366 | + <entry file="file://$PROJECT_DIR$/springboot.iml"> | ||
367 | + <provider selected="true" editor-type-id="text-editor"> | ||
368 | + <state relative-caret-position="165"> | ||
369 | + <caret line="11" column="38" lean-forward="true" selection-start-line="11" selection-start-column="38" selection-end-line="11" selection-end-column="38" /> | ||
370 | + </state> | ||
371 | + </provider> | ||
372 | + </entry> | ||
373 | + <entry file="file://$PROJECT_DIR$/springboot/src/main/resources/application.yml"> | ||
374 | + <provider selected="true" editor-type-id="text-editor" /> | ||
375 | + </entry> | ||
138 | <entry file="file://$PROJECT_DIR$/springboot/src/main/resources/application.properties"> | 376 | <entry file="file://$PROJECT_DIR$/springboot/src/main/resources/application.properties"> |
139 | <provider selected="true" editor-type-id="text-editor"> | 377 | <provider selected="true" editor-type-id="text-editor"> |
140 | - <state relative-caret-position="180"> | ||
141 | - <caret line="12" column="40" selection-start-line="12" selection-start-column="40" selection-end-line="12" selection-end-column="40" /> | 378 | + <state relative-caret-position="195"> |
379 | + <caret line="13" column="12" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" /> | ||
142 | </state> | 380 | </state> |
143 | </provider> | 381 | </provider> |
144 | </entry> | 382 | </entry> |
145 | - <entry file="file://$PROJECT_DIR$/springboot/src/main/java/com/sincre/springboot/SpringbootApplication.java"> | 383 | + <entry file="file://$PROJECT_DIR$/springboot/morning-check/src/main/java/com/sincere/morningcheck/model/FileEntity.java"> |
146 | <provider selected="true" editor-type-id="text-editor"> | 384 | <provider selected="true" editor-type-id="text-editor"> |
147 | - <state relative-caret-position="210"> | ||
148 | - <caret line="26" selection-start-line="26" selection-end-line="26" /> | 385 | + <state relative-caret-position="240"> |
386 | + <caret line="19" column="12" selection-start-line="19" selection-start-column="12" selection-end-line="19" selection-end-column="12" /> | ||
387 | + <folding> | ||
388 | + <element signature="imports" expanded="true" /> | ||
389 | + </folding> | ||
390 | + </state> | ||
391 | + </provider> | ||
392 | + </entry> | ||
393 | + <entry file="file://$PROJECT_DIR$/springboot/morning-check/src/main/resources/mapper/filemapper.xml"> | ||
394 | + <provider selected="true" editor-type-id="text-editor"> | ||
395 | + <state> | ||
396 | + <caret column="22" selection-start-column="22" selection-end-column="22" /> | ||
397 | + </state> | ||
398 | + </provider> | ||
399 | + </entry> | ||
400 | + <entry file="file://$PROJECT_DIR$/springboot/morning-check/src/main/java/com/sincere/morningcheck/service/impl/FileUpAndDownServiceImpl.java"> | ||
401 | + <provider selected="true" editor-type-id="text-editor"> | ||
402 | + <state relative-caret-position="1170"> | ||
403 | + <caret line="93" column="51" selection-start-line="93" selection-start-column="51" selection-end-line="93" selection-end-column="51" /> | ||
404 | + </state> | ||
405 | + </provider> | ||
406 | + </entry> | ||
407 | + <entry file="file://$PROJECT_DIR$/springboot/morning-check/src/main/resources/application.properties"> | ||
408 | + <provider selected="true" editor-type-id="text-editor"> | ||
409 | + <state relative-caret-position="225"> | ||
410 | + <caret line="15" selection-start-line="15" selection-end-line="15" /> | ||
411 | + </state> | ||
412 | + </provider> | ||
413 | + </entry> | ||
414 | + <entry file="file://$PROJECT_DIR$/springboot/morning-check/src/main/resources/application-dev.properties"> | ||
415 | + <provider selected="true" editor-type-id="text-editor" /> | ||
416 | + </entry> | ||
417 | + <entry file="file://$PROJECT_DIR$/springboot/morning-check/src/main/resources/application-prod.properties"> | ||
418 | + <provider selected="true" editor-type-id="text-editor" /> | ||
419 | + </entry> | ||
420 | + <entry file="file://$PROJECT_DIR$/springboot/morning-check/src/main/resources/file-message.properties"> | ||
421 | + <provider selected="true" editor-type-id="text-editor" /> | ||
422 | + </entry> | ||
423 | + <entry file="file://$PROJECT_DIR$/springboot/morning-check/src/main/resources/logback.xml"> | ||
424 | + <provider selected="true" editor-type-id="text-editor" /> | ||
425 | + </entry> | ||
426 | + <entry file="file://$PROJECT_DIR$/springboot/morning-check/src/main/resources/mapper/StudentCheckReport.xml"> | ||
427 | + <provider selected="true" editor-type-id="text-editor"> | ||
428 | + <state relative-caret-position="414"> | ||
429 | + <caret line="33" column="85" lean-forward="true" selection-start-line="33" selection-start-column="85" selection-end-line="33" selection-end-column="85" /> | ||
430 | + </state> | ||
431 | + </provider> | ||
432 | + </entry> | ||
433 | + <entry file="file://$PROJECT_DIR$/springboot/pom.xml"> | ||
434 | + <provider selected="true" editor-type-id="text-editor"> | ||
435 | + <state relative-caret-position="358"> | ||
436 | + <caret line="57" column="43" lean-forward="true" selection-start-line="57" selection-start-column="43" selection-end-line="57" selection-end-column="43" /> | ||
149 | </state> | 437 | </state> |
150 | </provider> | 438 | </provider> |
151 | </entry> | 439 | </entry> |
springboot.iml
@@ -97,6 +97,12 @@ | @@ -97,6 +97,12 @@ | ||
97 | <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.58" level="project" /> | 97 | <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.58" level="project" /> |
98 | <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.1.3.RELEASE" level="project" /> | 98 | <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.1.3.RELEASE" level="project" /> |
99 | <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.5.RELEASE" level="project" /> | 99 | <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.5.RELEASE" level="project" /> |
100 | + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.1.3.RELEASE" level="project" /> | ||
101 | + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.1.3.RELEASE" level="project" /> | ||
102 | + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.1.3.RELEASE" level="project" /> | ||
103 | + <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.1.3" level="project" /> | ||
104 | + <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" /> | ||
105 | + <orderEntry type="library" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" /> | ||
100 | <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache:2.10.6" level="project" /> | 106 | <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache:2.10.6" level="project" /> |
101 | <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-eureka-server:2.1.1.RELEASE" level="project" /> | 107 | <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-eureka-server:2.1.1.RELEASE" level="project" /> |
102 | <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.1.1.RELEASE" level="project" /> | 108 | <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.1.1.RELEASE" level="project" /> |
@@ -107,12 +113,6 @@ | @@ -107,12 +113,6 @@ | ||
107 | <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.60" level="project" /> | 113 | <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.60" level="project" /> |
108 | <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.60" level="project" /> | 114 | <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.60" level="project" /> |
109 | <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-eureka-server:2.1.1.RELEASE" level="project" /> | 115 | <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-eureka-server:2.1.1.RELEASE" level="project" /> |
110 | - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.1.3.RELEASE" level="project" /> | ||
111 | - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.1.3.RELEASE" level="project" /> | ||
112 | - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.1.3.RELEASE" level="project" /> | ||
113 | - <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.1.3" level="project" /> | ||
114 | - <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" /> | ||
115 | - <orderEntry type="library" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" /> | ||
116 | <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.1.3.RELEASE" level="project" /> | 116 | <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.1.3.RELEASE" level="project" /> |
117 | <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.28" level="project" /> | 117 | <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.28" level="project" /> |
118 | <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-hystrix:2.1.1.RELEASE" level="project" /> | 118 | <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-hystrix:2.1.1.RELEASE" level="project" /> |
springboot/pom.xml
@@ -114,6 +114,11 @@ | @@ -114,6 +114,11 @@ | ||
114 | <groupId>org.springframework.boot</groupId> | 114 | <groupId>org.springframework.boot</groupId> |
115 | <artifactId>spring-boot-starter-cache</artifactId> | 115 | <artifactId>spring-boot-starter-cache</artifactId> |
116 | </dependency> | 116 | </dependency> |
117 | + <!--健康检查 --> | ||
118 | + <dependency> | ||
119 | + <groupId>org.springframework.boot</groupId> | ||
120 | + <artifactId>spring-boot-starter-actuator</artifactId> | ||
121 | + </dependency> | ||
117 | <!-- ehcache 缓存 --> | 122 | <!-- ehcache 缓存 --> |
118 | <dependency> | 123 | <dependency> |
119 | <groupId>net.sf.ehcache</groupId> | 124 | <groupId>net.sf.ehcache</groupId> |
springboot/src/main/java/com/sincre/springboot/controller/BaiduController.java
@@ -40,7 +40,7 @@ public class BaiduController { | @@ -40,7 +40,7 @@ public class BaiduController { | ||
40 | Map<String,Object> body = new HashMap<>(); | 40 | Map<String,Object> body = new HashMap<>(); |
41 | body.put("url",param); | 41 | body.put("url",param); |
42 | 42 | ||
43 | - String result = ApiHelper.doPost(url+postToken,headMap,body); | 43 | + String result = ApiHelper.doPost(url+postToken,headMap, body); |
44 | 44 | ||
45 | BaiduResult baiduResult = JSON.parseObject(result, BaiduResult.class); | 45 | BaiduResult baiduResult = JSON.parseObject(result, BaiduResult.class); |
46 | 46 |
springboot/src/main/resources/application-dev.properties
0 → 100644
springboot/src/main/resources/application-prod.properties
0 → 100644
@@ -0,0 +1 @@ | @@ -0,0 +1 @@ | ||
1 | +server.port = 3333 |
springboot/src/main/resources/application-test.properties
0 → 100644
springboot/src/main/resources/application.properties
@@ -0,0 +1,11 @@ | @@ -0,0 +1,11 @@ | ||
1 | +#server: | ||
2 | +# port:8080 | ||
3 | +# | ||
4 | +#eureka: | ||
5 | +# instance: | ||
6 | +# hostname: 121.40.109.21 | ||
7 | +# client: | ||
8 | +# registerWithEureka: false | ||
9 | +# fetchRegistry: false | ||
10 | +# serviceUrl: | ||
11 | +# defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/ | ||
0 | \ No newline at end of file | 12 | \ No newline at end of file |