 zhai_lw
|
4127803c61
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
|
7 years ago |
|
zhai_lw
|
7c09829e78
|
Process调整
Condition完善
Processmanagement完善
status约定
|
7 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
|
7 years ago |
 wan
|
b6f6e5c73b
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/operation/Search.json
|
7 years ago |
|
wan
|
dfcd434b07
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/operation/Search.json
|
7 years ago |
|
zhai_lw
|
fffef13eb9
|
1,调整
|
7 years ago |
|
wan
|
3cbe7c42d8
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/operation/Search.json
|
7 years ago |
|
wan
|
0e8a2a1ebb
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
|
7 years ago |
|
wan
|
6ae3efd617
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/operation/Search.json
|
7 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，其余
|
7 years ago |
|
wan
|
97f6d812b3
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/process/Process.java
# src/core/process/ProcessManagement.java
|
7 years ago |
|
zhai_lw
|
e58825d4ff
|
1，后端Operation逻辑调整
2，数据库访问逻辑调整
3，AccountManagement调整优化
4，完善功能4/6
|
7 years ago |
|
wan
|
776ed667b8
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/process/Process.java
# src/core/process/ProcessManagement.java
|
7 years ago |
|
wan
|
f118828854
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
|
7 years ago |
|
wan
|
dbc64deef5
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/process/Process.java
# src/core/process/ProcessManagement.java
|
7 years ago |
|
zhai_lw
|
8eb298d93c
|
1，后端Operation逻辑调整
2，数据库访问逻辑调整
3，AccountManagement调整优化
4，完善功能4/6
|
7 years ago |
|
wan
|
ac773da1d5
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/process/Process.java
|
7 years ago |
|
zhai_lw
|
3637f7c000
|
1，后端process逻辑调整
2，数据库访问逻辑调整
3，数据库访问优化
|
7 years ago |
|
zhai_lw
|
01f4409f14
|
1,后端功能2/5
|
7 years ago |
|
zhai_lw
|
615933c50a
|
1,后端注册完善
|
7 years ago |
|
zhai_lw
|
c8746f9e72
|
1,后端注册完成
|
7 years ago |
|
zhai_lw
|
04a929c714
|
1,登录前端和后端对接
|
7 years ago |
|
zhai_lw
|
90d6124e61
|
Merge remote-tracking branch 'remotes/origin/hechu1'
|
7 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
|
7 years ago |
 何楚
|
5503126da3
|
1, 主页，前端基本框架
|
7 years ago |
|
zhai_lw
|
531fb6ef83
|
1,登录后端
|
7 years ago |
|
何楚
|
7c29e6c688
|
1, 主页，前端基本框架
|
7 years ago |
|
wan
|
8e4fecf3cc
|
选题process
|
7 years ago |
|
zhai_lw
|
e5f76c397b
|
1, process 调整为3类
2，完善Exception
|
7 years ago |
|
何楚
|
2973d5c48a
|
1, 登陆注册页面
|
7 years ago |
|
zhai_lw
|
3ca251506a
|
1, 调整
|
7 years ago |
|
zhai_lw
|
fd6c9b7c93
|
1, 设置tomcat服务器
2，配置数据库连接池
3，增加一类LastProcess
4，调整目录结构
5，其他
|
7 years ago |
|
zhai_lw
|
6ef9b61fba
|
1, 设置tomcat服务器
2，配置数据库连接池
3，增加一类LastProcess
4，调整目录结构
5，其他
|
7 years ago |
|
zhai_lw
|
ca45a37fef
|
1, process 调整为3类
2，完善Exception
|
7 years ago |
|
zhai_lw
|
b5f2321f76
|
Merge remote-tracking branch 'remotes/origin/hechu1'
配置文件修复
|
7 years ago |
|
zhai_lw
|
76ae5cc87a
|
1, 调整
|
7 years ago |
|
何楚
|
990b1c1704
|
1, 登陆注册页面
|
7 years ago |
|
zhai_lw
|
3f52144d43
|
1, 设置tomcat服务器
2，配置数据库连接池
3，增加一类LastProcess
4，调整目录结构
5，其他
|
7 years ago |
|
zhai_lw
|
1caeaa2079
|
1, 设置tomcat服务器
2，配置数据库连接池
3，增加一类LastProcess
4，调整目录结构
5，其他
|
7 years ago |
|
zhai_lw
|
a0ddf99418
|
1, 添加gdms.Mode以方便后期调试
2，修改Operation的option属性的类型再次改为Map<String, Object>
3，完成operation的抽象定义
4，梳理operation和AP的关系
5，其他
|
7 years ago |
|
zhai_lw
|
e21fc49ae3
|
1, 添加void setOperations（String options）
2，修改Operation的option属性的类型为Map<String, String>
|
7 years ago |
|
zhai_lw
|
4d62390572
|
1，提交需求报告
2，修改Operation的option属性的类型为Map<String, Object>
3，进一步理清各个关系
|
7 years ago |
|
zhai_lw
|
6d6b4121d5
|
first test
|
7 years ago |
