外包项目 / signUpForCar · 提交

转到一个项目

作者 sgj
提交 8bcd19082e7330fba480d5eb00701727da7280ad 1 个父辈 d9fd0878
1 个管道 的构建 失败 耗费 0 秒

评价问题重构

内嵌 并排对比
正在显示 2 个修改的文件 包含 58 行增加 和 62 行删除
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment="评价问题重构"> 4 <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment="评价问题重构">
5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/public/paycenter/wechat/WxPay.Config.php" beforeDir="false" afterPath="$PROJECT_DIR$/public/paycenter/wechat/WxPay.Config.php" afterDir="false" />
6 </list> 7 </list>
7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
8 <option name="SHOW_DIALOG" value="false" /> 9 <option name="SHOW_DIALOG" value="false" />
@@ -37,24 +38,24 @@ @@ -37,24 +38,24 @@
37 </usages-collector> 38 </usages-collector>
38 <usages-collector id="statistics.file.extensions.open"> 39 <usages-collector id="statistics.file.extensions.open">
39 <counts> 40 <counts>
40 - <entry key="log" value="2" /> 41 + <entry key="log" value="5" />
41 <entry key="php" value="4" /> 42 <entry key="php" value="4" />
42 </counts> 43 </counts>
43 </usages-collector> 44 </usages-collector>
44 <usages-collector id="statistics.file.types.open"> 45 <usages-collector id="statistics.file.types.open">
45 <counts> 46 <counts>
46 - <entry key="ANSI Aware" value="2" /> 47 + <entry key="ANSI Aware" value="5" />
47 <entry key="PHP" value="4" /> 48 <entry key="PHP" value="4" />
48 </counts> 49 </counts>
49 </usages-collector> 50 </usages-collector>
50 <usages-collector id="statistics.file.extensions.edit"> 51 <usages-collector id="statistics.file.extensions.edit">
51 <counts> 52 <counts>
52 - <entry key="php" value="82" /> 53 + <entry key="php" value="88" />
53 </counts> 54 </counts>
54 </usages-collector> 55 </usages-collector>
55 <usages-collector id="statistics.file.types.edit"> 56 <usages-collector id="statistics.file.types.edit">
56 <counts> 57 <counts>
57 - <entry key="PHP" value="82" /> 58 + <entry key="PHP" value="88" />
58 </counts> 59 </counts>
59 </usages-collector> 60 </usages-collector>
60 </session> 61 </session>
@@ -64,8 +65,8 @@ @@ -64,8 +65,8 @@
64 <file pinned="false" current-in-tab="false"> 65 <file pinned="false" current-in-tab="false">
65 <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php"> 66 <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
66 <provider selected="true" editor-type-id="text-editor"> 67 <provider selected="true" editor-type-id="text-editor">
67 - <state relative-caret-position="125">  
68 - <caret line="16" selection-start-line="16" selection-end-line="16" /> 68 + <state relative-caret-position="425">
  69 + <caret line="87" column="24" lean-forward="true" selection-start-line="87" selection-start-column="24" selection-end-line="87" selection-end-column="24" />
69 <folding> 70 <folding>
70 <element signature="e#811#836#0#PHP" /> 71 <element signature="e#811#836#0#PHP" />
71 <element signature="e#855#1471#0#PHP" /> 72 <element signature="e#855#1471#0#PHP" />
@@ -76,20 +77,17 @@ @@ -76,20 +77,17 @@
76 <element signature="e#2353#2497#0#PHP" /> 77 <element signature="e#2353#2497#0#PHP" />
77 <element signature="e#2425#2497#0#PHP" /> 78 <element signature="e#2425#2497#0#PHP" />
78 <element signature="e#2627#2680#0#PHP" /> 79 <element signature="e#2627#2680#0#PHP" />
79 - <element signature="e#2720#2763#0#PHP" />  
80 - <element signature="e#2720#2820#0#PHP" />  
81 <element signature="e#2720#2879#0#PHP" /> 80 <element signature="e#2720#2879#0#PHP" />
82 - <element signature="e#2720#2915#0#PHP" />  
83 </folding> 81 </folding>
84 </state> 82 </state>
85 </provider> 83 </provider>
86 </entry> 84 </entry>
87 </file> 85 </file>
88 - <file pinned="false" current-in-tab="false"> 86 + <file pinned="false" current-in-tab="true">
89 <entry file="file://$PROJECT_DIR$/public/paycenter/wechat/WxPay.Config.php"> 87 <entry file="file://$PROJECT_DIR$/public/paycenter/wechat/WxPay.Config.php">
90 <provider selected="true" editor-type-id="text-editor"> 88 <provider selected="true" editor-type-id="text-editor">
91 - <state relative-caret-position="550">  
92 - <caret line="43" column="26" selection-start-line="43" selection-start-column="26" selection-end-line="43" selection-end-column="26" /> 89 + <state relative-caret-position="369">
  90 + <caret line="31" column="36" lean-forward="true" selection-start-line="31" selection-start-column="36" selection-end-line="31" selection-end-column="36" />
