GeezerVison is showing github.com — Java:APIJSONBoot 重构 enum RequestRole 为 String 方便用户自定义扩展;删除部分已废弃的方法 · ljxpall/APIJSON-Demo@a015223
File treeExpand file treeCollapse file tree Open diff view settings APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo
Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/DemoFunctionParser.java +3-3Lines changed: 3 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 26 | 26 | import apijson.JSONResponse; | 27 | 27 | import apijson.NotNull; | 28 | 28 | import apijson.RequestMethod; | 29 | | -import apijson.RequestRole; | 30 | 29 | import apijson.StringUtil; | 31 | 30 | import apijson.framework.APIJSONFunctionParser; | | 31 | +import apijson.orm.AbstractVerifier; | 32 | 32 | import apijson.orm.JSONRequest; | 33 | 33 |
| 34 | 34 |
| @@ -212,8 +212,8 @@ public JSONArray getIdList(@NotNull JSONObject current) { | 212 | 212 | */ | 213 | 213 | public Object verifyAccess(@NotNull JSONObject current) throws Exception { | 214 | 214 | long userId = current.getLongValue(JSONRequest.KEY_USER_ID); | 215 | | - RequestRole role = RequestRole.get(current.getString(JSONRequest.KEY_ROLE)); | 216 | | - if (role == RequestRole.OWNER && userId != DemoVerifier.getVisitorId(getSession())) { | | 215 | + String role = current.getString(JSONRequest.KEY_ROLE); | | 216 | + if (AbstractVerifier.OWNER.equals(role) && userId != DemoVerifier.getVisitorId(getSession())) { | 217 | 217 | throw new IllegalAccessException("登录用户与角色OWNER不匹配!"); | 218 | 218 | } | 219 | 219 | return null; | |
Collapse file Copy file name to clipboardExpand all lines: APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/DemoSQLConfig.java +3-3Lines changed: 3 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -70,20 +70,20 @@ public AbstractSQLConfig getSQLConfig(RequestMethod method, String database, Str | 70 | 70 |
| 71 | 71 | //取消注释来实现自定义各个表的主键名 | 72 | 72 | // @Override | 73 | | - // public String getIdKey(String database, String schema, String table) { | | 73 | + // public String getIdKey(String database, String schema, String datasource, String table) { | 74 | 74 | // return StringUtil.firstCase(table + "Id"); // userId, comemntId ... | 75 | 75 | // // return StringUtil.toLowerCase(t) + "_id"; // user_id, comemnt_id ... | 76 | 76 | // // return StringUtil.toUpperCase(t) + "_ID"; // USER_ID, COMMENT_ID ... | 77 | 77 | // } | 78 | 78 |
| 79 | 79 | @Override | 80 | | - public String getUserIdKey(String database, String schema, String table) { | | 80 | + public String getUserIdKey(String database, String schema,String datasource, String table) { | 81 | 81 | return USER_.equals(table) || PRIVACY_.equals(table) ? ID : USER_ID; // id / userId | 82 | 82 | } | 83 | 83 |
| 84 | 84 | //取消注释来实现数据库自增 id | 85 | 85 | // @Override | 86 | | - // public Object newId(RequestMethod method, String database, String schema, String table) { | | 86 | + // public Object newId(RequestMethod method, String database, String schema, String datasource, String table) { | 87 | 87 | // return null; // return null 则不生成 id,一般用于数据库自增 id | 88 | 88 | // } | 89 | 89 |
| |
Collapse file Copy file name to clipboardExpand all lines: APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/DemoSQLExecutor.java -6Lines changed: 0 additions & 6 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 15 | 15 | package apijson.demo; | 16 | 16 |
| 17 | 17 | import java.sql.Connection; | 18 | | -import java.sql.ResultSet; | 19 | | -import java.sql.ResultSetMetaData; | 20 | | -import java.util.Map; | 21 | 18 |
| 22 | 19 | import javax.sql.DataSource; | 23 | 20 |
| 24 | | -import com.alibaba.fastjson.JSONObject; | 25 | | - | 26 | 21 | import apijson.Log; | 27 | 22 | import apijson.boot.DemoApplication; | 28 | | -import apijson.column.ColumnUtil; | 29 | 23 | import apijson.framework.APIJSONSQLExecutor; | 30 | 24 | import apijson.orm.SQLConfig; | 31 | 25 |
| |
Collapse file Copy file name to clipboardExpand all lines: APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/model/Privacy.java +3-3Lines changed: 3 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 14 | 14 |
| 15 | 15 | package apijson.demo.model; | 16 | 16 |
| 17 | | -import static apijson.RequestRole.ADMIN; | 18 | | -import static apijson.RequestRole.OWNER; | 19 | | -import static apijson.RequestRole.UNKNOWN; | | 17 | +import static apijson.orm.AbstractVerifier.ADMIN; | | 18 | +import static apijson.orm.AbstractVerifier.OWNER; | | 19 | +import static apijson.orm.AbstractVerifier.UNKNOWN; | 20 | 20 |
| 21 | 21 | import com.alibaba.fastjson.annotation.JSONField; | 22 | 22 |
| |
Collapse file Copy file name to clipboardExpand all lines: APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/model/User.java +2-2Lines changed: 2 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 14 | 14 |
| 15 | 15 | package apijson.demo.model; | 16 | 16 |
| 17 | | -import static apijson.RequestRole.ADMIN; | 18 | | -import static apijson.RequestRole.UNKNOWN; | | 17 | +import static apijson.orm.AbstractVerifier.ADMIN; | | 18 | +import static apijson.orm.AbstractVerifier.UNKNOWN; | 19 | 19 |
| 20 | 20 | import java.util.List; | 21 | 21 |
| |
Collapse file Copy file name to clipboardExpand all lines: APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/model/Verify.java +6-6Lines changed: 6 additions & 6 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 14 | 14 |
| 15 | 15 | package apijson.demo.model; | 16 | 16 |
| 17 | | -import static apijson.RequestRole.ADMIN; | 18 | | -import static apijson.RequestRole.CIRCLE; | 19 | | -import static apijson.RequestRole.CONTACT; | 20 | | -import static apijson.RequestRole.LOGIN; | 21 | | -import static apijson.RequestRole.OWNER; | 22 | | -import static apijson.RequestRole.UNKNOWN; | | 17 | +import static apijson.orm.AbstractVerifier.ADMIN; | | 18 | +import static apijson.orm.AbstractVerifier.CIRCLE; | | 19 | +import static apijson.orm.AbstractVerifier.CONTACT; | | 20 | +import static apijson.orm.AbstractVerifier.LOGIN; | | 21 | +import static apijson.orm.AbstractVerifier.OWNER; | | 22 | +import static apijson.orm.AbstractVerifier.UNKNOWN; | 23 | 23 |
| 24 | 24 | import apijson.MethodAccess; | 25 | 25 | import apijson.framework.BaseModel; | |
|