冲突

.gitignore

@@ -0,0 +1 @@
+/runtime/*

.idea/.gitignore

@@ -0,0 +1,2 @@
+# Default ignored files
+/workspace.xml

.idea/csapi.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/csapi.iml" filepath="$PROJECT_DIR$/.idea/csapi.iml" />
+    </modules>
+  </component>
+</project>

.idea/php.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PhpProjectSharedConfiguration" php_language_level="5.4.0" />
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

LICENSE.txt

@@ -1,4 +1,4 @@
-q
+
 ThinkPHP遵循Apache2开源协议发布，并提供免费使用。
 版权所有Copyright © 2006-2016 by ThinkPHP (http://thinkphp.cn)
 All rights reserved。

public/COMPANY_LIST/BOXLUNCH/auth.php

@@ -6,7 +6,11 @@ return [
     
     'JSMS_appKey'=>'5567f6d409efe098392ca27b',//极光短信appKey
     'JSMS_masterSecret'=>'05aa76b3b4be0fb06cbb9c4a',//极光短信secret
-    
+
+    //微信JS
+    'Wechat_js_appId'=>'wx08a4db6a54f73c6f',
+    'Wechat_js_appsecret'=>'8e3a6165ce46e22ea2bb278e0092e71f',
+
     //验证参数
     'signKey'=>'233E2696D14DBM44257C08512CE51EC7',
 ];

tests/TestCase.php

@@ -12,5 +12,5 @@ namespace tests;
 
 class TestCase extends \think\testing\TestCase
 {
-    protected $baseUrl = 'http://localhost';
+    protected $baseUrl = 'http://localhost';//
 }