Merge branch 'master' of http://154.8.193.216:3030/admin1/qingcheng-xiaochengxu

.idea/.gitignore

@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.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/qingcheng-xiaochengxu.iml" filepath="$PROJECT_DIR$/.idea/qingcheng-xiaochengxu.iml" />
+    </modules>
+  </component>
+</project>

.idea/qingcheng-xiaochengxu.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/vcs.xml

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

package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "青橙",
+  "name": "qingcheng-xiaochengxu",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

request.js

@@ -1 +1 @@
-export const url='http://1.94.237.210:3457';
+export const url='http://1.94.237.210:3457';