93 </state> 91 </state>
94 </provider> 92 </provider>
95 </entry> 93 </entry>
@@ -97,8 +95,8 @@ @@ -97,8 +95,8 @@
97 <file pinned="false" current-in-tab="false"> 95 <file pinned="false" current-in-tab="false">
98 <entry file="file://$PROJECT_DIR$/simplewind/vendor/wxpay_php_sdk/lib/WxPay.Api.php"> 96 <entry file="file://$PROJECT_DIR$/simplewind/vendor/wxpay_php_sdk/lib/WxPay.Api.php">
99 <provider selected="true" editor-type-id="text-editor"> 97 <provider selected="true" editor-type-id="text-editor">
100 - <state relative-caret-position="398">  
101 - <caret line="24" column="33" selection-start-line="24" selection-start-column="33" selection-end-line="24" selection-end-column="33" /> 98 + <state relative-caret-position="13450">
  99 + <caret line="610" lean-forward="true" selection-start-line="610" selection-end-line="610" />
102 </state> 100 </state>
103 </provider> 101 </provider>
104 </entry> 102 </entry>
@@ -106,13 +104,13 @@ @@ -106,13 +104,13 @@
106 <file pinned="false" current-in-tab="false"> 104 <file pinned="false" current-in-tab="false">
107 <entry file="file://$PROJECT_DIR$/public/paycenter/wechat/index.php"> 105 <entry file="file://$PROJECT_DIR$/public/paycenter/wechat/index.php">
108 <provider selected="true" editor-type-id="text-editor"> 106 <provider selected="true" editor-type-id="text-editor">
109 - <state relative-caret-position="400">  
110 - <caret line="58" column="39" lean-forward="true" selection-start-line="58" selection-start-column="39" selection-end-line="58" selection-end-column="39" /> 107 + <state relative-caret-position="696">
  108 + <caret line="49" column="25" selection-start-line="49" selection-start-column="25" selection-end-line="49" selection-end-column="25" />
111 </state> 109 </state>
112 </provider> 110 </provider>
113 </entry> 111 </entry>
114 </file> 112 </file>
115 - <file pinned="false" current-in-tab="true"> 113 + <file pinned="false" current-in-tab="false">
116 <entry file="file://$PROJECT_DIR$/public/paycenter/wechat/WxPay.JsApiPay.php"> 114 <entry file="file://$PROJECT_DIR$/public/paycenter/wechat/WxPay.JsApiPay.php">
117 <provider selected="true" editor-type-id="text-editor"> 115 <provider selected="true" editor-type-id="text-editor">
118 <state relative-caret-position="148"> 116 <state relative-caret-position="148">
@@ -218,8 +216,8 @@ @@ -218,8 +216,8 @@
218 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController.php" /> 216 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController.php" />
219 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [4].php" /> 217 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [4].php" />
220 <option value="$PROJECT_DIR$/app/user/controller/CommentController.php" /> 218 <option value="$PROJECT_DIR$/app/user/controller/CommentController.php" />
221 - <option value="$PROJECT_DIR$/public/paycenter/wechat/WxPay.Config.php" />  
222 <option value="$PROJECT_DIR$/public/paycenter/wechat/index.php" /> 219 <option value="$PROJECT_DIR$/public/paycenter/wechat/index.php" />
  220 + <option value="$PROJECT_DIR$/public/paycenter/wechat/WxPay.Config.php" />
