王晓刚 / adverh5 · 提交

转到一个项目

作者 王晓刚
提交 721caf93308029599ae4b10a7f089d5f2f687be0 1 个父辈 25983a00
1 个管道 的构建 通过 耗费 6 秒

自动部署与数据可配置

内嵌 并排对比
正在显示 3 个修改的文件 包含 44 行增加 和 108 行删除
  1 +# 定义 stages
  2 +stages:
  3 + - pull
  4 +
  5 +# 定义 job
  6 +job1:
  7 + stage: pull
  8 + script:
  9 + - cd /alidata/www/fast/adverh5
  10 + - git pull
@@ -2,12 +2,8 @@ @@ -2,12 +2,8 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="3bd62d6a-e12b-4534-8418-e8a5d7424d73" name="默认的" comment=""> 4 <list default="true" id="3bd62d6a-e12b-4534-8418-e8a5d7424d73" name="默认的" comment="">
  5 + <change afterPath="$PROJECT_DIR$/.gitlab-ci.yml" afterDir="false" />
5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 6 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 - <change beforePath="$PROJECT_DIR$/application/admin/view/goods/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/goods/add.html" afterDir="false" />  
7 - <change beforePath="$PROJECT_DIR$/application/admin/view/goods/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/goods/edit.html" afterDir="false" />  
8 - <change beforePath="$PROJECT_DIR$/application/home/controller/Index.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Index.php" afterDir="false" />  
9 - <change beforePath="$PROJECT_DIR$/application/home/view/index/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/index/login.html" afterDir="false" />  
10 - <change beforePath="$PROJECT_DIR$/public/assets/js/backend/goods.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/goods.js" afterDir="false" />  
11 </list> 7 </list>
12 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
13 <option name="TRACKING_ENABLED" value="true" /> 9 <option name="TRACKING_ENABLED" value="true" />
@@ -21,11 +17,11 @@ @@ -21,11 +17,11 @@
21 </component> 17 </component>
22 <component name="FileEditorManager"> 18 <component name="FileEditorManager">
23 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 19 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
24 - <file leaf-file-name="Index.php" pinned="false" current-in-tab="true"> 20 + <file leaf-file-name="Index.php" pinned="false" current-in-tab="false">
25 <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php"> 21 <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
26 <provider selected="true" editor-type-id="text-editor"> 22 <provider selected="true" editor-type-id="text-editor">
27 - <state relative-caret-position="442">  
28 - <caret line="31" column="33" selection-start-line="31" selection-start-column="33" selection-end-line="31" selection-end-column="33" /> 23 + <state relative-caret-position="578">
  24 + <caret line="39" column="32" lean-forward="true" selection-start-line="39" selection-start-column="32" selection-end-line="39" selection-end-column="32" />
29 <folding> 25 <folding>
30 <element signature="e#128#163#0#PHP" expanded="true" /> 26 <element signature="e#128#163#0#PHP" expanded="true" />
31 </folding> 27 </folding>
@@ -33,6 +29,15 @@ @@ -33,6 +29,15 @@
33 </provider> 29 </provider>
34 </entry> 30 </entry>
35 </file> 31 </file>
  32 + <file leaf-file-name=".gitlab-ci.yml" pinned="false" current-in-tab="true">
  33 + <entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
  34 + <provider selected="true" editor-type-id="text-editor">
  35 + <state relative-caret-position="136">
  36 + <caret line="8" column="15" lean-forward="true" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
  37 + </state>
  38 + </provider>
  39 + </entry>
  40 + </file>
36 <file leaf-file-name="helper.php" pinned="false" current-in-tab="false"> 41 <file leaf-file-name="helper.php" pinned="false" current-in-tab="false">
37 <entry file="file://$PROJECT_DIR$/thinkphp/helper.php"> 42 <entry file="file://$PROJECT_DIR$/thinkphp/helper.php">
38 <provider selected="true" editor-type-id="text-editor"> 43 <provider selected="true" editor-type-id="text-editor">
@@ -120,6 +125,7 @@ @@ -120,6 +125,7 @@
120 <option value="$PROJECT_DIR$/public/assets/js/backend/goods.js" /> 125 <option value="$PROJECT_DIR$/public/assets/js/backend/goods.js" />
121 <option value="$PROJECT_DIR$/application/home/view/index/login.html" /> 126 <option value="$PROJECT_DIR$/application/home/view/index/login.html" />
122 <option value="$PROJECT_DIR$/application/home/controller/Index.php" /> 127 <option value="$PROJECT_DIR$/application/home/controller/Index.php" />
  128 + <option value="$PROJECT_DIR$/.gitlab-ci.yml" />
