new[litemallc-core]: 把一些共同的配置或者通用代码重构到新的一个核心模块litemall-core。

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/GoodsSpecificationController.java

@@ -5,7 +5,7 @@ import org.apache.commons.logging.LogFactory;
 import org.linlinjava.litemall.admin.annotation.LoginAdmin;
 import org.linlinjava.litemall.db.domain.LitemallGoodsSpecification;
 import org.linlinjava.litemall.db.service.LitemallGoodsSpecificationService;
-import org.linlinjava.litemall.db.util.ResponseUtil;
+import org.linlinjava.litemall.core.util.ResponseUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/HistoryController.java

@@ -5,7 +5,7 @@ import org.apache.commons.logging.LogFactory;
 import org.linlinjava.litemall.admin.annotation.LoginAdmin;
 import org.linlinjava.litemall.db.domain.LitemallSearchHistory;
 import org.linlinjava.litemall.db.service.LitemallSearchHistoryService;
-import org.linlinjava.litemall.db.util.ResponseUtil;
+import org.linlinjava.litemall.core.util.ResponseUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/IndexController.java

@@ -2,7 +2,7 @@ package org.linlinjava.litemall.admin.web;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.linlinjava.litemall.db.util.ResponseUtil;
+import org.linlinjava.litemall.core.util.ResponseUtil;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/IssueController.java

@@ -5,7 +5,7 @@ import org.apache.commons.logging.LogFactory;
 import org.linlinjava.litemall.admin.annotation.LoginAdmin;
 import org.linlinjava.litemall.db.domain.LitemallIssue;
 import org.linlinjava.litemall.db.service.LitemallIssueService;
-import org.linlinjava.litemall.db.util.ResponseUtil;
+import org.linlinjava.litemall.core.util.ResponseUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/KeywordController.java

@@ -5,7 +5,7 @@ import org.apache.commons.logging.LogFactory;
 import org.linlinjava.litemall.admin.annotation.LoginAdmin;
 import org.linlinjava.litemall.db.domain.LitemallKeyword;
 import org.linlinjava.litemall.db.service.LitemallKeywordService;
-import org.linlinjava.litemall.db.util.ResponseUtil;
+import org.linlinjava.litemall.core.util.ResponseUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/OrderController.java

@@ -6,7 +6,7 @@ import org.linlinjava.litemall.admin.annotation.LoginAdmin;
 import org.linlinjava.litemall.db.domain.LitemallOrder;
 import org.linlinjava.litemall.db.service.LitemallOrderService;
 import org.linlinjava.litemall.db.util.OrderUtil;
-import org.linlinjava.litemall.db.util.ResponseUtil;
+import org.linlinjava.litemall.core.util.ResponseUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/ProductController.java

@@ -8,7 +8,7 @@ import org.linlinjava.litemall.db.domain.LitemallProduct;
 import org.linlinjava.litemall.db.service.LitemallGoodsService;
 import org.linlinjava.litemall.db.service.LitemallGoodsSpecificationService;
 import org.linlinjava.litemall.db.service.LitemallProductService;
-import org.linlinjava.litemall.db.util.ResponseUtil;
+import org.linlinjava.litemall.core.util.ResponseUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/RegionController.java

@@ -5,7 +5,7 @@ import org.apache.commons.logging.LogFactory;
 import org.linlinjava.litemall.admin.annotation.LoginAdmin;
 import org.linlinjava.litemall.db.domain.LitemallRegion;
 import org.linlinjava.litemall.db.service.LitemallRegionService;
-import org.linlinjava.litemall.db.util.ResponseUtil;
+import org.linlinjava.litemall.core.util.ResponseUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/TopicController.java

@@ -5,7 +5,7 @@ import org.apache.commons.logging.LogFactory;
 import org.linlinjava.litemall.admin.annotation.LoginAdmin;
 import org.linlinjava.litemall.db.domain.LitemallTopic;
 import org.linlinjava.litemall.db.service.LitemallTopicService;
-import org.linlinjava.litemall.db.util.ResponseUtil;
+import org.linlinjava.litemall.core.util.ResponseUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/UserController.java

@@ -6,7 +6,7 @@ import org.apache.commons.logging.LogFactory;
 import org.linlinjava.litemall.admin.annotation.LoginAdmin;
 import org.linlinjava.litemall.db.domain.LitemallUser;
 import org.linlinjava.litemall.db.service.LitemallUserService;
-import org.linlinjava.litemall.db.util.ResponseUtil;
+import org.linlinjava.litemall.core.util.ResponseUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

litemall-admin-api/src/test/java/org/linlinjava/litemall/admin/BcryptTest.java

@@ -3,7 +3,7 @@ package org.linlinjava.litemall.admin;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.linlinjava.litemall.admin.util.bcrypt.BCryptPasswordEncoder;
+import org.linlinjava.litemall.core.util.bcrypt.BCryptPasswordEncoder;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 

litemall-core/.gitignore

+
+/target/
+/litemall-core.iml

