Commit a6b2f4a0 by jscat

公众号: 添加公众号和注册相关文件

parent caf0a97e
{ {
{ {
"pages": [ "pages": [
"pages/key/key", "pages/key/key",
"pages/discover/note-info/note-info",
"pages/my/my", "pages/my/my",
"pages/discover/discover",
"pages/discover/note-writer/note-writer",
"pages/discover/searchbar/searchbar",
"pages/map/map", "pages/map/map",
"pages/key/matchDaily/matchDaily", "pages/key/matchDaily/matchDaily",
"pages/key/matchStudy/matchStudy", "pages/key/matchStudy/matchStudy",
...@@ -34,12 +30,6 @@ ...@@ -34,12 +30,6 @@
"selectedIconPath": "./icon/map1.png" "selectedIconPath": "./icon/map1.png"
}, },
{ {
"pagePath": "pages/discover/discover",
"text": "发现",
"iconPath": "./icon/discover2.png",
"selectedIconPath": "./icon/discover2.png"
},
{
"pagePath": "pages/key/key", "pagePath": "pages/key/key",
"text": "知识", "text": "知识",
"iconPath": "./icon/key.png", "iconPath": "./icon/key.png",
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
...@@ -2,16 +2,10 @@ ...@@ -2,16 +2,10 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="86dc399d-9323-4124-8c4f-671d1ecb849c" name="Default Changelist" comment=""> <list default="true" id="86dc399d-9323-4124-8c4f-671d1ecb849c" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/../nyx-master/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/../nyx-master/app.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../nyx-master/pages/discover/discover.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/../nyx-master/pages/discover/discover.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../nyx-master/pages/key/key.js" beforeDir="false" afterPath="$PROJECT_DIR$/../nyx-master/pages/key/key.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../nyx-master/pages/discover/discover.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/../nyx-master/pages/discover/discover.wxss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../nyx-master/pages/key/matchDaily/matchDaily.js" beforeDir="false" afterPath="$PROJECT_DIR$/../nyx-master/pages/key/matchDaily/matchDaily.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../nyx-master/pages/key/matchStudy/matchStudyDetail/matchStudyDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/../nyx-master/pages/key/matchStudy/matchStudyDetail/matchStudyDetail.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../nyx-master/utils/util.js" beforeDir="false" afterPath="$PROJECT_DIR$/../nyx-master/utils/util.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/src/main/java/cn/com/fun/nyxkey/api/service/Rockwell_userService.java" beforeDir="false" afterPath="$PROJECT_DIR$/api/src/main/java/cn/com/fun/nyxkey/api/service/Rockwell_userService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/api/src/main/java/cn/com/fun/nyxkey/api/config/WebSocketServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/api/src/main/java/cn/com/fun/nyxkey/api/config/WebSocketServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/src/main/java/cn/com/fun/nyxkey/api/service/impl/Rockwell_userServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/api/src/main/java/cn/com/fun/nyxkey/api/service/impl/Rockwell_userServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/src/main/java/cn/com/fun/nyxkey/api/web/controller/UserApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/api/src/main/java/cn/com/fun/nyxkey/api/web/controller/UserApiController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/src/main/resources/cn/com/fun/nyxkey/api/repository/Rockwell_keyMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/api/src/main/resources/cn/com/fun/nyxkey/api/repository/Rockwell_keyMapper.xml" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -110,6 +104,8 @@ ...@@ -110,6 +104,8 @@
<workItem from="1585328428756" duration="46000" /> <workItem from="1585328428756" duration="46000" />
<workItem from="1585359613401" duration="3288000" /> <workItem from="1585359613401" duration="3288000" />
<workItem from="1585383375967" duration="1408000" /> <workItem from="1585383375967" duration="1408000" />
<workItem from="1585742641617" duration="2946000" />
<workItem from="1585897624622" duration="2734000" />
</task> </task>
<servers /> <servers />
</component> </component>
......
package cn.com.fun.nyxkey.api.config; package cn.com.fun.nyxkey.api.config;
...@@ -82,6 +82,7 @@ public class WebSocketServer { ...@@ -82,6 +82,7 @@ public class WebSocketServer {
UrlEncoded.decodeTo(result.substring(result.indexOf("?") + 1), multiMap, "UTF-8"); UrlEncoded.decodeTo(result.substring(result.indexOf("?") + 1), multiMap, "UTF-8");
System.out.println(multiMap.toString()); System.out.println(multiMap.toString());
this.session = session; this.session = session;
this.sid = multiMap.getString("sid"); this.sid = multiMap.getString("sid");
this.uid = multiMap.getString("uid"); this.uid = multiMap.getString("uid");
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论