123 </list> 129 </list>
124 </option> 130 </option>
125 </component> 131 </component>
@@ -199,93 +205,6 @@ @@ -199,93 +205,6 @@
199 <item name="adverh5" type="b2602c69:ProjectViewProjectNode" /> 205 <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
200 <item name="adverh5" type="462c0819:PsiDirectoryNode" /> 206 <item name="adverh5" type="462c0819:PsiDirectoryNode" />
201 </path> 207 </path>
202 - <path>  
203 - <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />  
204 - <item name="adverh5" type="462c0819:PsiDirectoryNode" />  
205 - <item name="application" type="462c0819:PsiDirectoryNode" />  
206 - </path>  
207 - <path>  
208 - <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />  
209 - <item name="adverh5" type="462c0819:PsiDirectoryNode" />  
210 - <item name="application" type="462c0819:PsiDirectoryNode" />  
211 - <item name="admin" type="462c0819:PsiDirectoryNode" />  
212 - </path>  
213 - <path>  
214 - <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />  
215 - <item name="adverh5" type="462c0819:PsiDirectoryNode" />  
216 - <item name="application" type="462c0819:PsiDirectoryNode" />  
217 - <item name="admin" type="462c0819:PsiDirectoryNode" />  
218 - <item name="controller" type="462c0819:PsiDirectoryNode" />  
219 - </path>  
220 - <path>  
221 - <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />  
222 - <item name="adverh5" type="462c0819:PsiDirectoryNode" />  
223 - <item name="application" type="462c0819:PsiDirectoryNode" />  
224 - <item name="admin" type="462c0819:PsiDirectoryNode" />  
225 - <item name="validate" type="462c0819:PsiDirectoryNode" />  
226 - </path>  
227 - <path>  
228 - <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />  
229 - <item name="adverh5" type="462c0819:PsiDirectoryNode" />  
230 - <item name="application" type="462c0819:PsiDirectoryNode" />  
231 - <item name="admin" type="462c0819:PsiDirectoryNode" />  
232 - <item name="view" type="462c0819:PsiDirectoryNode" />  
233 - </path>  
234 - <path>  
235 - <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />  
236 - <item name="adverh5" type="462c0819:PsiDirectoryNode" />  
237 - <item name="application" type="462c0819:PsiDirectoryNode" />  
238 - <item name="admin" type="462c0819:PsiDirectoryNode" />  
239 - <item name="view" type="462c0819:PsiDirectoryNode" />  
240 - <item name="goods" type="462c0819:PsiDirectoryNode" />  
241 - </path>  
242 - <path>  
243 - <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />  
244 - <item name="adverh5" type="462c0819:PsiDirectoryNode" />  
245 - <item name="application" type="462c0819:PsiDirectoryNode" />  
246 - <item name="extra" type="462c0819:PsiDirectoryNode" />  
247 - </path>  
248 - <path>  
249 - <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />  
250 - <item name="adverh5" type="462c0819:PsiDirectoryNode" />  
251 - <item name="public" type="462c0819:PsiDirectoryNode" />  
252 - </path>  
253 - <path>  
254 - <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />  
255 - <item name="adverh5" type="462c0819:PsiDirectoryNode" />  
256 - <item name="public" type="462c0819:PsiDirectoryNode" />  
257 - <item name="assets" type="462c0819:PsiDirectoryNode" />  
258 - </path>  
259 - <path>  
260 - <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />  
261 - <item name="adverh5" type="462c0819:PsiDirectoryNode" />  
262 - <item name="public" type="462c0819:PsiDirectoryNode" />  
263 - <item name="assets" type="462c0819:PsiDirectoryNode" />  
264 - <item name="adverh5" type="462c0819:PsiDirectoryNode" />  
265 - </path>  
266 - <path>  
267 - <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />  
268 - <item name="adverh5" type="462c0819:PsiDirectoryNode" />  
269 - <item name="public" type="462c0819:PsiDirectoryNode" />  
270 - <item name="assets" type="462c0819:PsiDirectoryNode" />  
271 - <item name="adverh5" type="462c0819:PsiDirectoryNode" />  
272 - <item name="js" type="462c0819:PsiDirectoryNode" />  
273 - </path>  
274 - <path>  
275 - <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />  
276 - <item name="adverh5" type="462c0819:PsiDirectoryNode" />  
277 - <item name="public" type="462c0819:PsiDirectoryNode" />  
278 - <item name="assets" type="462c0819:PsiDirectoryNode" />  
279 - <item name="js" type="462c0819:PsiDirectoryNode" />  
280 - </path>  
281 - <path>  
282 - <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />  
283 - <item name="adverh5" type="462c0819:PsiDirectoryNode" />  
284 - <item name="public" type="462c0819:PsiDirectoryNode" />  
285 - <item name="assets" type="462c0819:PsiDirectoryNode" />  
286 - <item name="js" type="462c0819:PsiDirectoryNode" />  
287 - <item name="backend" type="462c0819:PsiDirectoryNode" />  
288 - </path>  
289 </expand> 208 </expand>
290 <select /> 209 <select />
291 </subPane> 210 </subPane>
@@ -303,16 +222,16 @@ @@ -303,16 +222,16 @@
303 <property name="settings.editor.selected.configurable" value="terminal" /> 222 <property name="settings.editor.selected.configurable" value="terminal" />
304 </component> 223 </component>
305 <component name="RecentsManager"> 224 <component name="RecentsManager">
306 - <key name="MoveFile.RECENT_KEYS">  
307 - <recent name="D:\wamp\www\adverh5\application\home\view" />  
308 - <recent name="D:\wamp\www\adverh5\application\index\view\home\index" />  
309 - </key>  
310 <key name="CopyFile.RECENT_KEYS"> 225 <key name="CopyFile.RECENT_KEYS">
  226 + <recent name="D:\wamp\www\adverh5" />