litemall-core/pom.xml

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.linlinjava</groupId>
+    <artifactId>litemall-core</artifactId>
+    <version>0.1.0</version>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.5.10.RELEASE</version>
+        <relativePath/>
+    </parent>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>1.8</java.version>
+        <maven.test.skip>true</maven.test.skip>
+    </properties>
+
+    <dependencies>
+
+        <!-- Spring Boot Web 依赖 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>2.8.10</version>
+        </dependency>
+
+        <!-- Spring Boot Shiro 依赖 -->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.shiro</groupId>-->
+            <!--<artifactId>shiro-spring-boot-web-starter</artifactId>-->
+            <!--<version>1.4.0</version>-->
+        <!--</dependency>-->
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- 热部署模块 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+    </dependencies>
+
+</project>
\ No newline at end of file

litemall-core/src/main/java/org/linlinjava/litemall/core/Application.java

+package org.linlinjava.litemall.core;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+
+}
\ No newline at end of file

litemall-os-api/src/main/java/org/linlinjava/litemall/os/config/CorsConfig.java → litemall-core/src/main/java/org/linlinjava/litemall/core/config/CorsConfig.java

-package org.linlinjava.litemall.os.config;
+package org.linlinjava.litemall.core.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/config/GlobalExceptionHandler.java → litemall-core/src/main/java/org/linlinjava/litemall/core/config/GlobalExceptionHandler.java

-package org.linlinjava.litemall.admin.config;
+package org.linlinjava.litemall.core.config;
 
-import org.linlinjava.litemall.db.util.ResponseUtil;
+import org.linlinjava.litemall.core.util.ResponseUtil;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;

litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/config/JacksonConfig.java → litemall-core/src/main/java/org/linlinjava/litemall/core/config/JacksonConfig.java

-package org.linlinjava.litemall.wx.config;
+package org.linlinjava.litemall.core.config;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;

litemall-db/src/main/java/org/linlinjava/litemall/db/util/CharUtil.java → litemall-core/src/main/java/org/linlinjava/litemall/core/util/CharUtil.java

-package org.linlinjava.litemall.db.util;
+package org.linlinjava.litemall.core.util;
 
 import java.util.Random;
 

litemall-db/src/main/java/org/linlinjava/litemall/db/util/JacksonUtil.java → litemall-core/src/main/java/org/linlinjava/litemall/core/util/JacksonUtil.java

-package org.linlinjava.litemall.db.util;
+package org.linlinjava.litemall.core.util;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;

litemall-db/src/main/java/org/linlinjava/litemall/db/util/ResponseUtil.java → litemall-core/src/main/java/org/linlinjava/litemall/core/util/ResponseUtil.java

-package org.linlinjava.litemall.db.util;
+package org.linlinjava.litemall.core.util;
 
 import java.util.HashMap;
 import java.util.Map;
 
 public class ResponseUtil {
-    public static final Object ok() {
+    public static Object ok() {
         Map<String, Object> obj = new HashMap<String, Object>();
         obj.put("errno", 0);
         obj.put("errmsg", "成功");
         return obj;
     }
 
-    public static final Object ok(Object data) {
+    public static Object ok(Object data) {
         Map<String, Object> obj = new HashMap<String, Object>();
         obj.put("errno", 0);
         obj.put("errmsg", "成功");
@@ -19,7 +19,7 @@ public class ResponseUtil {
         return obj;
     }
 
-    public static final Object ok(String errmsg, Object data) {
+    public static Object ok(String errmsg, Object data) {
         Map<String, Object> obj = new HashMap<String, Object>();
         obj.put("errno", 0);
         obj.put("errmsg", errmsg);
@@ -27,57 +27,57 @@ public class ResponseUtil {
         return obj;
     }
 
-    public static final Object fail() {
+    public static Object fail() {
         Map<String, Object> obj = new HashMap<String, Object>();
         obj.put("errno", -1);
         obj.put("errmsg", "错误");
         return obj;
     }
 
-    public static final Object fail(int errno, String errmsg) {
+    public static Object fail(int errno, String errmsg) {
         Map<String, Object> obj = new HashMap<String, Object>();
         obj.put("errno", errno);
         obj.put("errmsg", errmsg);
         return obj;
     }
 
-    public static final Object fail401() {
+    public static Object fail401() {
         return fail(401, "请登录");
     }
 
-    public static final Object unlogin(){
+    public static Object unlogin(){
         return fail401();
     }
 
-    public static final Object fail402() {
+    public static Object fail402() {
         return fail(402, "参数不对");
     }
 
-    public static final Object badArgument(){
+    public static Object badArgument(){
         return fail402();
     }
 
-    public static final Object fail403() {
+    public static Object fail403() {
         return fail(403, "参数值不对");
     }
 
-    public static final Object badArgumentValue(){
+    public static Object badArgumentValue(){
         return fail403();
     }
 
-    public static final Object fail501() {
+    public static Object fail501() {
         return fail(501, "业务不支持");
     }
 
-    public static final Object unsupport(){
+    public static Object unsupport(){
         return fail501();
     }
 
-    public static final Object fail502() {
+    public static Object fail502() {
         return fail(502, "系统内部错误");
     }
 
-    public static final Object serious(){
+    public static Object serious(){
         return fail502();
     }