8000 Server:新增Function,启动时自检;join不再强制副表传@column;join兼容PostgreSQL;解决join在主表… · coder-caicai/APIJSON@98d625c · GitHub
[go: up one dir, main page]

Skip to content

Commit 98d625c

Browse files
committed
Server:新增Function,启动时自检;join不再强制副表传@column;join兼容PostgreSQL;解决join在主表为空对象时未解析为JOIN语句;解决server.JSONRequest未转换数组为JSONArray导致后面解析出错;Schema,Table,column都加引号解决Order等关键词作为表名出错;优化Admin角色的处理;优化远程函数;打包apijson-server3.0.0.jar;删除多余的FunctionList
1 parent ab820c5 commit 98d625c

27 files changed

+545
-307
lines changed
Binary file not shown.
Binary file not shown.

APIJSON-Java-Server/APIJSONDemo/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>apijson.demo.server</groupId>
77
<artifactId>apijson-demo</artifactId>
8-
<version>2.1.0-SNAPSHOT</version>
8+
<version>3.0.0</version>
99
<packaging>jar</packaging>
1010

1111
<name>APIJSONDemo</name>

APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/server/Controller.java

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
import com.alibaba.fastjson.JSONObject;
3838

3939
import apijson.demo.server.model.BaseModel;
40-
import apijson.demo.server.model.Comment;
41-
import apijson.demo.server.model.Moment;
4240
import apijson.demo.server.model.Privacy;
4341
import apijson.demo.server.model.User;
4442
import apijson.demo.server.model.Verify;
@@ -201,14 +199,10 @@ public String openHead(@PathVariable String request, HttpSession session) {
201199

202200
public static final String USER_;
203201
public static final String PRIVACY_;
204-
public static final String MOMENT_;
205-
public static final String COMMENT_;
206202
public static final String VERIFY_; //加下划线后缀是为了避免 Verify 和 verify 都叫VERIFY,分不清
207203
static {
208204
USER_ = User.class.getSimpleName();
209205
PRIVACY_ = Privacy.class.getSimpleName();
210-
MOMENT_ = Moment.class.getSimpleName();
211-
COMMENT_ = Comment.class.getSimpleName();
212206
VERIFY_ = Verify.class.getSimpleName();
213207
}
214208

@@ -217,8 +211,6 @@ public String openHead(@PathVariable String request, HttpSession session) {
217211
public static final String COUNT = JSONResponse.KEY_COUNT;
218212
public static final String TOTAL = JSONResponse.KEY_TOTAL;
219213

220-
public static final String RANGE = "range";
221-
222214
public static final String ID = "id";
223215
public static final String USER_ID = "userId";
224216
public static final String CURRENT_USER_ID = "currentUserId";
@@ -231,40 +223,10 @@ public String openHead(@PathVariable String request, HttpSession session) {
231223
public static final String OLD_PASSWORD = "oldPassword";
232224
public static final String VERIFY = "verify";
233225

234-
public static final String SEX = "sex";
235226
public static final String TYPE = "type";
236-
public static final String WAY = "way";
237-
public static final String CONTENT = "content";
238227

239228

240229

241-
242-
243-
public static final String DATE_UP = "date+";//同 "date ASC"
244-
public static final String DATE_DOWN = "date-";//同 "date DESC"
245-
246-
public static final String ID_AT = ID + "@";
247-
public static final String USER_ID_AT = USER_ID + "@";
248-
public static final String MOMENT_ID_AT = "momentId@";
249-
public static final String COMMENT_ID_AT = "commentId@";
250-
251-
public static final String ID_IN = ID + "{}";
252-
public static final String USER_ID_IN = USER_ID + "{}";
253-
public static final String MOMENT_ID_IN = "momentId{}";
254-
public static final String COMMENT_ID_IN = "commentId{}";
255-
256-
public static final String NAME_SEARCH = NAME + "$";
257-
public static final String PHONE_SEARCH = PHONE + "$";
258-
public static final String CONTENT_SEARCH = CONTENT + "$";
259-
260-
261-
262-
public static final String COLUMNS_USER_SIMPLE = "id,name";
263-
public static final String COLUMNS_USER = "id,sex,name,head";
264-
265-
266-
267-
268230
/**生成验证码,修改为post请求
269231
* @param request
270232
* @return

0 commit comments

Comments
 (0)
0