郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 331732d9e147d4ff1c7fa2cbaa59094a218576d0 1 个父辈 e88f4548
1 个管道 的构建 通过 耗费 0 秒

appid

内嵌 并排对比
正在显示 2 个修改的文件 包含 69 行增加 和 62 行删除
... ... @@ -3,9 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OrderController.php" afterPath="$PROJECT_DIR$/api/index/controller/OrderController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" afterPath="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/config.php" afterPath="$PROJECT_DIR$/app/config.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/config.php" afterPath="$PROJECT_DIR$/api/config.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -79,11 +77,27 @@
</provider>
</entry>
</file>
<file leaf-file-name="PublicController.php" pinned="false" current-in-tab="true">
<file leaf-file-name="PublicController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="414">
<caret line="236" column="7" lean-forward="true" selection-start-line="236" selection-start-column="7" selection-end-line="236" selection-end-column="7" />
<state relative-caret-position="675">
<caret line="55" column="9" lean-forward="true" selection-start-line="55" selection-start-column="9" selection-end-line="55" selection-end-column="9" />
<folding>
<element signature="e#1811#2278#0#PHP" expanded="false" />
<element signature="e#2283#5971#0#PHP" expanded="false" />
<element signature="e#5977#6278#0#PHP" expanded="false" />
<element signature="e#6283#7591#0#PHP" expanded="false" />
<element signature="e#7598#8002#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="config.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="714">
<caret line="258" column="9" lean-forward="false" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
<folding />
</state>
</provider>
... ... @@ -109,7 +123,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/add.html" />
<option value="$PROJECT_DIR$/app/index/model/ShopgoodsModel.php" />
<option value="$PROJECT_DIR$/app/index/controller/DoorController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/ShopgoodsController.php" />
... ... @@ -160,6 +173,7 @@
<option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
<option value="$PROJECT_DIR$/app/config.php" />
<option value="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" />
<option value="$PROJECT_DIR$/api/config.php" />
</list>
</option>
</component>
... ... @@ -177,9 +191,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="341" />
<option name="y" value="29" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="-126" />
<option name="y" value="25" />
<option name="width" value="1935" />
<option name="height" value="1076" />
</component>
... ... @@ -226,27 +240,12 @@
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="model" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="wxapp" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="wxapp" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
... ... @@ -324,15 +323,15 @@
<workItem from="1573517804403" duration="18784000" />
<workItem from="1573542205740" duration="11653000" />
<workItem from="1573604588269" duration="25250000" />
<workItem from="1573690800296" duration="12611000" />
<workItem from="1573690800296" duration="13312000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="252141000" />
<option name="totallyTimeSpent" value="252842000" />
</component>
<component name="ToolWindowManager">
<frame x="341" y="29" width="1935" height="1076" extended-state="0" />
<frame x="-126" y="25" width="1935" height="1076" extended-state="1" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16213334" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
... ... @@ -386,33 +385,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="259">
<caret line="34" column="17" lean-forward="true" selection-start-line="34" selection-start-column="17" selection-end-line="34" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ProjectController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="485">
<caret line="118" column="32" lean-forward="true" selection-start-line="118" selection-start-column="32" selection-end-line="118" selection-end-column="32" />
<folding>
<element signature="e#275#1168#0#PHP" expanded="false" />
<element signature="e#1185#2077#0#PHP" expanded="false" />
<element signature="e#2098#3379#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="311">
<caret line="32" column="9" lean-forward="false" selection-start-line="32" selection-start-column="9" selection-end-line="32" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
... ... @@ -851,18 +823,48 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/config.php">
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/library/think/Config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="588">
<caret line="232" column="43" lean-forward="true" selection-start-line="232" selection-start-column="43" selection-end-line="232" selection-end-column="43" />
<state relative-caret-position="304">
<caret line="100" column="27" lean-forward="false" selection-start-line="100" selection-start-column="27" selection-end-line="100" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="105" column="96" lean-forward="false" selection-start-line="105" selection-start-column="96" selection-end-line="105" selection-end-column="96" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="414">
<caret line="236" column="7" lean-forward="true" selection-start-line="236" selection-start-column="7" selection-end-line="236" selection-end-column="7" />
<state relative-caret-position="675">
<caret line="55" column="9" lean-forward="true" selection-start-line="55" selection-start-column="9" selection-end-line="55" selection-end-column="9" />
<folding>
<element signature="e#1811#2278#0#PHP" expanded="false" />
<element signature="e#2283#5971#0#PHP" expanded="false" />
<element signature="e#5977#6278#0#PHP" expanded="false" />
<element signature="e#6283#7591#0#PHP" expanded="false" />
<element signature="e#7598#8002#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="663">
<caret line="235" column="4" lean-forward="true" selection-start-line="235" selection-start-column="4" selection-end-line="237" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="714">
<caret line="258" column="9" lean-forward="false" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
<folding />
</state>
</provider>
... ...
... ... @@ -255,4 +255,9 @@ return [
'cmf_default_theme' => 'simpleboot3',
'cmf_admin_theme_path' => 'themes/admin/',
'cmf_admin_default_theme' => 'simpleboot3',
//小程序配置
'app_id'=>'wxf35ab92c5bd897b2',
'app_secret'=>'18ae3d2d5d18a646a792f4468a3e0e9f',
];
... ...