Skip to content

Commit 6186f39

Browse files
TommyLemonTommyLemon
committed
Server:优化工程结构
1 parent 0af690c commit 6186f39

21 files changed

Lines changed: 72 additions & 106 deletions

APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/server/APIJSONApplication.java renamed to APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/apijson/demo/server/APIJSONApplication.java

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
See the License for the specific language governing permissions and
1313
limitations under the License.*/
1414

15-
package zuo.biao.apijson.server;
15+
package apijson.demo.server;
1616

1717
import org.springframework.boot.SpringApplication;
1818
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -21,6 +21,8 @@
2121
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
2222
import org.springframework.web.filter.CorsFilter;
2323

24+
import zuo.biao.apijson.server.Structure;
25+
2426
/**application
2527
* @author Lemon
2628
*/
@@ -42,29 +44,30 @@ public static void main(String[] args) {
4244
e.printStackTrace();
4345
}
4446
}
45-
46-
4747

48-
49-
/**
50-
* 跨域过滤器
51-
* @return
52-
*/
53-
@Bean
54-
public CorsFilter corsFilter() {
55-
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
56-
source.registerCorsConfiguration("/**", buildConfig()); // 4
57-
return new CorsFilter(source);
58-
}
59-
/**CORS跨域配置
60-
* @return
61-
*/
48+
49+
50+
//支持JavaScript跨域请求<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
51+
/**
52+
* 跨域过滤器
53+
* @return
54+
*/
55+
@Bean
56+
public CorsFilter corsFilter() {
57+
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
58+
source.registerCorsConfiguration("/**", buildConfig()); // 4
59+
return new CorsFilter(source);
60+
}
61+
/**CORS跨域配置
62+
* @return
63+
*/
6264
private CorsConfiguration buildConfig() {
63-
CorsConfiguration corsConfiguration = new CorsConfiguration();
64-
corsConfiguration.addAllowedOrigin("*");
65-
corsConfiguration.addAllowedHeader("*");
66-
corsConfiguration.addAllowedMethod("*");
67-
return corsConfiguration;
68-
}
69-
65+
CorsConfiguration corsConfiguration = new CorsConfiguration();
66+
corsConfiguration.addAllowedOrigin("*");
67+
corsConfiguration.addAllowedHeader("*");
68+
corsConfiguration.addAllowedMethod("*");
69+
return corsConfiguration;
70+
}
71+
//支持JavaScript跨域请求 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
72+
7073
}

APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/server/sql/AccessVerifier.java renamed to APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/apijson/demo/server/AccessVerifier.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
See the License for the specific language governing permissions and
1313
limitations under the License.*/
1414

15-
package zuo.biao.apijson.server.sql;
15+
package apijson.demo.server;
1616

1717
import java.rmi.AccessException;
1818
import java.util.HashMap;
@@ -32,6 +32,7 @@
3232
import zuo.biao.apijson.Log;
3333
import zuo.biao.apijson.RequestMethod;
3434
import zuo.biao.apijson.StringUtil;
35+
import zuo.biao.apijson.server.sql.QueryConfig;
3536

3637
/**权限验证类
3738
* @author Lemon

APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/server/Controller.java renamed to APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/apijson/demo/server/Controller.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
See the License for the specific language governing permissions and
1313
limitations under the License.*/
1414

15-
package zuo.biao.apijson.server;
15+
package apijson.demo.server;
1616

1717
import static zuo.biao.apijson.RequestMethod.GET;
1818
import static zuo.biao.apijson.RequestMethod.HEAD;
@@ -32,17 +32,19 @@
3232

3333
import com.alibaba.fastjson.JSONObject;
3434