311 <recent name="D:\wamp\www\adverh5\public\assets\adverh5\css" /> 227 <recent name="D:\wamp\www\adverh5\public\assets\adverh5\css" />
312 <recent name="D:\wamp\www\adverh5\public\assets\adverh5\img" /> 228 <recent name="D:\wamp\www\adverh5\public\assets\adverh5\img" />
313 <recent name="D:\wamp\www\adverh5\application\home\view\index" /> 229 <recent name="D:\wamp\www\adverh5\application\home\view\index" />
314 <recent name="D:\wamp\www\adverh5\public\assets\adverh5\js" /> 230 <recent name="D:\wamp\www\adverh5\public\assets\adverh5\js" />
315 - <recent name="D:\wamp\www\adverh5\public" /> 231 + </key>
  232 + <key name="MoveFile.RECENT_KEYS">
  233 + <recent name="D:\wamp\www\adverh5\application\home\view" />
  234 + <recent name="D:\wamp\www\adverh5\application\index\view\home\index" />
316 </key> 235 </key>
317 </component> 236 </component>
318 <component name="RunDashboard"> 237 <component name="RunDashboard">
@@ -338,12 +257,12 @@ @@ -338,12 +257,12 @@
338 <option name="presentableId" value="Default" /> 257 <option name="presentableId" value="Default" />
339 <updated>1571368480027</updated> 258 <updated>1571368480027</updated>
340 <workItem from="1571368481262" duration="23015000" /> 259 <workItem from="1571368481262" duration="23015000" />
341 - <workItem from="1571618159935" duration="2519000" /> 260 + <workItem from="1571618159935" duration="3254000" />
342 </task> 261 </task>
343 <servers /> 262 <servers />
344 </component> 263 </component>
345 <component name="TimeTrackingManager"> 264 <component name="TimeTrackingManager">
346 - <option name="totallyTimeSpent" value="25534000" /> 265 + <option name="totallyTimeSpent" value="26269000" />
347 </component> 266 </component>
348 <component name="ToolWindowManager"> 267 <component name="ToolWindowManager">
349 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 268 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -650,14 +569,21 @@ @@ -650,14 +569,21 @@
650 </entry> 569 </entry>
651 <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php"> 570 <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
652 <provider selected="true" editor-type-id="text-editor"> 571 <provider selected="true" editor-type-id="text-editor">
653 - <state relative-caret-position="442">  
654 - <caret line="31" column="33" selection-start-line="31" selection-start-column="33" selection-end-line="31" selection-end-column="33" /> 572 + <state relative-caret-position="578">
  573 + <caret line="39" column="32" lean-forward="true" selection-start-line="39" selection-start-column="32" selection-end-line="39" selection-end-column="32" />
655 <folding> 574 <folding>
656 <element signature="e#128#163#0#PHP" expanded="true" /> 575 <element signature="e#128#163#0#PHP" expanded="true" />
657 </folding> 576 </folding>
658 </state> 577 </state>
659 </provider> 578 </provider>
660 </entry> 579 </entry>
  580 + <entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
  581 + <provider selected="true" editor-type-id="text-editor">
  582 + <state relative-caret-position="136">
  583 + <caret line="8" column="15" lean-forward="true" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
  584 + </state>
  585 + </provider>
  586 + </entry>
661 </component> 587 </component>
662 <component name="masterDetails"> 588 <component name="masterDetails">
663 <states> 589 <states>
@@ -16,15 +16,15 @@ return [ @@ -16,15 +16,15 @@ return [
16 // 数据库类型 16 // 数据库类型
17 'type' => Env::get('database.type', 'mysql'), 17 'type' => Env::get('database.type', 'mysql'),
18 // 服务器地址 18 // 服务器地址
19 - 'hostname' => Env::get('database.hostname', '127.0.0.1'), 19 + 'hostname' => Env::get('database.hostname', 'rm-m5eblhc9o3515i25n.mysql.rds.aliyuncs.com'),
20 // 数据库名 20 // 数据库名
21 'database' => Env::get('database.database', 'adverh5'), 21 'database' => Env::get('database.database', 'adverh5'),
22 // 用户名 22 // 用户名
23 - 'username' => Env::get('database.username', 'root'), 23 + 'username' => Env::get('database.username', 'db136s1ehvo1yn73'),
24 // 密码 24 // 密码
25 - 'password' => Env::get('database.password', ''), 25 + 'password' => Env::get('database.password', 'cxz307311SJK'),
26 // 端口 26 // 端口
27 - 'hostport' => Env::get('database.hostport', ''), 27 + 'hostport' => Env::get('database.hostport', '3306'),
28 // 连接dsn 28 // 连接dsn
29 'dsn' => '', 29 'dsn' => '',
30 // 数据库连接参数 30 // 数据库连接参数