223 </list> 221 </list>
224 </option> 222 </option>
225 </component> 223 </component>
@@ -370,28 +368,7 @@ @@ -370,28 +368,7 @@
370 <workItem from="1536496471879" duration="16852000" /> 368 <workItem from="1536496471879" duration="16852000" />
371 <workItem from="1536677895835" duration="7811000" /> 369 <workItem from="1536677895835" duration="7811000" />
372 <workItem from="1536940132237" duration="27028000" /> 370 <workItem from="1536940132237" duration="27028000" />
373 - <workItem from="1554968186701" duration="3715000" />  
374 - </task>  
375 - <task id="LOCAL-00044" summary="登录处理">  
376 - <created>1535638014265</created>  
377 - <option name="number" value="00044" />  
378 - <option name="presentableId" value="LOCAL-00044" />  
379 - <option name="project" value="LOCAL" />  
380 - <updated>1535638014265</updated>  
381 - </task>  
382 - <task id="LOCAL-00045" summary="登录处理">  
383 - <created>1535638593262</created>  
384 - <option name="number" value="00045" />  
385 - <option name="presentableId" value="LOCAL-00045" />  
386 - <option name="project" value="LOCAL" />  
387 - <updated>1535638593262</updated>  
388 - </task>  
389 - <task id="LOCAL-00046" summary="登录处理">  
390 - <created>1535638797137</created>  
391 - <option name="number" value="00046" />  
392 - <option name="presentableId" value="LOCAL-00046" />  
393 - <option name="project" value="LOCAL" />  
394 - <updated>1535638797137</updated> 371 + <workItem from="1554968186701" duration="5626000" />
395 </task> 372 </task>
396 <task id="LOCAL-00047" summary="登录处理"> 373 <task id="LOCAL-00047" summary="登录处理">
397 <created>1535639135284</created> 374 <created>1535639135284</created>
@@ -715,11 +692,32 @@ @@ -715,11 +692,32 @@
715 <option name="project" value="LOCAL" /> 692 <option name="project" value="LOCAL" />
716 <updated>1554972036379</updated> 693 <updated>1554972036379</updated>
717 </task> 694 </task>
718 - <option name="localTasksCounter" value="93" /> 695 + <task id="LOCAL-00093" summary="评价问题重构">
  696 + <created>1554972366142</created>
  697 + <option name="number" value="00093" />
  698 + <option name="presentableId" value="LOCAL-00093" />
  699 + <option name="project" value="LOCAL" />
  700 + <updated>1554972366143</updated>
  701 + </task>
  702 + <task id="LOCAL-00094" summary="评价问题重构">
  703 + <created>1554972460183</created>
  704 + <option name="number" value="00094" />
  705 + <option name="presentableId" value="LOCAL-00094" />
  706 + <option name="project" value="LOCAL" />
  707 + <updated>1554972460183</updated>
  708 + </task>
  709 + <task id="LOCAL-00095" summary="评价问题重构">
  710 + <created>1554972585180</created>
  711 + <option name="number" value="00095" />
  712 + <option name="presentableId" value="LOCAL-00095" />
  713 + <option name="project" value="LOCAL" />
  714 + <updated>1554972585180</updated>
  715 + </task>
  716 + <option name="localTasksCounter" value="96" />
719 <servers /> 717 <servers />
720 </component> 718 </component>
721 <component name="TimeTrackingManager"> 719 <component name="TimeTrackingManager">
722 - <option name="totallyTimeSpent" value="170325000" /> 720 + <option name="totallyTimeSpent" value="172236000" />
723 </component> 721 </component>
724 <component name="ToolWindowManager"> 722 <component name="ToolWindowManager">
725 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 723 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -927,24 +925,31 @@ @@ -927,24 +925,31 @@
927 </state> 925 </state>
928 </provider> 926 </provider>
929 </entry> 927 </entry>
930 - <entry file="file://$PROJECT_DIR$/public/paycenter/wechat/WxPay.Config.php"> 928 + <entry file="file://$PROJECT_DIR$/public/paycenter/wechat/WxPay.JsApiPay.php">
  929 + <provider selected="true" editor-type-id="text-editor">
  930 + <state relative-caret-position="148">
  931 + <caret line="166" column="20" selection-start-line="166" selection-start-column="20" selection-end-line="166" selection-end-column="20" />
  932 + </state>
  933 + </provider>
  934 + </entry>
  935 + <entry file="file://$PROJECT_DIR$/public/paycenter/wechat/index.php">
931 <provider selected="true" editor-type-id="text-editor"> 936 <provider selected="true" editor-type-id="text-editor">
932 - <state relative-caret-position="550">  
933 - <caret line="43" column="26" selection-start-line="43" selection-start-column="26" selection-end-line="43" selection-end-column="26" /> 937 + <state relative-caret-position="696">
  938 + <caret line="49" column="25" selection-start-line="49" selection-start-column="25" selection-end-line="49" selection-end-column="25" />