35+
import apijson.demo.server.model.BaseModel;
3536
import apijson.demo.server.model.Comment;
3637
import apijson.demo.server.model.Login;
3738
import apijson.demo.server.model.Moment;
3839
import apijson.demo.server.model.Password;
3940
import apijson.demo.server.model.User;
4041
import apijson.demo.server.model.Verify;
4142
import apijson.demo.server.model.Wallet;
42-
import zuo.biao.apijson.BaseModel;
4343
import zuo.biao.apijson.JSON;
4444
import zuo.biao.apijson.JSONResponse;
4545
import zuo.biao.apijson.StringUtil;
46+
import zuo.biao.apijson.server.JSONRequest;
47+
import zuo.biao.apijson.server.Parser;
4648
import zuo.biao.apijson.server.exception.ConditionNotMatchException;
4749
import zuo.biao.apijson.server.exception.ConflictException;
4850
import zuo.biao.apijson.server.exception.OutOfRangeException;
@@ -54,6 +56,10 @@
5456
@RequestMapping("")
5557
public class Controller {
5658

59+
/**如果用在金融等对安全要求很高的领域，get和head可以测试期间使用明文的HTTP GET，上线版改用非明文的HTTP POST，兼顾系统安全与开发效率
60+
* @param request
61+
* @return
62+
*/
5763
@RequestMapping("head/{request}")
5864
public String head(@PathVariable String request) {
5965
return new Parser(HEAD).parse(request);

APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/server/Function.java renamed to APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/apijson/demo/server/Function.java

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
See the License for the specific language governing permissions and
1313
limitations under the License.*/
1414

15-
package zuo.biao.apijson.server;
15+
package apijson.demo.server;
1616

1717
import java.util.Collection;
1818
import java.util.HashMap;
@@ -21,12 +21,13 @@
2121
import com.alibaba.fastjson.JSONArray;
2222
import com.alibaba.fastjson.JSONObject;
2323

24-
import zuo.biao.apijson.BaseModel;
25-
import zuo.biao.apijson.FunctionList;
24+
import apijson.demo.server.model.BaseModel;
2625
import zuo.biao.apijson.Log;
2726
import zuo.biao.apijson.StringUtil;
27+
import zuo.biao.apijson.server.Entry;
28+
import zuo.biao.apijson.server.Pair;
2829

29-
/**
30+
/**可远程调用的函数类
3031
* @author Lemon
3132
*/
3233
public class Function implements FunctionList {
@@ -58,18 +59,6 @@ public static void test() throws Exception {
5859
map.put("key", true);
5960
jsonMap.put("map", map);
6061

61-
String function = "get(Collection:collection,int:position)";//只允许引用，不能直接传值//"plus(@i0,@i1)";
62-
63-
String key = "praiseCount@function";
64-
if (key.endsWith("@")) {//内部引用
65-
66-
} else if (key.endsWith("@function")) {//引用服务器方法
67-
long time0 = System.currentTimeMillis();
68-
Log.i(TAG, "" + time0);
69-
Object result = invoke(jsonMap, function);
70-
Log.i(TAG, "" + result);
71-
Log.i(TAG, "duration=" + (System.currentTimeMillis()-time0));
72-
}
7362

7463
Log.i(TAG, "plus = " + invoke(jsonMap, "plus(long:i0,long:i1)"));
7564
Log.i(TAG, "count = " + invoke(jsonMap, "count(Collection:collection)"));

APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/FunctionList.java renamed to APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/apijson/demo/server/FunctionList.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
See the License for the specific language governing permissions and
1313
limitations under the License.*/
1414

15-
package zuo.biao.apijson;
15+
package apijson.demo.server;
1616

1717
import java.util.Collection;
1818
import java.util.Map;

APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/BaseModel.java renamed to APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/apijson/demo/server/model/BaseModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
See the License for the specific language governing permissions and
1313
limitations under the License.*/
1414

15-
package zuo.biao.apijson;
15+
package apijson.demo.server.model;
1616

1717
import java.io.Serializable;
1818
import java.util.Collection;

‎APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/apijson/demo/server/model/Comment.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package apijson.demo.server.model;
1616

1717
import zuo.biao.apijson.APIJSONRequest;
18-
import zuo.biao.apijson.BaseModel;
1918
import zuo.biao.apijson.RequestMethod;
2019

2120
/**评论类

‎APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/apijson/demo/server/model/Login.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package apijson.demo.server.model;
1616

1717
import zuo.biao.apijson.APIJSONRequest;
18-
import zuo.biao.apijson.BaseModel;
1918
import zuo.biao.apijson.RequestMethod;
2019

2120
/**登录类

‎APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/apijson/demo/server/model/Moment.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import java.util.List;
1818

1919
import zuo.biao.apijson.APIJSONRequest;
20-
import zuo.biao.apijson.BaseModel;
2120
import zuo.biao.apijson.RequestMethod;
2221

2322
/**动态类

‎APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/apijson/demo/server/model/Password.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package apijson.demo.server.model;
1616

1717
import zuo.biao.apijson.APIJSONRequest;
18-
import zuo.biao.apijson.BaseModel;
1918
import zuo.biao.apijson.RequestMethod;
2019
import zuo.biao.apijson.StringUtil;
2120

0 commit comments

Comments
 (0)