Skip to content

Sum branch #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sumxx wants to merge 490 commits into
base: master
Choose a base branch
from
Open

Sum branch #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
490 commits
Select commit Hold shift + click to select a range
bf8646a
Merge branch 'master' of https://github.com/VNOC/vnoc into zap
zapline Nov 23, 2012
0324465
A姐 那个教室对话框弹不出来--叶.cpp said
Nov 23, 2012
4de3033
Merge branch 'master' of github.com:VNOC/vnoc
Nov 23, 2012
f81f6e9
Merge pull request #3 from rookie2/branch_sr
reallongda Nov 23, 2012
71b1573
Merge branch 'master' of github.com:VNOC/vnoc
Nov 24, 2012
293e6ea
添加对登录时用户名和密码的正则验证
Nov 24, 2012
2d6c036
Merge pull request #4 from rookie2/branch_sr
zapline Nov 24, 2012
5d9e2c7
修正消息解析的内存泄露
Sumxx Nov 24, 2012
990c6d2
delete useless files
epiciskandar Nov 25, 2012
8d0d22b
delete useless files
epiciskandar Nov 25, 2012
c1a6674
delete useless files
epiciskandar Nov 25, 2012
3972e9d
add filter rules
epiciskandar Nov 25, 2012
c5c00b8
delete useless files
epiciskandar Nov 25, 2012
de578b4
暂时找出并消除Debug没通过的原因,标识部分需要被处理.
Nov 26, 2012
a35690b
Merge pull request #5 from rookie2/branch_sr
zapline Nov 26, 2012
276f7de
删除没用的注释
Nov 26, 2012
fc77e96
Merge pull request #6 from rookie2/branch_sr
zapline Nov 26, 2012
79a9748
Merge branch 'branch_sr'
Nov 26, 2012
29ee1c9
Merge branch 'master' of github.com:VNOC/vnoc
Nov 26, 2012
6ad6b07
更新部分内容
Sumxx Nov 27, 2012
512ef9b
Merge branch 'master' of http://github.com/VNOC/vnoc into Sum_branch
Sumxx Nov 27, 2012
e513b7e
Merge pull request #7 from VNOC/Sum_branch
reallongda Nov 27, 2012
1849b91
Merge branch 'master' of github.com:VNOC/vnoc
Nov 27, 2012
1cd0222
将zpublic加到vnoc里
zapline Nov 28, 2012
bdfc2d2
modify build.bat(add update submodule)
zapline Nov 28, 2012
5b5e5d6
Revert "modify build.bat(add update submodule)"
zapline Nov 28, 2012
ba842e5
Classroom
vnoc-YeZi Nov 30, 2012
a44a599
Merge branch 'master' of github.com:VNOC/vnoc
vnoc-YeZi Nov 30, 2012
979d1d0
Merge pull request #8 from vnoc-YeZi/master
zapline Nov 30, 2012
17e0c9d
Merge branch 'master' of github.com:VNOC/vnoc
vnoc-YeZi Dec 4, 2012
a7f1624
Merge branch 'master' of github.com:VNOC/vnoc into branch_sr
Dec 5, 2012
3923bd7
教室对话框可以建立了_By叶子
Dec 7, 2012
07f6dae
Merge pull request #9 from rookie2/branch_sr
zapline Dec 7, 2012
b9fb1b5
增加简介
zapline Dec 14, 2012
bc2b702
修改readme格式
zapline Dec 14, 2012
1e892ae
添加新消息，新消息加入parser列表
Sumxx Dec 15, 2012
d559ade
add roomManager
reallongda Jan 4, 2013
a5ff5bd
Merge pull request #10 from VNOC/Sum_branch
reallongda Jan 4, 2013
9f8c190
Merge branch 'master' of https://github.com/VNOC/vnoc into longda
reallongda Jan 4, 2013
c17bed6
add Rcl message handler.
reallongda Jan 4, 2013
b7a18cd
增加命令行客户端
AngryPowman Jan 5, 2013
e8e5b68
Merge pull request #11 from VNOC/longda
reallongda Jan 6, 2013
ebd47cc
add ut for rcl message handler
reallongda Jan 6, 2013
a9a296c
Merge pull request #12 from VNOC/longda
reallongda Jan 6, 2013
ca2ea4a
小幅度修改
Sumxx Jan 6, 2013
b71ddec
加入新消息框架！
Sumxx Jan 8, 2013
b9e48d4
* 随便改改
zapline Jan 9, 2013
4431fab
增加msg格式定义文件
zapline Jan 10, 2013
806ea56
加入MsgDataValue接口
Sumxx Jan 10, 2013
af6721d
Merge branch 'Sum_branch' of https://github.com/VNOC/vnoc into Sum_br…
Sumxx Jan 10, 2013
f518748
剥离ArrData
Sumxx Jan 10, 2013
556894e
去除不必要文件，继续修改框架
Sumxx Jan 10, 2013
1e4a6a5
纰漏
Sumxx Jan 10, 2013
ce37c29
整理代码格式
Sumxx Jan 10, 2013
54d6bde
继续修改格式问题
Sumxx Jan 10, 2013
7c32b84
继续修正代码格式问题
Sumxx Jan 10, 2013
523a04f
实现Write Read接口
Sumxx Jan 12, 2013
c50b54e
加入testNMessage单元测试
Sumxx Jan 12, 2013
a4fff6a
* 修改单元测试
zapline Jan 13, 2013
150413e
Merge branch 'Sum_branch' of https://github.com/VNOC/vnoc into Sum_br…
Sumxx Jan 13, 2013
7ae4a2c
* 修改classroom的xml的编码为utf8
zapline Jan 13, 2013
267cf89
Merge branch 'Sum_branch' of https://github.com/VNOC/vnoc into Branch…
zapline Jan 13, 2013
ded5f18
Merge branch 'Sum_branch' of https://github.com/VNOC/vnoc into Sum_br…
Sumxx Jan 13, 2013
7a6af8b
Merge branch 'master' into Branch_7ae4a2cfe90729d95826136ec5434e7fca6…
zapline Jan 13, 2013
ed559b2
* 修改xml的编码
zapline Jan 13, 2013
daabe06
增加房间相关类
AngryPowman Jan 13, 2013
195f01c
Merge branch 'master' of https://github.com/VNOC/vnoc into AngryPowman
AngryPowman Jan 13, 2013
b81e2e6
加入XML解析
Sumxx Jan 14, 2013
d087d48
Merge branch 'Sum_branch' of https://github.com/VNOC/vnoc into Sum_br…
Sumxx Jan 14, 2013
f04e939
完成XML解析
Sumxx Jan 14, 2013
1e2c617
* 修改解析msg def
zapline Jan 14, 2013
4c3f269
删除zpublic模块
epiciskandar Jan 14, 2013
bd47f44
Merge pull request #13 from VNOC/Sum_branch
reallongda Jan 15, 2013
a798b78
修正代码格式问题 修正string 问题
Sumxx Jan 15, 2013
97c58d5
加入MType Type Object VMsg枚举列表
Sumxx Jan 15, 2013
7682aa1
修正编译问题
Sumxx Jan 15, 2013
c544fb4
合并Message BaseMessage
Sumxx Jan 15, 2013
3b1035b
参数不必要注释
Sumxx Jan 15, 2013
ad98021
修正CI编译不过问题 修正目录问题
Sumxx Jan 15, 2013
4418c25
从StringData看仍存在的问题：
zapline Jan 16, 2013
dd54175
Merge branch 'master' of https://github.com/VNOC/vnoc into Sum_branch
zapline Jan 16, 2013
cd03e8f
测试CI目录
Sumxx Jan 16, 2013
22c57a9
继续测试CI目录
Sumxx Jan 16, 2013
95335c1
修改msgdef.xml目录方式
Sumxx Jan 16, 2013
0a37bfd
* 修改路径获取
zapline Jan 16, 2013
c5ee648
修正目录问题
Sumxx Jan 16, 2013
6e41896
* 修改获取路径
zapline Jan 16, 2013
7661a55
* 删除无用的文件
zapline Jan 16, 2013
9b0a2bb
* 修改ArrayData
zapline Jan 16, 2013
14668d1
* 修改MsgDataValue
zapline Jan 16, 2013
9895fa4
* 修改UInt16Data
zapline Jan 16, 2013
a7c0e47
* 修改UInt8Data和UInt32Data
zapline Jan 16, 2013
c745bd4
* 修正路径笔误
zapline Jan 16, 2013
a318f92
* 修改tinyxml的组合关系为依赖关系
zapline Jan 16, 2013
699fd1b
* 修改ParserMessageXML
zapline Jan 16, 2013
301da40
* 修改CMessage
zapline Jan 16, 2013
d5f429e
* ParserMessageXML改为单例；增强CMessage的限定
zapline Jan 16, 2013
f229f36
* 完成CMessage的内存管理
zapline Jan 16, 2013
cd9c832
- 删除无用文件
zapline Jan 16, 2013
bd7a5b9
整理代码
xosdy Jan 16, 2013
fa46c66
* 完成CMessage2Pack的GetPackSize
zapline Jan 16, 2013
e0b581a
* 尼玛又笔误...sum把这几个神仙数改了吧
zapline Jan 16, 2013
b5f23a9
* 提交sum的buffer类
zapline Jan 17, 2013
b90b104
Merge branch 'roomlist' of https://github.com/VNOC/vnoc into Branch_z…
zapline Jan 17, 2013
274b511
清理无用代码
xosdy Jan 17, 2013
8f31553
Merge branch 'master' of github.com:VNOC/vnoc into YeZi
vnoc-YeZi Jan 18, 2013
1724d35
RoomList
vnoc-YeZi Jan 18, 2013
c78ccf6
Merge branch 'YeZi' of github.com:vnoc-YeZi/vnoc into YeZi
vnoc-YeZi Jan 18, 2013
8ce7f7b
加入消息自动生成
Sumxx Jan 18, 2013
143b96e
SendXMessage出错
xosdy Jan 18, 2013
6cf73de
解决崩溃问题
xosdy Jan 18, 2013
69b779b
完成获取房间列表
xosdy Jan 18, 2013
4531143
fixup! 完成获取房间列表
xosdy Jan 18, 2013
d086a38
修复注释乱码
xosdy Jan 19, 2013
7aa76e5
fixed
xosdy Jan 19, 2013
b330297
notify
vnoc-YeZi Jan 19, 2013
d4c8352
整合了影子的代码 更新了UI
vnoc-YeZi Jan 19, 2013
9c601a8
Merge branch 'master' of https://github.com/VNOC/vnoc into AngryPowman
AngryPowman Jan 19, 2013
fad713f
更新了RoomList的UI
vnoc-YeZi Jan 19, 2013
d93fdde
更新了RoomList的界面 碉堡了
vnoc-YeZi Jan 19, 2013
4261f75
Merge pull request #14 from vnoc-YeZi/YeZi
zapline Jan 20, 2013
f286244
Update NetService/src/SQLUserStorage.cpp
reallongda Jan 20, 2013
b784498
add VNOCUser and delete student; add room pool.
AngryPowman Jan 20, 2013
a7fc57a
rename RoomPool.cpp
AngryPowman Jan 20, 2013
ab94fbb
Merge branch 'master' of https://github.com/VNOC/vnoc into AngryPowman
AngryPowman Jan 20, 2013
ff60869
del duplicate files; add RclMessageHandler; add roompool release method
AngryPowman Jan 20, 2013
7e11ed0
refix some
AngryPowman Jan 20, 2013
1554cfa
添加新的消息分别处理窗体和数据
xosdy Jan 20, 2013
d1b7dc4
fix send_buf overflow in MockTcpConnection
reallongda Jan 21, 2013
14c200b
Merge pull request #15 from VNOC/longda
reallongda Jan 21, 2013
efc5a34
Merge remote-tracking branch 'origin/AngryPowman' into xosdy
xosdy Jan 22, 2013
a6c7bdd
整合testrunner到客户端中，保证客户端所有代码都可以进行unittest
epiciskandar Jan 23, 2013
376576d
调整消息xml位置
epiciskandar Jan 23, 2013
1cc8bb6
* 抽取重复代码
zapline Jan 24, 2013
71ce0ea
* 优化模块加载
zapline Jan 24, 2013
def5308
我嘞个擦嘞，为什么少了个分号
zapline Jan 24, 2013
55f2241
自动完成消息指针的类型转换，减少手动转换消息类型的麻烦
epiciskandar Jan 25, 2013
8cdb5c3
添加用户管理模块（登陆）的登陆功能ut，可作为客户端ut的编写模板，完善了大量模块代码
epiciskandar Jan 25, 2013
7d5a449
强化ut基类，降低ut类的编写成本
epiciskandar Jan 25, 2013
ed9c8f3
将ut类从头文件中剥离
epiciskandar Jan 26, 2013
43bfd77
net模块添加mock接口，方便功能使用及ut测试
epiciskandar Jan 26, 2013
d23feae
强化登陆测试
epiciskandar Jan 26, 2013
575e0db
修正目录名字错误
xosdy Jan 26, 2013
ceff11b
解决现有网络库的参数打包、解析错误
epiciskandar Jan 27, 2013
0045a90
添加获取房间列表测试
xosdy Jan 27, 2013
0580bde
修改项目文件属性
xosdy Jan 27, 2013
c2f5cad
临时解决xmessage的一个bug
epiciskandar Jan 28, 2013
7001e01
Merge remote-tracking branch 'origin/master' into xosdy
xosdy Jan 28, 2013
5200bed
减少服务器返回的房间数
xosdy Jan 28, 2013
3509bda
删除不再需要的旧文件，移动整合一些三方库
epiciskandar Jan 28, 2013
a6b9474
保证server顺利编译。
epiciskandar Jan 28, 2013
a5b56ca
move files
epiciskandar Jan 28, 2013
babca31
添加新客户端代码文件，初步保证编译通过
epiciskandar Jan 29, 2013
ad164eb
更改编译脚本
epiciskandar Jan 29, 2013
1763189
添加逻辑模块和ui模块
epiciskandar Jan 30, 2013
c8486df
aaaaaaaa
alephling Jan 30, 2013
e458764
modified NetService/src/test/VnocMessageHandlerTest.cpp
alephling Jan 30, 2013
5fba258
Merge pull request #16 from lmykyo/eskimo
xosdy Jan 30, 2013
615b7f8
delete ib's stupid 78888.txt
alephling Jan 31, 2013
65c9812
modified VnocMessageHandlerTest.cpp
alephling Jan 31, 2013
d85233d
rewrite some UI functions of netService
alephling Jan 31, 2013
80d86aa
modified some UT code of netService
alephling Jan 31, 2013
bbbe626
完成ui模块的加载，客户端已可正常工作
epiciskandar Jan 31, 2013
aab9fc4
恢复ut功能
epiciskandar Jan 31, 2013
9f420c9
更改编译脚本
epiciskandar Jan 31, 2013
58321af
补提交文件
epiciskandar Jan 31, 2013
f6055eb
补充文件
epiciskandar Jan 31, 2013
5915a63
更改文件夹名称
epiciskandar Jan 31, 2013
435b7a5
删除多余的配置属性，添加ignore
epiciskandar Jan 31, 2013
32b5529
回滚cppunit的改动
epiciskandar Jan 31, 2013
0247839
加入NumData
Sumxx Feb 1, 2013
76619c5
!激活CI
Sumxx Feb 1, 2013
7010c78
修正编译脚本
epiciskandar Feb 1, 2013
5a792fd
修正Pack测试bug
Sumxx Feb 1, 2013
927c49c
Merge remote-tracking branch 'remotes/origin/NewClient_2012_2013'
epiciskandar Feb 1, 2013
d2b00d0
Merge remote-tracking branch 'remotes/origin/Sum_Branch'
zapline Feb 1, 2013
a21b8bf
* 解决冲突
zapline Feb 1, 2013
2b1a74c
* 修改工程配置
zapline Feb 1, 2013
3d520ed
* 再改工程配置
zapline Feb 1, 2013
539d963
* 删除多余的文件；修改拼错的单词；
zapline Feb 1, 2013
e7bfea7
deal with something wrong.
alephling Feb 3, 2013
dc242ee
恢复误删除文件，解除多余的ignore
epiciskandar Feb 3, 2013
cf5c974
更改编译脚本
epiciskandar Feb 3, 2013
9800004
fix something weird
alephling Feb 3, 2013
1841f00
fix error handle on asio tcp server
reallongda Feb 3, 2013
e96de77
Merge pull request #19 from VNOC/longda
reallongda Feb 3, 2013
9b141c6
Merge pull request #18 from lmykyo/eskimo
zapline Feb 3, 2013
5ecc945
replace tabs with spaces
alephling Feb 3, 2013
ac5da74
Merge pull request #20 from lmykyo/eskimo
reallongda Feb 4, 2013
1b60626
完成Parser
Sumxx Feb 4, 2013
98bbe98
write some code to test RoomPool
alephling Feb 5, 2013
ddd110b
add function testRelease() in testRoomPool.cpp
alephling Feb 5, 2013
1f46b6b
Merge pull request #21 from lmykyo/eskimo
zapline Feb 5, 2013
0a7cce5
加入Union生成
Sumxx Feb 5, 2013
78d2ddb
delete cppunit's .lib files
alephling Feb 5, 2013
8f8d946
modified .gitignore and rliUnitTest code.
alephling Feb 5, 2013
fa8ae18
Merge pull request #22 from lmykyo/master
reallongda Feb 6, 2013
95896e5
Merge branch 'master' of https://github.com/VNOC/vnoc into Sum_Branch
Sumxx Feb 6, 2013
d9ffdc4
补漏
Sumxx Feb 6, 2013
9e77c85
修正合并问题
Sumxx Feb 6, 2013
4847efa
Merge pull request #24 from VNOC/Sum_Branch
reallongda Feb 6, 2013
2a5be7a
修改消息使用方式
Sumxx Feb 7, 2013
aef4e45
解决 gitignore BUG
Sumxx Feb 8, 2013
63da2ac
Merge branch 'master' of https://github.com/VNOC/vnoc into Sum_Branch
Sumxx Feb 8, 2013
cca7c7a
修正打包部分BUG
Sumxx Feb 16, 2013
b458c37
Merge pull request #27 from VNOC/Sum_Branch
reallongda Feb 17, 2013
eef93c7
修改命名冲突问题
Sumxx Feb 19, 2013
e158c75
修正路径问题
Sumxx Feb 19, 2013
f423342
Merge branch 'master' of https://github.com/VNOC/vnoc into Sum_Branch
Sumxx Feb 19, 2013
4a11bd4
Merge pull request #28 from VNOC/Sum_Branch
reallongda Feb 19, 2013
1ce8336
整理gitignore
xosdy Feb 19, 2013
05b5bc7
删除残余文件
xosdy Feb 19, 2013
f469216
zeng jia le zai xian yong hu lie biao gongn neng.
alephling Feb 19, 2013
52f5506
Rewrite the user-login verification logic, add a unit test of one use…
alephling Feb 19, 2013
9ef288c
rewrite the comments of userManage.hpp in English.
alephling Feb 19, 2013
bd4a185
rewrite VnocMessageHandlerTest.cpp
alephling Feb 19, 2013
1fb359f
Merge pull request #31 from lmykyo/eskimo
reallongda Feb 20, 2013
4cea737
移动新消息到客户端
xosdy Feb 20, 2013
2f1db8d
Merge branch 'master' of https://github.com/VNOC/vnoc into Sum_Branch
Sumxx Feb 20, 2013
fa38f6e
修正buff长度问题导致的解析不正确问题
Sumxx Feb 21, 2013
8424dbf
Merge pull request #33 from VNOC/Sum_Branch
reallongda Feb 21, 2013
fd6ea2e
Merge branch 'master' into xosdy
xosdy Feb 21, 2013
6504a6f
修改GetMessageLen使用方法
Sumxx Feb 21, 2013
cb688c3
Merge pull request #34 from VNOC/Sum_Branch
reallongda Feb 21, 2013
c5001da
Merge branch 'master' into xosdy
xosdy Feb 21, 2013
5795e72
repaired userSetDelete operation
alephling Feb 21, 2013
50ee97e
Merge pull request #35 from lmykyo/eskimo
reallongda Feb 21, 2013
d976e5e
fixed some bugs
xosdy Feb 21, 2013
3baf417
Merge pull request #36 from VNOC/xosdy
reallongda Feb 23, 2013
542ebd8
补漏模板
Sumxx Feb 26, 2013
a47b3f5
Merge pull request #37 from VNOC/Sum_Branch
Sumxx Feb 26, 2013
dd9f21a
Merge branch 'master' of https://github.com/VNOC/vnoc into Sum_Branch
Sumxx Feb 26, 2013
55d059e
修改所有Get 方式为const
Sumxx Feb 28, 2013
81ad9fe
去除xml解析和打包的依赖
Sumxx Feb 28, 2013
de86376
修改服务端 尚未通过
Sumxx Feb 28, 2013
6714841
Merge branch 'master' of https://github.com/VNOC/vnoc into Sum_Branch
Sumxx Feb 28, 2013
d1381cd
参数使用const ref
xosdy Mar 1, 2013
8704bba
更正错误
xosdy Mar 1, 2013
a296a39
Merge branch 'master' into xosdy
xosdy Mar 1, 2013
8a3723c
Merge pull request #38 from VNOC/xosdy
reallongda Mar 1, 2013
beca43e
Merge pull request #39 from VNOC/Sum_Branch
Sumxx Mar 1, 2013
1c5b83b
Merge branch 'master' of https://github.com/VNOC/vnoc into Sum_Branch
Sumxx Mar 1, 2013
27c366d
修改服务端编译不通过问题
Sumxx Mar 1, 2013
1178610
Merge pull request #40 from VNOC/Sum_Branch
Sumxx Mar 2, 2013
952634b
修改服务端断言
Sumxx Mar 2, 2013
d063022
Merge branch 'master' of https://github.com/VNOC/vnoc into Sum_Branch
Sumxx Mar 2, 2013
e17288e
修改遗漏断言
Sumxx Mar 2, 2013
0d99599
Merge branch 'master' of https://github.com/VNOC/vnoc into Sum_Branch
Sumxx Mar 2, 2013
c699e52
修改断言错误
Sumxx Mar 2, 2013
774d84b
delete useless files
epiciskandar Mar 11, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
44 changes: 37 additions & 7 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,38 @@
# Directories to ignore
bin
Debug
Release
/NetService/src/test/testRunner
/Client/CppTest

/NetService/Debug
/NetService/bin
/vnoc/Debug
/C:/Users/tengda/Documents/GitHub/vnoc/VNOC/VNOC.sdf
/VNOC/VNOC.sdf
/netservice/Debug
/netservice/Release
# Files to ignore
*.sdf
*.obj
*.tlog
*.user
*.log
*.res
*.pch
*.lastbuildstate
*.idb
*.ipch
*.suo
*.pdb
*.manifest
*.opensdf
*.cache
*.lib
*.o
*.aps
*.unsuccessfulbuild
tags
cpptestresults.xml

!libmysql.lib
!mysqlclient.lib

/NetService/libmysql.dll
/NetService/NetService.zip
/NetService/server.exe
/NetService/.project
/NetService/.cproject
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "NetService/dependencies/libmysql"]
path = NetService/dependencies/libmysql
url = git://github.com/Tydus/libmysql
329 changes: 329 additions & 0 deletions Client/Client/Client.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

Loading