934 </state> 939 </state>
935 </provider> 940 </provider>
936 </entry> 941 </entry>
937 <entry file="file://$PROJECT_DIR$/simplewind/vendor/wxpay_php_sdk/lib/WxPay.Api.php"> 942 <entry file="file://$PROJECT_DIR$/simplewind/vendor/wxpay_php_sdk/lib/WxPay.Api.php">
938 <provider selected="true" editor-type-id="text-editor"> 943 <provider selected="true" editor-type-id="text-editor">
939 - <state relative-caret-position="398">  
940 - <caret line="24" column="33" selection-start-line="24" selection-start-column="33" selection-end-line="24" selection-end-column="33" /> 944 + <state relative-caret-position="13450">
  945 + <caret line="610" lean-forward="true" selection-start-line="610" selection-end-line="610" />
941 </state> 946 </state>
942 </provider> 947 </provider>
943 </entry> 948 </entry>
944 <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php"> 949 <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
945 <provider selected="true" editor-type-id="text-editor"> 950 <provider selected="true" editor-type-id="text-editor">
946 - <state relative-caret-position="125">  
947 - <caret line="16" selection-start-line="16" selection-end-line="16" /> 951 + <state relative-caret-position="425">
  952 + <caret line="87" column="24" lean-forward="true" selection-start-line="87" selection-start-column="24" selection-end-line="87" selection-end-column="24" />
948 <folding> 953 <folding>
949 <element signature="e#811#836#0#PHP" /> 954 <element signature="e#811#836#0#PHP" />
950 <element signature="e#855#1471#0#PHP" /> 955 <element signature="e#855#1471#0#PHP" />
@@ -955,25 +960,15 @@ @@ -955,25 +960,15 @@
955 <element signature="e#2353#2497#0#PHP" /> 960 <element signature="e#2353#2497#0#PHP" />
956 <element signature="e#2425#2497#0#PHP" /> 961 <element signature="e#2425#2497#0#PHP" />
957 <element signature="e#2627#2680#0#PHP" /> 962 <element signature="e#2627#2680#0#PHP" />
958 - <element signature="e#2720#2763#0#PHP" />  
959 - <element signature="e#2720#2820#0#PHP" />  
960 <element signature="e#2720#2879#0#PHP" /> 963 <element signature="e#2720#2879#0#PHP" />
961 - <element signature="e#2720#2915#0#PHP" />  
962 </folding> 964 </folding>
963 </state> 965 </state>
964 </provider> 966 </provider>
965 </entry> 967 </entry>
966 - <entry file="file://$PROJECT_DIR$/public/paycenter/wechat/index.php">  
967 - <provider selected="true" editor-type-id="text-editor">  
968 - <state relative-caret-position="400">  
969 - <caret line="58" column="39" lean-forward="true" selection-start-line="58" selection-start-column="39" selection-end-line="58" selection-end-column="39" />  
970 - </state>  
971 - </provider>  
972 - </entry>  
973 - <entry file="file://$PROJECT_DIR$/public/paycenter/wechat/WxPay.JsApiPay.php"> 968 + <entry file="file://$PROJECT_DIR$/public/paycenter/wechat/WxPay.Config.php">
974 <provider selected="true" editor-type-id="text-editor"> 969 <provider selected="true" editor-type-id="text-editor">
975 - <state relative-caret-position="148">  
976 - <caret line="166" column="20" selection-start-line="166" selection-start-column="20" selection-end-line="166" selection-end-column="20" /> 970 + <state relative-caret-position="369">
  971 + <caret line="31" column="36" lean-forward="true" selection-start-line="31" selection-start-column="36" selection-end-line="31" selection-end-column="36" />
977 </state> 972 </state>
978 </provider> 973 </provider>
979 </entry> 974 </entry>
@@ -31,6 +31,7 @@ class WxPayConfig extends WxPayConfigInterface @@ -31,6 +31,7 @@ class WxPayConfig extends WxPayConfigInterface
31 { 31 {
32 return 'wx9d48b377e902df8b'; 32 return 'wx9d48b377e902df8b';
33 } 33 }
  34 +
34 public function GetMerchantId() 35 public function GetMerchantId()
35 { 36 {
36 return '1525668131'; 37 return '1525668131';