wlf
|
1c945a05d7
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
|
6 years ago |
wlf
|
42369e5b49
|
Merge remote-tracking branch 'remotes/origin/wmj' into wlf
# Conflicts:
# src/core/process/C_StudentUploadOpeningReport.java
|
6 years ago |
zhai_lw
|
29de469afd
|
完成teacherSearchStudent
|
6 years ago |
zgl
|
0c7700e99a
|
1、global_time_point填写
|
6 years ago |
zhai_lw
|
57893051b8
|
完成teacherSearchStudent
|
6 years ago |
zhai_lw
|
c6e5983cef
|
Merge remote-tracking branches 'remotes/origin/wlf', 'remotes/origin/wmj' and 'remotes/origin/zgl'
|
6 years ago |
zhai_lw
|
0dff0df466
|
完善gdms,
完成用户流程
|
6 years ago |
zgl
|
4c8b5c52f8
|
1、完成学生和老师status表,完善数据库
|
6 years ago |
wan
|
96258f81e0
|
Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
# Conflicts:
# GDMS.iml
|
6 years ago |
wlf
|
82eac83462
|
Merge remote-tracking branch 'remotes/origin/wmj' into wlf
# Conflicts:
# src/core/process/C_StudentUploadOpeningReport.java
|
6 years ago |
wan
|
7ef6908720
|
Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
# Conflicts:
# GDMS.iml
|
6 years ago |
wlf
|
8fc30a753b
|
Merge remote-tracking branch 'remotes/origin/wmj' into wlf
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
# .idea/misc.xml
# GDMS.iml
|
6 years ago |
wan
|
c6e2ca10fb
|
Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
# Conflicts:
# GDMS.iml
|
6 years ago |
wan
|
06841d30db
|
Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
# Conflicts:
# GDMS.iml
|
6 years ago |
wlf
|
96b6fc23b4
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/servlet/account/Register.java
|
6 years ago |
wlf
|
074cef61da
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/servlet/account/Register.java
|
6 years ago |
wan
|
159041f5ee
|
Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
# Conflicts:
# GDMS.iml
|
6 years ago |
wan
|
a06b0d9ef8
|
Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
# Conflicts:
# GDMS.iml
|
6 years ago |
wlf
|
22f533255c
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
zhai_lw
|
51b73e3813
|
onlineCheck
|
6 years ago |
zhai_lw
|
b1c174822a
|
登陆注册前后端联通
|
6 years ago |
wlf
|
e0fde05f75
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
zhai_lw
|
fe2b89a5fd
|
调整
|
6 years ago |
zhai_lw
|
7420a3362a
|
调整
|
6 years ago |
zhai_lw
|
f753c9a1f4
|
合并所有分支,查找合并错误
|
6 years ago |
wlf
|
53e7a50fa1
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
wlf
|
23a948d9e8
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
|
6 years ago |
wan
|
36370116be
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
|
6 years ago |
zhai_lw
|
643b2cfe56
|
合并所有分支,查找合并错误
|
6 years ago |
zhai_lw
|
3c1d9b6906
|
Merge branch 'master' of C:\Users\zhai_\Documents\GDMS with conflicts.
|
6 years ago |
zhai_lw
|
4127803c61
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
|
6 years ago |
zhai_lw
|
7c09829e78
|
Process调整
Condition完善
Processmanagement完善
status约定
|
6 years ago |
wlf
|
c4e5462dfc
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
wlf
|
759e95877f
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
wan
|
7e7a4a96bb
|
Merge remote-tracking branch 'remotes/origin/wlf' into wmj
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
zhai_lw
|
8f599b3e18
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
# src/core/operation/Select.json
# src/core/process/Process.java
|
6 years ago |
wlf
|
b146837ead
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
wlf
|
8391705ddb
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
wan
|
cebf16350e
|
Merge remote-tracking branches 'remotes/origin/master' and 'remotes/origin/wlf' into wmj
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
wlf
|
2c38b26553
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
wlf
|
1689e39545
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
wan
|
f06566839c
|
Merge remote-tracking branches 'remotes/origin/master' and 'remotes/origin/wlf' into wmj
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
wlf
|
d0164dc956
|
Merge remote-tracking branch 'remotes/origin/wmj' into wlf
|
6 years ago |
wlf
|
c6330cb71c
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
wlf
|
3a84126bc2
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
|
6 years ago |
wlf
|
768b97c4da
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
wan
|
b6f6e5c73b
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/operation/Search.json
|
6 years ago |
wan
|
dfcd434b07
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/operation/Search.json
|
6 years ago |
zhai_lw
|
fffef13eb9
|
1,调整
|
6 years ago |
wan
|
3cbe7c42d8
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/operation/Search.json
|
6 years ago |
wan
|
0e8a2a1ebb
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
|
6 years ago |
wan
|
6ae3efd617
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/operation/Search.json
|
6 years ago |
wlf
|
881abc033a
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/core/process/Process.java
|
6 years ago |
wlf
|
86fbf1db1b
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/core/process/Process.java
|
6 years ago |
zhai_lw
|
36fb645981
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
# src/core/operation/Select.json
# src/core/process/Process.java
1,基本完成Operation
2,调整AccountManagement
3,其余
|
6 years ago |
wlf
|
62759d6b34
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/core/process/Process.java
|
6 years ago |
wlf
|
ad054fde4b
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/core/process/Process.java
|
6 years ago |
wlf
|
1f5b0b6f7a
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/core/process/Process.java
|
6 years ago |
wlf
|
dcb917329b
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
|
6 years ago |
wlf
|
1d70584bf1
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/core/process/Process.java
|
6 years ago |
wan
|
97f6d812b3
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/process/Process.java
# src/core/process/ProcessManagement.java
|
6 years ago |
wlf
|
8db98cedfb
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/core/process/Process.java
|
6 years ago |
wlf
|
48962fa88c
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/core/process/Process.java
|
6 years ago |
zhai_lw
|
e58825d4ff
|
1,后端Operation逻辑调整
2,数据库访问逻辑调整
3,AccountManagement调整优化
4,完善功能4/6
|
6 years ago |
wlf
|
118c44c22b
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/core/process/Process.java
|
6 years ago |
wlf
|
4318035a8f
|
2、更新
|
6 years ago |
wlf
|
cb923f9729
|
1、更新
|
6 years ago |
wan
|
776ed667b8
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/process/Process.java
# src/core/process/ProcessManagement.java
|
6 years ago |
wan
|
f118828854
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
|
6 years ago |
wan
|
dbc64deef5
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/process/Process.java
# src/core/process/ProcessManagement.java
|
6 years ago |
zhai_lw
|
8eb298d93c
|
1,后端Operation逻辑调整
2,数据库访问逻辑调整
3,AccountManagement调整优化
4,完善功能4/6
|
6 years ago |
wan
|
ac773da1d5
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/process/Process.java
|
6 years ago |
zhai_lw
|
3637f7c000
|
1,后端process逻辑调整
2,数据库访问逻辑调整
3,数据库访问优化
|
6 years ago |
zhai_lw
|
01f4409f14
|
1,后端功能2/5
|
6 years ago |
zhai_lw
|
615933c50a
|
1,后端注册完善
|
6 years ago |
zhai_lw
|
c8746f9e72
|
1,后端注册完成
|
6 years ago |
zhai_lw
|
04a929c714
|
1,登录前端和后端对接
|
6 years ago |
zhai_lw
|
90d6124e61
|
Merge remote-tracking branch 'remotes/origin/hechu1'
|
6 years ago |
zhai_lw
|
41a590d63a
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# src/servlet/account/login.java
# web/WEB-INF/web.xml
# web/webPage/jsFile/login.js
|
6 years ago |
何楚
|
5503126da3
|
1, 主页,前端基本框架
|
6 years ago |
zhai_lw
|
531fb6ef83
|
1,登录后端
|
6 years ago |
何楚
|
7c29e6c688
|
1, 主页,前端基本框架
|
6 years ago |
wan
|
8e4fecf3cc
|
选题process
|
6 years ago |
zhai_lw
|
e5f76c397b
|
1, process 调整为3类
2,完善Exception
|
6 years ago |
何楚
|
2973d5c48a
|
1, 登陆注册页面
|
6 years ago |
zhai_lw
|
3ca251506a
|
1, 调整
|
6 years ago |
zhai_lw
|
fd6c9b7c93
|
1, 设置tomcat服务器
2,配置数据库连接池
3,增加一类LastProcess
4,调整目录结构
5,其他
|
6 years ago |
zhai_lw
|
6ef9b61fba
|
1, 设置tomcat服务器
2,配置数据库连接池
3,增加一类LastProcess
4,调整目录结构
5,其他
|
6 years ago |
zhai_lw
|
ca45a37fef
|
1, process 调整为3类
2,完善Exception
|
6 years ago |
zhai_lw
|
b5f2321f76
|
Merge remote-tracking branch 'remotes/origin/hechu1'
配置文件修复
|
6 years ago |
zhai_lw
|
76ae5cc87a
|
1, 调整
|
6 years ago |
何楚
|
990b1c1704
|
1, 登陆注册页面
|
6 years ago |
zhai_lw
|
3f52144d43
|
1, 设置tomcat服务器
2,配置数据库连接池
3,增加一类LastProcess
4,调整目录结构
5,其他
|
6 years ago |
zhai_lw
|
1caeaa2079
|
1, 设置tomcat服务器
2,配置数据库连接池
3,增加一类LastProcess
4,调整目录结构
5,其他
|
6 years ago |
zhai_lw
|
a0ddf99418
|
1, 添加gdms.Mode以方便后期调试
2,修改Operation的option属性的类型再次改为Map<String, Object>
3,完成operation的抽象定义
4,梳理operation和AP的关系
5,其他
|
6 years ago |
zhai_lw
|
e21fc49ae3
|
1, 添加void setOperations(String options)
2,修改Operation的option属性的类型为Map<String, String>
|
6 years ago |
zhai_lw
|
4d62390572
|
1,提交需求报告
2,修改Operation的option属性的类型为Map<String, Object>
3,进一步理清各个关系
|
6 years ago |
zhai_lw
|
6d6b4121d5
|
first test
|
6 years ago |