From f142c661b0b9915fbeaf80962b7b59ed9f1b09f6 Mon Sep 17 00:00:00 2001 From: Junling Bu Date: Sat, 21 Apr 2018 07:53:17 +0800 Subject: [PATCH] =?UTF-8?q?new[litemallc-core]:=20=E6=8A=8A=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E5=85=B1=E5=90=8C=E7=9A=84=E9=85=8D=E7=BD=AE=E6=88=96?= =?UTF-8?q?=E8=80=85=E9=80=9A=E7=94=A8=E4=BB=A3=E7=A0=81=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E5=88=B0=E6=96=B0=E7=9A=84=E4=B8=80=E4=B8=AA=E6=A0=B8=E5=BF=83?= =?UTF-8?q?=E6=A8=A1=E5=9D=97litemall-core=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- litemall-admin-api/pom.xml | 24 +- .../litemall/admin/Application.java | 2 +- .../litemall/admin/config/CorsConfig.java | 25 - .../litemall/admin/config/JacksonConfig.java | 36 - .../admin/service/AdminTokenManager.java | 2 +- .../litemall/admin/util/bcrypt/BCrypt.java | 675 ------------------ .../util/bcrypt/BCryptPasswordEncoder.java | 95 --- .../litemall/admin/web/AdController.java | 2 +- .../litemall/admin/web/AddressController.java | 2 +- .../litemall/admin/web/AdminController.java | 4 +- .../litemall/admin/web/AuthController.java | 6 +- .../litemall/admin/web/BrandController.java | 2 +- .../litemall/admin/web/CartController.java | 2 +- .../admin/web/CategoryController.java | 2 +- .../litemall/admin/web/CollectController.java | 2 +- .../litemall/admin/web/CommentController.java | 2 +- .../admin/web/DashbordController.java | 2 +- .../admin/web/FootprintController.java | 2 +- .../admin/web/GoodsAttributeController.java | 2 +- .../litemall/admin/web/GoodsController.java | 2 +- .../web/GoodsSpecificationController.java | 2 +- .../litemall/admin/web/HistoryController.java | 2 +- .../litemall/admin/web/IndexController.java | 2 +- .../litemall/admin/web/IssueController.java | 2 +- .../litemall/admin/web/KeywordController.java | 2 +- .../litemall/admin/web/OrderController.java | 2 +- .../litemall/admin/web/ProductController.java | 2 +- .../litemall/admin/web/RegionController.java | 2 +- .../litemall/admin/web/TopicController.java | 2 +- .../litemall/admin/web/UserController.java | 2 +- .../linlinjava/litemall/admin/BcryptTest.java | 2 +- litemall-core/.gitignore | 3 + litemall-core/pom.xml | 58 ++ .../linlinjava/litemall/core/Application.java | 13 + .../litemall/core}/config/CorsConfig.java | 2 +- .../core}/config/GlobalExceptionHandler.java | 4 +- .../litemall/core}/config/JacksonConfig.java | 2 +- .../litemall/core}/util/CharUtil.java | 2 +- .../litemall/core}/util/JacksonUtil.java | 2 +- .../litemall/core}/util/ResponseUtil.java | 32 +- .../litemall/core}/util/bcrypt/BCrypt.java | 2 +- .../util/bcrypt/BCryptPasswordEncoder.java | 2 +- litemall-db/pom.xml | 2 +- litemall-os-api/pom.xml | 19 +- .../linlinjava/litemall/os/Application.java | 2 +- .../os/config/GlobalExceptionHandler.java | 26 - .../litemall/os/config/JacksonConfig.java | 36 - ...Controller.java => OsIndexController.java} | 6 +- .../litemall/os/web/StorageController.java | 5 +- litemall-wx-api/pom.xml | 21 +- .../linlinjava/litemall/wx/Application.java | 2 +- .../wx/config/GlobalExceptionHandler.java | 26 - .../litemall/wx/service/UserTokenManager.java | 2 +- .../litemall/wx/web/WxAddressController.java | 2 +- .../litemall/wx/web/WxAuthController.java | 7 +- .../litemall/wx/web/WxBrandController.java | 2 +- .../litemall/wx/web/WxCartController.java | 4 +- .../litemall/wx/web/WxCatalogController.java | 2 +- .../litemall/wx/web/WxCollectController.java | 5 +- .../litemall/wx/web/WxCommentController.java | 3 +- .../wx/web/WxFootprintController.java | 4 +- .../litemall/wx/web/WxGoodsController.java | 3 +- .../litemall/wx/web/WxHomeController.java | 2 +- .../litemall/wx/web/WxIndexController.java | 4 +- .../litemall/wx/web/WxOrderController.java | 7 +- .../litemall/wx/web/WxPayController.java | 3 +- .../litemall/wx/web/WxRegionController.java | 2 +- .../litemall/wx/web/WxSearchController.java | 2 +- .../litemall/wx/web/WxTopicController.java | 2 +- pom.xml | 1 + 70 files changed, 179 insertions(+), 1058 deletions(-) delete mode 100644 litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/config/CorsConfig.java delete mode 100644 litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/config/JacksonConfig.java delete mode 100644 litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/bcrypt/BCrypt.java delete mode 100644 litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/bcrypt/BCryptPasswordEncoder.java create mode 100644 litemall-core/.gitignore create mode 100644 litemall-core/pom.xml create mode 100644 litemall-core/src/main/java/org/linlinjava/litemall/core/Application.java rename {litemall-os-api/src/main/java/org/linlinjava/litemall/os => litemall-core/src/main/java/org/linlinjava/litemall/core}/config/CorsConfig.java (95%) rename {litemall-admin-api/src/main/java/org/linlinjava/litemall/admin => litemall-core/src/main/java/org/linlinjava/litemall/core}/config/GlobalExceptionHandler.java (88%) rename {litemall-wx-api/src/main/java/org/linlinjava/litemall/wx => litemall-core/src/main/java/org/linlinjava/litemall/core}/config/JacksonConfig.java (97%) rename {litemall-db/src/main/java/org/linlinjava/litemall/db => litemall-core/src/main/java/org/linlinjava/litemall/core}/util/CharUtil.java (94%) rename {litemall-db/src/main/java/org/linlinjava/litemall/db => litemall-core/src/main/java/org/linlinjava/litemall/core}/util/JacksonUtil.java (98%) rename {litemall-db/src/main/java/org/linlinjava/litemall/db => litemall-core/src/main/java/org/linlinjava/litemall/core}/util/ResponseUtil.java (64%) rename {litemall-wx-api/src/main/java/org/linlinjava/litemall/wx => litemall-core/src/main/java/org/linlinjava/litemall/core}/util/bcrypt/BCrypt.java (99%) rename {litemall-wx-api/src/main/java/org/linlinjava/litemall/wx => litemall-core/src/main/java/org/linlinjava/litemall/core}/util/bcrypt/BCryptPasswordEncoder.java (98%) delete mode 100644 litemall-os-api/src/main/java/org/linlinjava/litemall/os/config/GlobalExceptionHandler.java delete mode 100644 litemall-os-api/src/main/java/org/linlinjava/litemall/os/config/JacksonConfig.java rename litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/{IndexController.java => OsIndexController.java} (71%) delete mode 100644 litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/config/GlobalExceptionHandler.java diff --git a/litemall-admin-api/pom.xml b/litemall-admin-api/pom.xml index 37996dc6..6658dfc4 100644 --- a/litemall-admin-api/pom.xml +++ b/litemall-admin-api/pom.xml @@ -10,9 +10,10 @@ org.springframework.boot spring-boot-starter-parent 1.5.10.RELEASE - + + UTF-8 1.8 @@ -23,29 +24,16 @@ org.linlinjava - litemall-db + litemall-core 0.1.0 - - org.springframework.boot - spring-boot-starter-web + org.linlinjava + litemall-db + 0.1.0 - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - 2.8.10 - - - - - - - - - org.springframework.boot spring-boot-starter-test diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/Application.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/Application.java index 92417d69..298cc061 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/Application.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/Application.java @@ -4,7 +4,7 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -@SpringBootApplication(scanBasePackages={"org.linlinjava.litemall.admin","org.linlinjava.litemall.db"}) +@SpringBootApplication(scanBasePackages={"org.linlinjava.litemall.core", "org.linlinjava.litemall.admin","org.linlinjava.litemall.db"}) @MapperScan("org.linlinjava.litemall.db.dao") public class Application { diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/config/CorsConfig.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/config/CorsConfig.java deleted file mode 100644 index 3fb4134f..00000000 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/config/CorsConfig.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.linlinjava.litemall.admin.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.cors.CorsConfiguration; -import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import org.springframework.web.filter.CorsFilter; - -@Configuration -public class CorsConfig { - private CorsConfiguration buildConfig() { - CorsConfiguration corsConfiguration = new CorsConfiguration(); - corsConfiguration.addAllowedOrigin("*"); // 1 设置访问源地址 - corsConfiguration.addAllowedHeader("*"); // 2 设置访问源请求头 - corsConfiguration.addAllowedMethod("*"); // 3 设置访问源请求方法 - return corsConfiguration; - } - - @Bean - public CorsFilter corsFilter() { - UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); - source.registerCorsConfiguration("/**", buildConfig()); // 4 对接口配置跨域设置 - return new CorsFilter(source); - } -} diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/config/JacksonConfig.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/config/JacksonConfig.java deleted file mode 100644 index 947a5479..00000000 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/config/JacksonConfig.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.linlinjava.litemall.admin.config; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; -import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.format.DateTimeFormatter; - -@Configuration -public class JacksonConfig { - @Bean - @Primary - public ObjectMapper objectMapper(Jackson2ObjectMapperBuilder builder) { - JavaTimeModule javaTimeModule = new JavaTimeModule(); - javaTimeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); - javaTimeModule.addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); - javaTimeModule.addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern("HH:mm:ss"))); - - ObjectMapper objectMapper = builder.createXmlMapper(false).build(); - objectMapper.registerModule(javaTimeModule); - objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false); - objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - return objectMapper; - } -} diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminTokenManager.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminTokenManager.java index b7e16b09..cf4dcf08 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminTokenManager.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminTokenManager.java @@ -1,7 +1,7 @@ package org.linlinjava.litemall.admin.service; import org.linlinjava.litemall.admin.dao.AdminToken; -import org.linlinjava.litemall.db.util.CharUtil; +import org.linlinjava.litemall.core.util.CharUtil; import java.time.LocalDateTime; import java.util.HashMap; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/bcrypt/BCrypt.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/bcrypt/BCrypt.java deleted file mode 100644 index 04126522..00000000 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/bcrypt/BCrypt.java +++ /dev/null @@ -1,675 +0,0 @@ -package org.linlinjava.litemall.admin.util.bcrypt; -// Copyright (c) 2006 Damien Miller -// -// Permission to use, copy, modify, and distribute this software for any -// purpose with or without fee is hereby granted, provided that the above -// copyright notice and this permission notice appear in all copies. -// -// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -import java.io.ByteArrayOutputStream; -import java.io.UnsupportedEncodingException; -import java.security.SecureRandom; - -/** - * BCrypt implements OpenBSD-style Blowfish password hashing using the scheme described in - * "A Future-Adaptable Password Scheme" by Niels Provos and David Mazieres. - *

- * This password hashing system tries to thwart off-line password cracking using a - * computationally-intensive hashing algorithm, based on Bruce Schneier's Blowfish cipher. - * The work factor of the algorithm is parameterised, so it can be increased as computers - * get faster. - *

- * Usage is really simple. To hash a password for the first time, call the hashpw method - * with a random salt, like this: - *

- * - * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt());
- * - *

- * To check whether a plaintext password matches one that has been hashed previously, use - * the checkpw method: - *

- * - * if (BCrypt.checkpw(candidate_password, stored_hash))
- *     System.out.println("It matches");
- * else
- *     System.out.println("It does not match");
- * - *

- * The gensalt() method takes an optional parameter (log_rounds) that determines the - * computational complexity of the hashing: - *

- * - * String strong_salt = BCrypt.gensalt(10)
- * String stronger_salt = BCrypt.gensalt(12)
- * - *

- * The amount of work increases exponentially (2**log_rounds), so each increment is twice - * as much work. The default log_rounds is 10, and the valid range is 4 to 31. - * - * @author Damien Miller - */ -public class BCrypt { - // BCrypt parameters - - private static final int GENSALT_DEFAULT_LOG2_ROUNDS = 10; - private static final int BCRYPT_SALT_LEN = 16; - // Blowfish parameters - private static final int BLOWFISH_NUM_ROUNDS = 16; - // Initial contents of key schedule - private static final int P_orig[] = { 0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, - 0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89, 0x452821e6, 0x38d01377, - 0xbe5466cf, 0x34e90c6c, 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917, - 0x9216d5d9, 0x8979fb1b }; - private static final int S_orig[] = { 0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, - 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99, 0x24a19947, 0xb3916cf7, - 0x0801f2e2, 0x858efc16, 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e, - 0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee, 0x7b54a41d, 0xc25a59b5, - 0x9c30d539, 0x2af26013, 0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef, - 0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e, 0xd71577c1, 0xbd314b27, - 0x78af2fda, 0x55605c60, 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440, - 0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce, 0xa15486af, 0x7c72e993, - 0xb3ee1411, 0x636fbc2a, 0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e, - 0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677, 0x3b8f4898, 0x6b4bb9af, - 0xc4bfe81b, 0x66282193, 0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032, - 0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88, 0x23893e81, 0xd396acc5, - 0x0f6d6ff3, 0x83f44239, 0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e, - 0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0, 0x6a51a0d2, 0xd8542f68, - 0x960fa728, 0xab5133a3, 0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98, - 0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88, 0x8cee8619, 0x456f9fb4, - 0x7d84a5c3, 0x3b8b5ebe, 0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6, - 0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d, 0x37d0d724, 0xd00a1248, - 0xdb0fead3, 0x49f1c09b, 0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7, - 0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba, 0xc1a94fb6, 0x409f60c4, - 0x5e5c9ec2, 0x196a2463, 0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f, - 0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09, 0xbee3d004, 0xde334afd, - 0x660f2807, 0x192e4bb3, 0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb, - 0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279, 0x679f25fe, 0xfb1fa3cc, - 0x8ea5e9f8, 0xdb3222f8, 0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab, - 0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82, 0x9e5c57bb, 0xca6f8ca0, - 0x1a87562e, 0xdf1769db, 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573, - 0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0, 0x10fa3d98, 0xfd2183b8, - 0x4afcb56c, 0x2dd1d35b, 0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790, - 0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8, 0xef20cada, 0x36774c01, - 0xd07e9efe, 0x2bf11fb4, 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0, - 0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7, 0x8ff6e2fb, 0xf2122b64, - 0x8888b812, 0x900df01c, 0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad, - 0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1, 0xe5a0cc0f, 0xb56f74e8, - 0x18acf3d6, 0xce89e299, 0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9, - 0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477, 0xe6ad2065, 0x77b5fa86, - 0xc75442f5, 0xfb9d35cf, 0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49, - 0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af, 0x2464369b, 0xf009b91e, - 0x5563911d, 0x59dfa6aa, 0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5, - 0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41, 0xb3472dca, 0x7b14a94a, - 0x1b510052, 0x9a532915, 0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400, - 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915, 0xb6636521, 0xe7b9f9b6, - 0xff34052e, 0xc5855664, 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a, - 0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d, - 0x9cee60b8, 0x8fedb266, 0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1, - 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e, 0x3f54989a, 0x5b429d65, - 0x6b8fe4d6, 0x99f73fd6, 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1, - 0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, 0x09686b3f, 0x3ebaefc9, - 0x3c971814, 0x6b6a70a1, 0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737, - 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8, 0xb03ada37, 0xf0500c0d, - 0xf01c1f04, 0x0200b3ff, 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd, - 0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701, 0x3ae5e581, 0x37c2dadc, - 0xc8b57634, 0x9af3dda7, 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41, - 0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331, 0x4e548b38, 0x4f6db908, - 0x6f420d03, 0xf60a04bf, 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af, - 0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e, 0x5512721f, 0x2e6b7124, - 0x501adde6, 0x9f84cd87, 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c, - 0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2, 0xef1c1847, 0x3215d908, - 0xdd433b37, 0x24c2ba16, 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd, - 0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b, 0x043556f1, 0xd7a3c76b, - 0x3c11183b, 0x5924a509, 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e, - 0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3, 0x771fe71c, 0x4e3d06fa, - 0x2965dcb9, 0x99e71d0f, 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a, - 0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4, 0xf2f74ea7, 0x361d2b3d, - 0x1939260f, 0x19c27960, 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66, - 0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28, 0xc332ddef, 0xbe6c5aa5, - 0x65582185, 0x68ab9802, 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84, - 0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510, 0x13cca830, 0xeb61bd96, - 0x0334fe1e, 0xaa0363cf, 0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14, - 0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e, 0x648b1eaf, 0x19bdf0ca, - 0xa02369b9, 0x655abb50, 0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7, - 0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8, 0xf837889a, 0x97e32d77, - 0x11ed935f, 0x16681281, 0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99, - 0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696, 0xcdb30aeb, 0x532e3054, - 0x8fd948e4, 0x6dbc3128, 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73, - 0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0, 0x45eee2b6, 0xa3aaabea, - 0xdb6c4f15, 0xfacb4fd0, 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105, - 0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250, 0xcf62a1f2, 0x5b8d2646, - 0xfc8883a0, 0xc1c7b6a3, 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285, - 0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00, 0x58428d2a, 0x0c55f5ea, - 0x1dadf43e, 0x233f7061, 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb, - 0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e, 0xa6078084, 0x19f8509e, - 0xe8efd855, 0x61d99735, 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc, - 0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9, 0xdb73dbd3, 0x105588cd, - 0x675fda79, 0xe3674340, 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20, - 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7, 0xe93d5a68, 0x948140f7, - 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068, - 0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af, 0x1e39f62e, 0x97244546, - 0x14214f74, 0xbf8b8840, 0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45, - 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504, 0x96eb27b3, 0x55fd3941, - 0xda2547e6, 0xabca0a9a, 0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb, - 0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee, 0x4f3ffea2, 0xe887ad8c, - 0xb58ce006, 0x7af4d6b6, 0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42, - 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b, 0x1dc9faf7, 0x4b6d1856, - 0x26a36631, 0xeae397b2, 0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb, - 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527, 0x55533a3a, 0x20838d87, - 0xfe6ba9b7, 0xd096954b, 0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33, - 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c, 0xfdf8e802, 0x04272f70, - 0x80bb155c, 0x05282ce3, 0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc, - 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17, 0x325f51eb, 0xd59bc0d1, - 0xf2bcc18f, 0x41113564, 0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b, - 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115, 0x6b2395e0, 0x333e92e1, - 0x3b240b62, 0xeebeb922, 0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728, - 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0, 0x5449a36f, 0x877d48fa, - 0xc39dfd27, 0xf33e8d1e, 0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37, - 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d, 0xc67b5510, 0x6d672c37, - 0x2765d43b, 0xdcd0e804, 0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b, - 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3, 0xbb132f88, 0x515bad24, - 0x7b9479bf, 0x763bd6eb, 0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d, - 0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c, 0x6a124237, 0xb79251e7, - 0x06a1bbe6, 0x4bfb6350, 0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9, - 0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a, 0x64af674e, 0xda86a85f, - 0xbebfe988, 0x64e4c3fe, 0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d, - 0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc, 0x83426b33, 0xf01eab71, - 0xb0804187, 0x3c005e5f, 0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61, - 0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2, 0x5366f9c3, 0xc8b38e74, - 0xb475f255, 0x46fcd9b9, 0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2, - 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c, 0xb90bace1, 0xbb8205d0, - 0x11a86248, 0x7574a99e, 0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633, - 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10, 0x1ab93d1d, 0x0ba5a4df, - 0xa186f20f, 0x2868f169, 0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52, - 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027, 0x9af88c27, 0x773f8641, - 0xc3604c06, 0x61a806b5, 0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62, - 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634, 0xbbcbee56, 0x90bcb6de, - 0xebfc7da1, 0xce591d76, 0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24, - 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc, 0xed545578, 0x08fca5b5, - 0xd83d7cd3, 0x4dad0fc4, 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c, - 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837, 0xd79a3234, 0x92638212, - 0x670efa8e, 0x406000e0, 0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, - 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe, 0xd5118e9d, 0xbf0f7315, - 0xd62d1c7e, 0xc700c47b, 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4, - 0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8, 0x530ff8ee, 0x468dde7d, - 0xd5730a1d, 0x4cd04dc6, 0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304, - 0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22, 0xc089c2b8, 0x43242ef6, - 0xa51e03aa, 0x9cf2d0a4, 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6, - 0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9, 0xc72fefd3, 0xf752f7da, - 0x3f046f69, 0x77fa0a59, 0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593, - 0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51, 0x96d5ac3a, 0x017da67d, - 0xd1cf3ed6, 0x7c7d2d28, 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c, - 0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b, 0xe8d3c48d, 0x283b57cc, - 0xf8d56629, 0x79132e28, 0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c, - 0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd, 0xc3eb9e15, 0x3c9057a2, - 0x97271aec, 0xa93a072a, 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319, - 0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb, 0x28517711, 0xc20ad9f8, - 0xabcc5167, 0xccad925f, 0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991, - 0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32, 0xa8b6e37e, 0xc3293d46, - 0x48de5369, 0x6413e680, 0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166, - 0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae, 0x5bbef7dd, 0x1b588d40, - 0xccd2017f, 0x6bb4e3bb, 0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5, - 0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47, 0xd29be463, 0x542f5d9e, - 0xaec2771b, 0xf64e6370, 0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d, - 0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84, 0xe1b00428, 0x95983a1d, - 0x06b89fb4, 0xce6ea048, 0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8, - 0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd, 0xa08839e1, 0x51ce794b, - 0x2f32c9b7, 0xa01fbac9, 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7, - 0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38, 0x0339c32a, 0xc6913667, - 0x8df9317c, 0xe0b12b4f, 0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c, - 0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525, 0xfae59361, 0xceb69ceb, - 0xc2a86459, 0x12baa8d1, 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442, - 0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964, 0x9f1f9532, 0xe0d392df, - 0xd3a0342b, 0x8971f21e, 0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8, - 0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d, 0xe54cda54, 0x1edad891, - 0xce6279cf, 0xcd3e7e6f, 0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299, - 0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02, 0xacf08162, 0x5a75ebb5, - 0x6e163697, 0x88d273cc, 0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614, - 0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a, 0xc9aa53fd, 0x62a80f00, - 0xbb25bfe2, 0x35bdd2f6, 0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b, - 0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0, 0xba38209c, 0xf746ce76, - 0x77afa1c5, 0x20756060, 0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e, - 0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9, 0x90d4f869, 0xa65cdea0, - 0x3f09252d, 0xc208e69f, 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6 }; - // bcrypt IV: "OrpheanBeholderScryDoubt" - static private final int bf_crypt_ciphertext[] = { 0x4f727068, 0x65616e42, - 0x65686f6c, 0x64657253, 0x63727944, 0x6f756274 }; - // Table for Base64 encoding - static private final char base64_code[] = { '.', '/', 'A', 'B', 'C', 'D', 'E', 'F', - 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', - 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', - 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', - 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' }; - // Table for Base64 decoding - static private final byte index_64[] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 54, 55, - 56, 57, 58, 59, 60, 61, 62, 63, -1, -1, -1, -1, -1, -1, -1, 2, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, - -1, -1, -1, -1, -1, -1, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, - 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, -1, -1, -1, -1, -1 }; - static final int MIN_LOG_ROUNDS = 4; - static final int MAX_LOG_ROUNDS = 31; - // Expanded Blowfish key - private int P[]; - private int S[]; - - /** - * Encode a byte array using bcrypt's slightly-modified base64 encoding scheme. Note - * that this is not compatible with the standard MIME-base64 - * encoding. - * - * @param d the byte array to encode - * @param len the number of bytes to encode - * @param rs the destination buffer for the base64-encoded string - * @exception IllegalArgumentException if the length is invalid - */ - static void encode_base64(byte d[], int len, StringBuilder rs) - throws IllegalArgumentException { - int off = 0; - int c1, c2; - - if (len <= 0 || len > d.length) { - throw new IllegalArgumentException("Invalid len"); - } - - while (off < len) { - c1 = d[off++] & 0xff; - rs.append(base64_code[(c1 >> 2) & 0x3f]); - c1 = (c1 & 0x03) << 4; - if (off >= len) { - rs.append(base64_code[c1 & 0x3f]); - break; - } - c2 = d[off++] & 0xff; - c1 |= (c2 >> 4) & 0x0f; - rs.append(base64_code[c1 & 0x3f]); - c1 = (c2 & 0x0f) << 2; - if (off >= len) { - rs.append(base64_code[c1 & 0x3f]); - break; - } - c2 = d[off++] & 0xff; - c1 |= (c2 >> 6) & 0x03; - rs.append(base64_code[c1 & 0x3f]); - rs.append(base64_code[c2 & 0x3f]); - } - } - - /** - * Look up the 3 bits base64-encoded by the specified character, range-checking - * against conversion table - * @param x the base64-encoded value - * @return the decoded value of x - */ - private static byte char64(char x) { - if (x > index_64.length) { - return -1; - } - return index_64[x]; - } - - /** - * Decode a string encoded using bcrypt's base64 scheme to a byte array. Note that - * this is *not* compatible with the standard MIME-base64 encoding. - * @param s the string to decode - * @param maxolen the maximum number of bytes to decode - * @return an array containing the decoded bytes - * @throws IllegalArgumentException if maxolen is invalid - */ - static byte[] decode_base64(String s, int maxolen) throws IllegalArgumentException { - ByteArrayOutputStream out = new ByteArrayOutputStream(maxolen); - int off = 0, slen = s.length(), olen = 0; - byte c1, c2, c3, c4, o; - - if (maxolen <= 0) { - throw new IllegalArgumentException("Invalid maxolen"); - } - - while (off < slen - 1 && olen < maxolen) { - c1 = char64(s.charAt(off++)); - c2 = char64(s.charAt(off++)); - if (c1 == -1 || c2 == -1) { - break; - } - o = (byte) (c1 << 2); - o |= (c2 & 0x30) >> 4; - out.write(o); - if (++olen >= maxolen || off >= slen) { - break; - } - c3 = char64(s.charAt(off++)); - if (c3 == -1) { - break; - } - o = (byte) ((c2 & 0x0f) << 4); - o |= (c3 & 0x3c) >> 2; - out.write(o); - if (++olen >= maxolen || off >= slen) { - break; - } - c4 = char64(s.charAt(off++)); - o = (byte) ((c3 & 0x03) << 6); - o |= c4; - out.write(o); - ++olen; - } - - return out.toByteArray(); - } - - /** - * Blowfish encipher a single 64-bit block encoded as two 32-bit halves - * @param lr an array containing the two 32-bit half blocks - * @param off the position in the array of the blocks - */ - private final void encipher(int lr[], int off) { - int i, n, l = lr[off], r = lr[off + 1]; - - l ^= P[0]; - for (i = 0; i <= BLOWFISH_NUM_ROUNDS - 2;) { - // Feistel substitution on left word - n = S[(l >> 24) & 0xff]; - n += S[0x100 | ((l >> 16) & 0xff)]; - n ^= S[0x200 | ((l >> 8) & 0xff)]; - n += S[0x300 | (l & 0xff)]; - r ^= n ^ P[++i]; - - // Feistel substitution on right word - n = S[(r >> 24) & 0xff]; - n += S[0x100 | ((r >> 16) & 0xff)]; - n ^= S[0x200 | ((r >> 8) & 0xff)]; - n += S[0x300 | (r & 0xff)]; - l ^= n ^ P[++i]; - } - lr[off] = r ^ P[BLOWFISH_NUM_ROUNDS + 1]; - lr[off + 1] = l; - } - - /** - * Cycically extract a word of key material - * @param data the string to extract the data from - * @param offp a "pointer" (as a one-entry array) to the current offset into data - * @return the next word of material from data - */ - private static int streamtoword(byte data[], int offp[]) { - int i; - int word = 0; - int off = offp[0]; - - for (i = 0; i < 4; i++) { - word = (word << 8) | (data[off] & 0xff); - off = (off + 1) % data.length; - } - - offp[0] = off; - return word; - } - - /** - * Initialise the Blowfish key schedule - */ - private void init_key() { - P = (int[]) P_orig.clone(); - S = (int[]) S_orig.clone(); - } - - /** - * Key the Blowfish cipher - * @param key an array containing the key - */ - private void key(byte key[]) { - int i; - int koffp[] = { 0 }; - int lr[] = { 0, 0 }; - int plen = P.length, slen = S.length; - - for (i = 0; i < plen; i++) { - P[i] = P[i] ^ streamtoword(key, koffp); - } - - for (i = 0; i < plen; i += 2) { - encipher(lr, 0); - P[i] = lr[0]; - P[i + 1] = lr[1]; - } - - for (i = 0; i < slen; i += 2) { - encipher(lr, 0); - S[i] = lr[0]; - S[i + 1] = lr[1]; - } - } - - /** - * Perform the "enhanced key schedule" step described by Provos and Mazieres in - * "A Future-Adaptable Password Scheme" http://www.openbsd.org/papers/bcrypt-paper.ps - * @param data salt information - * @param key password information - */ - private void ekskey(byte data[], byte key[]) { - int i; - int koffp[] = { 0 }, doffp[] = { 0 }; - int lr[] = { 0, 0 }; - int plen = P.length, slen = S.length; - - for (i = 0; i < plen; i++) { - P[i] = P[i] ^ streamtoword(key, koffp); - } - - for (i = 0; i < plen; i += 2) { - lr[0] ^= streamtoword(data, doffp); - lr[1] ^= streamtoword(data, doffp); - encipher(lr, 0); - P[i] = lr[0]; - P[i + 1] = lr[1]; - } - - for (i = 0; i < slen; i += 2) { - lr[0] ^= streamtoword(data, doffp); - lr[1] ^= streamtoword(data, doffp); - encipher(lr, 0); - S[i] = lr[0]; - S[i + 1] = lr[1]; - } - } - - static long roundsForLogRounds(int log_rounds) { - if (log_rounds < 4 || log_rounds > 31) { - throw new IllegalArgumentException("Bad number of rounds"); - } - return 1L << log_rounds; - } - - /** - * Perform the central password hashing step in the bcrypt scheme - * @param password the password to hash - * @param salt the binary salt to hash with the password - * @param log_rounds the binary logarithm of the number of rounds of hashing to apply - * @return an array containing the binary hashed password - */ - private byte[] crypt_raw(byte password[], byte salt[], int log_rounds) { - int cdata[] = (int[]) bf_crypt_ciphertext.clone(); - int clen = cdata.length; - byte ret[]; - - long rounds = roundsForLogRounds(log_rounds); - - init_key(); - ekskey(salt, password); - for (long i = 0; i < rounds; i++) { - key(password); - key(salt); - } - - for (int i = 0; i < 64; i++) { - for (int j = 0; j < (clen >> 1); j++) { - encipher(cdata, j << 1); - } - } - - ret = new byte[clen * 4]; - for (int i = 0, j = 0; i < clen; i++) { - ret[j++] = (byte) ((cdata[i] >> 24) & 0xff); - ret[j++] = (byte) ((cdata[i] >> 16) & 0xff); - ret[j++] = (byte) ((cdata[i] >> 8) & 0xff); - ret[j++] = (byte) (cdata[i] & 0xff); - } - return ret; - } - - /** - * Hash a password using the OpenBSD bcrypt scheme - * @param password the password to hash - * @param salt the salt to hash with (perhaps generated using BCrypt.gensalt) - * @return the hashed password - * @throws IllegalArgumentException if invalid salt is passed - */ - public static String hashpw(String password, String salt) throws IllegalArgumentException { - BCrypt B; - String real_salt; - byte passwordb[], saltb[], hashed[]; - char minor = (char) 0; - int rounds, off = 0; - StringBuilder rs = new StringBuilder(); - - if (salt == null) { - throw new IllegalArgumentException("salt cannot be null"); - } - - int saltLength = salt.length(); - - if (saltLength < 28) { - throw new IllegalArgumentException("Invalid salt"); - } - - if (salt.charAt(0) != '$' || salt.charAt(1) != '2') { - throw new IllegalArgumentException("Invalid salt version"); - } - if (salt.charAt(2) == '$') { - off = 3; - } - else { - minor = salt.charAt(2); - if (minor != 'a' || salt.charAt(3) != '$') { - throw new IllegalArgumentException("Invalid salt revision"); - } - off = 4; - } - - if (saltLength - off < 25) { - throw new IllegalArgumentException("Invalid salt"); - } - - // Extract number of rounds - if (salt.charAt(off + 2) > '$') { - throw new IllegalArgumentException("Missing salt rounds"); - } - rounds = Integer.parseInt(salt.substring(off, off + 2)); - - real_salt = salt.substring(off + 3, off + 25); - try { - passwordb = (password + (minor >= 'a' ? "\000" : "")).getBytes("UTF-8"); - } - catch (UnsupportedEncodingException uee) { - throw new AssertionError("UTF-8 is not supported"); - } - - saltb = decode_base64(real_salt, BCRYPT_SALT_LEN); - - B = new BCrypt(); - hashed = B.crypt_raw(passwordb, saltb, rounds); - - rs.append("$2"); - if (minor >= 'a') { - rs.append(minor); - } - rs.append("$"); - if (rounds < 10) { - rs.append("0"); - } - rs.append(rounds); - rs.append("$"); - encode_base64(saltb, saltb.length, rs); - encode_base64(hashed, bf_crypt_ciphertext.length * 4 - 1, rs); - return rs.toString(); - } - - /** - * Generate a salt for use with the BCrypt.hashpw() method - * @param log_rounds the log2 of the number of rounds of hashing to apply - the work - * factor therefore increases as 2**log_rounds. Minimum 4, maximum 31. - * @param random an instance of SecureRandom to use - * @return an encoded salt value - */ - public static String gensalt(int log_rounds, SecureRandom random) { - if (log_rounds < MIN_LOG_ROUNDS || log_rounds > MAX_LOG_ROUNDS) { - throw new IllegalArgumentException("Bad number of rounds"); - } - StringBuilder rs = new StringBuilder(); - byte rnd[] = new byte[BCRYPT_SALT_LEN]; - - random.nextBytes(rnd); - - rs.append("$2a$"); - if (log_rounds < 10) { - rs.append("0"); - } - rs.append(log_rounds); - rs.append("$"); - encode_base64(rnd, rnd.length, rs); - return rs.toString(); - } - - /** - * Generate a salt for use with the BCrypt.hashpw() method - * @param log_rounds the log2 of the number of rounds of hashing to apply - the work - * factor therefore increases as 2**log_rounds. Minimum 4, maximum 31. - * @return an encoded salt value - */ - public static String gensalt(int log_rounds) { - return gensalt(log_rounds, new SecureRandom()); - } - - /** - * Generate a salt for use with the BCrypt.hashpw() method, selecting a reasonable - * default for the number of hashing rounds to apply - * @return an encoded salt value - */ - public static String gensalt() { - return gensalt(GENSALT_DEFAULT_LOG2_ROUNDS); - } - - /** - * Check that a plaintext password matches a previously hashed one - * @param plaintext the plaintext password to verify - * @param hashed the previously-hashed password - * @return true if the passwords match, false otherwise - */ - public static boolean checkpw(String plaintext, String hashed) { - return equalsNoEarlyReturn(hashed, hashpw(plaintext, hashed)); - } - - static boolean equalsNoEarlyReturn(String a, String b) { - char[] caa = a.toCharArray(); - char[] cab = b.toCharArray(); - - if (caa.length != cab.length) { - return false; - } - - byte ret = 0; - for (int i = 0; i < caa.length; i++) { - ret |= caa[i] ^ cab[i]; - } - return ret == 0; - } -} \ No newline at end of file diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/bcrypt/BCryptPasswordEncoder.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/bcrypt/BCryptPasswordEncoder.java deleted file mode 100644 index eef2e21d..00000000 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/bcrypt/BCryptPasswordEncoder.java +++ /dev/null @@ -1,95 +0,0 @@ -package org.linlinjava.litemall.admin.util.bcrypt; -/* - * Copyright 2002-2011 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.security.SecureRandom; -import java.util.regex.Pattern; - -/** - * Implementation of PasswordEncoder that uses the BCrypt strong hashing function. Clients - * can optionally supply a "strength" (a.k.a. log rounds in BCrypt) and a SecureRandom - * instance. The larger the strength parameter the more work will have to be done - * (exponentially) to hash the passwords. The default value is 10. - * - * @author Dave Syer - * - */ -public class BCryptPasswordEncoder { - private Pattern BCRYPT_PATTERN = Pattern - .compile("\\A\\$2a?\\$\\d\\d\\$[./0-9A-Za-z]{53}"); - private final Log logger = LogFactory.getLog(getClass()); - - private final int strength; - - private final SecureRandom random; - - public BCryptPasswordEncoder() { - this(-1); - } - - /** - * @param strength the log rounds to use, between 4 and 31 - */ - public BCryptPasswordEncoder(int strength) { - this(strength, null); - } - - /** - * @param strength the log rounds to use, between 4 and 31 - * @param random the secure random instance to use - * - */ - public BCryptPasswordEncoder(int strength, SecureRandom random) { - if (strength != -1 && (strength < BCrypt.MIN_LOG_ROUNDS || strength > BCrypt.MAX_LOG_ROUNDS)) { - throw new IllegalArgumentException("Bad strength"); - } - this.strength = strength; - this.random = random; - } - - public String encode(CharSequence rawPassword) { - String salt; - if (strength > 0) { - if (random != null) { - salt = BCrypt.gensalt(strength, random); - } - else { - salt = BCrypt.gensalt(strength); - } - } - else { - salt = BCrypt.gensalt(); - } - return BCrypt.hashpw(rawPassword.toString(), salt); - } - - public boolean matches(CharSequence rawPassword, String encodedPassword) { - if (encodedPassword == null || encodedPassword.length() == 0) { - logger.warn("Empty encoded password"); - return false; - } - - if (!BCRYPT_PATTERN.matcher(encodedPassword).matches()) { - logger.warn("Encoded password does not look like BCrypt"); - return false; - } - - return BCrypt.checkpw(rawPassword.toString(), encodedPassword); - } -} \ No newline at end of file diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdController.java index 2cd8501d..04963de9 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdController.java @@ -5,7 +5,7 @@ import org.apache.commons.logging.LogFactory; import org.linlinjava.litemall.admin.annotation.LoginAdmin; import org.linlinjava.litemall.db.domain.LitemallAd; import org.linlinjava.litemall.db.service.LitemallAdService; -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.*; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AddressController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AddressController.java index 7b5ad7cc..d21586e6 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AddressController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AddressController.java @@ -6,7 +6,7 @@ import org.linlinjava.litemall.admin.annotation.LoginAdmin; import org.linlinjava.litemall.db.domain.LitemallAddress; import org.linlinjava.litemall.db.service.LitemallAddressService; 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.*; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminController.java index 302a6852..b8e46f42 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminController.java @@ -2,10 +2,10 @@ package org.linlinjava.litemall.admin.web; import org.linlinjava.litemall.admin.annotation.LoginAdmin; import org.linlinjava.litemall.admin.service.AdminTokenManager; -import org.linlinjava.litemall.admin.util.bcrypt.BCryptPasswordEncoder; +import org.linlinjava.litemall.core.util.ResponseUtil; +import org.linlinjava.litemall.core.util.bcrypt.BCryptPasswordEncoder; import org.linlinjava.litemall.db.domain.LitemallAdmin; import org.linlinjava.litemall.db.service.LitemallAdminService; -import org.linlinjava.litemall.db.util.ResponseUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AuthController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AuthController.java index 018af964..67deceb8 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AuthController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AuthController.java @@ -5,11 +5,11 @@ import org.apache.commons.logging.LogFactory; import org.linlinjava.litemall.admin.dao.AdminToken; import org.linlinjava.litemall.admin.annotation.LoginAdmin; import org.linlinjava.litemall.admin.service.AdminTokenManager; -import org.linlinjava.litemall.admin.util.bcrypt.BCryptPasswordEncoder; +import org.linlinjava.litemall.core.util.bcrypt.BCryptPasswordEncoder; import org.linlinjava.litemall.db.domain.LitemallAdmin; import org.linlinjava.litemall.db.service.LitemallAdminService; -import org.linlinjava.litemall.db.util.JacksonUtil; -import org.linlinjava.litemall.db.util.ResponseUtil; +import org.linlinjava.litemall.core.util.JacksonUtil; +import org.linlinjava.litemall.core.util.ResponseUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/BrandController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/BrandController.java index 0449ac15..0b279969 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/BrandController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/BrandController.java @@ -5,7 +5,7 @@ import org.apache.commons.logging.LogFactory; import org.linlinjava.litemall.admin.annotation.LoginAdmin; import org.linlinjava.litemall.db.domain.LitemallBrand; import org.linlinjava.litemall.db.service.LitemallBrandService; -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.*; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/CartController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/CartController.java index b5105ce1..244f6372 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/CartController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/CartController.java @@ -8,7 +8,7 @@ import org.linlinjava.litemall.db.service.LitemallCartService; import org.linlinjava.litemall.db.service.LitemallGoodsService; import org.linlinjava.litemall.db.service.LitemallProductService; 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.*; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/CategoryController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/CategoryController.java index ea30945c..6aff5153 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/CategoryController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/CategoryController.java @@ -5,7 +5,7 @@ import org.apache.commons.logging.LogFactory; import org.linlinjava.litemall.admin.annotation.LoginAdmin; import org.linlinjava.litemall.db.domain.LitemallCategory; import org.linlinjava.litemall.db.service.LitemallCategoryService; -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.*; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/CollectController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/CollectController.java index 3c5dfcba..9dcf9b5c 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/CollectController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/CollectController.java @@ -5,7 +5,7 @@ import org.apache.commons.logging.LogFactory; import org.linlinjava.litemall.admin.annotation.LoginAdmin; import org.linlinjava.litemall.db.domain.LitemallCollect; import org.linlinjava.litemall.db.service.LitemallCollectService; -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.*; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/CommentController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/CommentController.java index 6f29af2c..1d422ffe 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/CommentController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/CommentController.java @@ -5,7 +5,7 @@ import org.apache.commons.logging.LogFactory; import org.linlinjava.litemall.admin.annotation.LoginAdmin; import org.linlinjava.litemall.db.domain.LitemallComment; import org.linlinjava.litemall.db.service.LitemallCommentService; -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.*; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/DashbordController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/DashbordController.java index 7ed457cd..35ce58ad 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/DashbordController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/DashbordController.java @@ -7,7 +7,7 @@ import org.linlinjava.litemall.db.service.LitemallGoodsService; import org.linlinjava.litemall.db.service.LitemallOrderService; import org.linlinjava.litemall.db.service.LitemallProductService; 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.*; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/FootprintController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/FootprintController.java index 0d17f2ed..36a952a8 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/FootprintController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/FootprintController.java @@ -5,7 +5,7 @@ import org.apache.commons.logging.LogFactory; import org.linlinjava.litemall.admin.annotation.LoginAdmin; import org.linlinjava.litemall.db.domain.LitemallFootprint; import org.linlinjava.litemall.db.service.LitemallFootprintService; -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.*; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/GoodsAttributeController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/GoodsAttributeController.java index d319fd0e..ffa224c8 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/GoodsAttributeController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/GoodsAttributeController.java @@ -5,7 +5,7 @@ import org.apache.commons.logging.LogFactory; import org.linlinjava.litemall.admin.annotation.LoginAdmin; import org.linlinjava.litemall.db.domain.LitemallGoodsAttribute; import org.linlinjava.litemall.db.service.LitemallGoodsAttributeService; -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.*; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/GoodsController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/GoodsController.java index c27c64ff..52d8eab9 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/GoodsController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/GoodsController.java @@ -5,7 +5,7 @@ import org.apache.commons.logging.LogFactory; import org.linlinjava.litemall.admin.annotation.LoginAdmin; import org.linlinjava.litemall.db.domain.LitemallGoods; import org.linlinjava.litemall.db.service.LitemallGoodsService; -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.*; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/GoodsSpecificationController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/GoodsSpecificationController.java index e64ed4c2..5e8c7c04 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/GoodsSpecificationController.java +++ b/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.*; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/HistoryController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/HistoryController.java index 901237c1..9d71ab3a 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/HistoryController.java +++ b/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.*; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/IndexController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/IndexController.java index 2366952a..bc8bb311 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/IndexController.java +++ b/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; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/IssueController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/IssueController.java index 0ffd75ff..9930a9ce 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/IssueController.java +++ b/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.*; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/KeywordController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/KeywordController.java index 0e1edaf7..45721ea8 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/KeywordController.java +++ b/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.*; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/OrderController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/OrderController.java index 1f5a61d7..98317e42 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/OrderController.java +++ b/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.*; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/ProductController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/ProductController.java index 15f5a909..e07adccf 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/ProductController.java +++ b/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.*; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/RegionController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/RegionController.java index 116fc44d..5d2709ff 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/RegionController.java +++ b/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; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/TopicController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/TopicController.java index 473dbe13..a08064a7 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/TopicController.java +++ b/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.*; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/UserController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/UserController.java index c137ea72..9b63c983 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/UserController.java +++ b/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.*; diff --git a/litemall-admin-api/src/test/java/org/linlinjava/litemall/admin/BcryptTest.java b/litemall-admin-api/src/test/java/org/linlinjava/litemall/admin/BcryptTest.java index a71d2dad..7fb0d867 100644 --- a/litemall-admin-api/src/test/java/org/linlinjava/litemall/admin/BcryptTest.java +++ b/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; diff --git a/litemall-core/.gitignore b/litemall-core/.gitignore new file mode 100644 index 00000000..94ceef7d --- /dev/null +++ b/litemall-core/.gitignore @@ -0,0 +1,3 @@ + +/target/ +/litemall-core.iml diff --git a/litemall-core/pom.xml b/litemall-core/pom.xml new file mode 100644 index 00000000..b640f92a --- /dev/null +++ b/litemall-core/pom.xml @@ -0,0 +1,58 @@ + + 4.0.0 + org.linlinjava + litemall-core + 0.1.0 + jar + + + org.springframework.boot + spring-boot-starter-parent + 1.5.10.RELEASE + + + + + UTF-8 + 1.8 + true + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + 2.8.10 + + + + + + + + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + org.springframework.boot + spring-boot-devtools + true + + + + + \ No newline at end of file diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/Application.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/Application.java new file mode 100644 index 00000000..3da96531 --- /dev/null +++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/Application.java @@ -0,0 +1,13 @@ +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 diff --git a/litemall-os-api/src/main/java/org/linlinjava/litemall/os/config/CorsConfig.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/config/CorsConfig.java similarity index 95% rename from litemall-os-api/src/main/java/org/linlinjava/litemall/os/config/CorsConfig.java rename to litemall-core/src/main/java/org/linlinjava/litemall/core/config/CorsConfig.java index 65be7be7..7467f278 100644 --- a/litemall-os-api/src/main/java/org/linlinjava/litemall/os/config/CorsConfig.java +++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/config/CorsConfig.java @@ -1,4 +1,4 @@ -package org.linlinjava.litemall.os.config; +package org.linlinjava.litemall.core.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/config/GlobalExceptionHandler.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/config/GlobalExceptionHandler.java similarity index 88% rename from litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/config/GlobalExceptionHandler.java rename to litemall-core/src/main/java/org/linlinjava/litemall/core/config/GlobalExceptionHandler.java index 3eac9b11..3e77dc51 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/config/GlobalExceptionHandler.java +++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/config/GlobalExceptionHandler.java @@ -1,6 +1,6 @@ -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; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/config/JacksonConfig.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/config/JacksonConfig.java similarity index 97% rename from litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/config/JacksonConfig.java rename to litemall-core/src/main/java/org/linlinjava/litemall/core/config/JacksonConfig.java index c7835ee4..499a2202 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/config/JacksonConfig.java +++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/config/JacksonConfig.java @@ -1,4 +1,4 @@ -package org.linlinjava.litemall.wx.config; +package org.linlinjava.litemall.core.config; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/util/CharUtil.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/util/CharUtil.java similarity index 94% rename from litemall-db/src/main/java/org/linlinjava/litemall/db/util/CharUtil.java rename to litemall-core/src/main/java/org/linlinjava/litemall/core/util/CharUtil.java index e24017c6..628989bc 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/util/CharUtil.java +++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/util/CharUtil.java @@ -1,4 +1,4 @@ -package org.linlinjava.litemall.db.util; +package org.linlinjava.litemall.core.util; import java.util.Random; diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/util/JacksonUtil.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/util/JacksonUtil.java similarity index 98% rename from litemall-db/src/main/java/org/linlinjava/litemall/db/util/JacksonUtil.java rename to litemall-core/src/main/java/org/linlinjava/litemall/core/util/JacksonUtil.java index 2c0acfa8..2d39531f 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/util/JacksonUtil.java +++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/util/JacksonUtil.java @@ -1,4 +1,4 @@ -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; diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/util/ResponseUtil.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/util/ResponseUtil.java similarity index 64% rename from litemall-db/src/main/java/org/linlinjava/litemall/db/util/ResponseUtil.java rename to litemall-core/src/main/java/org/linlinjava/litemall/core/util/ResponseUtil.java index 05105e16..ed995691 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/util/ResponseUtil.java +++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/util/ResponseUtil.java @@ -1,17 +1,17 @@ -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 obj = new HashMap(); obj.put("errno", 0); obj.put("errmsg", "成功"); return obj; } - public static final Object ok(Object data) { + public static Object ok(Object data) { Map obj = new HashMap(); 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 obj = new HashMap(); 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 obj = new HashMap(); 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 obj = new HashMap(); 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(); } diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/util/bcrypt/BCrypt.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/util/bcrypt/BCrypt.java similarity index 99% rename from litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/util/bcrypt/BCrypt.java rename to litemall-core/src/main/java/org/linlinjava/litemall/core/util/bcrypt/BCrypt.java index 7b16d00d..0d987f15 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/util/bcrypt/BCrypt.java +++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/util/bcrypt/BCrypt.java @@ -1,4 +1,4 @@ -package org.linlinjava.litemall.wx.util.bcrypt; +package org.linlinjava.litemall.core.util.bcrypt; // Copyright (c) 2006 Damien Miller // // Permission to use, copy, modify, and distribute this software for any diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/util/bcrypt/BCryptPasswordEncoder.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/util/bcrypt/BCryptPasswordEncoder.java similarity index 98% rename from litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/util/bcrypt/BCryptPasswordEncoder.java rename to litemall-core/src/main/java/org/linlinjava/litemall/core/util/bcrypt/BCryptPasswordEncoder.java index 0654845c..58a4b3f0 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/util/bcrypt/BCryptPasswordEncoder.java +++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/util/bcrypt/BCryptPasswordEncoder.java @@ -1,4 +1,4 @@ -package org.linlinjava.litemall.wx.util.bcrypt; +package org.linlinjava.litemall.core.util.bcrypt; /* * Copyright 2002-2011 the original author or authors. * diff --git a/litemall-db/pom.xml b/litemall-db/pom.xml index 168df62f..2b020652 100644 --- a/litemall-db/pom.xml +++ b/litemall-db/pom.xml @@ -10,7 +10,7 @@ org.springframework.boot spring-boot-starter-parent 1.5.10.RELEASE - + diff --git a/litemall-os-api/pom.xml b/litemall-os-api/pom.xml index 687ea67c..0a65381b 100644 --- a/litemall-os-api/pom.xml +++ b/litemall-os-api/pom.xml @@ -10,7 +10,7 @@ org.springframework.boot spring-boot-starter-parent 1.5.10.RELEASE - + @@ -19,12 +19,12 @@ true - - org.springframework.boot - spring-boot-starter + org.linlinjava + litemall-core + 0.1.0 @@ -33,11 +33,6 @@ 0.1.0 - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - 2.8.10 - org.springframework.boot @@ -45,12 +40,6 @@ test - - - org.springframework.boot - spring-boot-starter-web - - org.springframework.boot diff --git a/litemall-os-api/src/main/java/org/linlinjava/litemall/os/Application.java b/litemall-os-api/src/main/java/org/linlinjava/litemall/os/Application.java index 5fd1b836..fdb7fd00 100644 --- a/litemall-os-api/src/main/java/org/linlinjava/litemall/os/Application.java +++ b/litemall-os-api/src/main/java/org/linlinjava/litemall/os/Application.java @@ -4,7 +4,7 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -@SpringBootApplication(scanBasePackages={"org.linlinjava.litemall.os","org.linlinjava.litemall.db"}) +@SpringBootApplication(scanBasePackages={"org.linlinjava.litemall.core", "org.linlinjava.litemall.os","org.linlinjava.litemall.db"}) @MapperScan("org.linlinjava.litemall.db.dao") public class Application { diff --git a/litemall-os-api/src/main/java/org/linlinjava/litemall/os/config/GlobalExceptionHandler.java b/litemall-os-api/src/main/java/org/linlinjava/litemall/os/config/GlobalExceptionHandler.java deleted file mode 100644 index 4537516b..00000000 --- a/litemall-os-api/src/main/java/org/linlinjava/litemall/os/config/GlobalExceptionHandler.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.linlinjava.litemall.os.config; - -import org.linlinjava.litemall.db.util.ResponseUtil; -import org.springframework.web.bind.annotation.ControllerAdvice; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; - -@ControllerAdvice -public class GlobalExceptionHandler { - - @ExceptionHandler(MethodArgumentTypeMismatchException.class) - @ResponseBody - public Object argumentHandler(MethodArgumentTypeMismatchException e){ - e.printStackTrace(); - return ResponseUtil.badArgumentValue(); - } - - @ExceptionHandler(Exception.class) - @ResponseBody - public Object exceptionHandler(Exception e){ - e.printStackTrace(); - return ResponseUtil.serious(); - } - -} diff --git a/litemall-os-api/src/main/java/org/linlinjava/litemall/os/config/JacksonConfig.java b/litemall-os-api/src/main/java/org/linlinjava/litemall/os/config/JacksonConfig.java deleted file mode 100644 index cc530fe4..00000000 --- a/litemall-os-api/src/main/java/org/linlinjava/litemall/os/config/JacksonConfig.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.linlinjava.litemall.os.config; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; -import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.format.DateTimeFormatter; - -@Configuration -public class JacksonConfig { - @Bean - @Primary - public ObjectMapper objectMapper(Jackson2ObjectMapperBuilder builder) { - JavaTimeModule javaTimeModule = new JavaTimeModule(); - javaTimeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); - javaTimeModule.addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); - javaTimeModule.addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern("HH:mm:ss"))); - - ObjectMapper objectMapper = builder.createXmlMapper(false).build(); - objectMapper.registerModule(javaTimeModule); - objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false); - objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - return objectMapper; - } -} diff --git a/litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/IndexController.java b/litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/OsIndexController.java similarity index 71% rename from litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/IndexController.java rename to litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/OsIndexController.java index a85a80fa..1bd9992b 100644 --- a/litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/IndexController.java +++ b/litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/OsIndexController.java @@ -2,14 +2,14 @@ package org.linlinjava.litemall.os.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; @RestController @RequestMapping("/storage/index") -public class IndexController { - private final Log logger = LogFactory.getLog(IndexController.class); +public class OsIndexController { + private final Log logger = LogFactory.getLog(OsIndexController.class); @RequestMapping("/index") public Object index(){ diff --git a/litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/StorageController.java b/litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/StorageController.java index 45090da6..751f9668 100644 --- a/litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/StorageController.java +++ b/litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/StorageController.java @@ -1,9 +1,9 @@ package org.linlinjava.litemall.os.web; +import org.linlinjava.litemall.core.util.CharUtil; +import org.linlinjava.litemall.core.util.ResponseUtil; import org.linlinjava.litemall.db.domain.LitemallStorage; import org.linlinjava.litemall.db.service.LitemallStorageService; -import org.linlinjava.litemall.db.util.CharUtil; -import org.linlinjava.litemall.db.util.ResponseUtil; import org.linlinjava.litemall.os.service.StorageService; import org.linlinjava.litemall.os.config.ObjectStorageConfig; import org.springframework.beans.factory.annotation.Autowired; @@ -16,7 +16,6 @@ import org.springframework.web.multipart.MultipartFile; import java.io.IOException; import java.io.InputStream; -import java.time.LocalDate; import java.time.LocalDateTime; import java.util.HashMap; import java.util.List; diff --git a/litemall-wx-api/pom.xml b/litemall-wx-api/pom.xml index 79e9c9c9..f0d7b080 100644 --- a/litemall-wx-api/pom.xml +++ b/litemall-wx-api/pom.xml @@ -10,7 +10,7 @@ org.springframework.boot spring-boot-starter-parent 1.5.10.RELEASE - + @@ -19,21 +19,20 @@ true - + + org.linlinjava + litemall-core + 0.1.0 + + org.linlinjava litemall-db 0.1.0 - - - org.springframework.boot - spring-boot-starter-web - - com.github.binarywang weixin-java-pay @@ -46,12 +45,6 @@ 2.9.0 - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - 2.8.10 - - org.springframework.boot spring-boot-starter-test diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/Application.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/Application.java index 6efe9a91..9a536666 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/Application.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/Application.java @@ -5,7 +5,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.transaction.annotation.EnableTransactionManagement; -@SpringBootApplication(scanBasePackages={"org.linlinjava.litemall.wx","org.linlinjava.litemall.db"}) +@SpringBootApplication(scanBasePackages={"org.linlinjava.litemall.core", "org.linlinjava.litemall.wx","org.linlinjava.litemall.db"}) @MapperScan("org.linlinjava.litemall.db.dao") @EnableTransactionManagement public class Application { diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/config/GlobalExceptionHandler.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/config/GlobalExceptionHandler.java deleted file mode 100644 index 28c2d11d..00000000 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/config/GlobalExceptionHandler.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.linlinjava.litemall.wx.config; - -import org.linlinjava.litemall.db.util.ResponseUtil; -import org.springframework.web.bind.annotation.ControllerAdvice; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; - -@ControllerAdvice -public class GlobalExceptionHandler { - - @ExceptionHandler(MethodArgumentTypeMismatchException.class) - @ResponseBody - public Object argumentHandler(MethodArgumentTypeMismatchException e){ - e.printStackTrace(); - return ResponseUtil.badArgumentValue(); - } - - @ExceptionHandler(Exception.class) - @ResponseBody - public Object exceptionHandler(Exception e){ - e.printStackTrace(); - return ResponseUtil.serious(); - } - -} diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/UserTokenManager.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/UserTokenManager.java index 94b17338..db25888c 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/UserTokenManager.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/UserTokenManager.java @@ -1,6 +1,6 @@ package org.linlinjava.litemall.wx.service; -import org.linlinjava.litemall.db.util.CharUtil; +import org.linlinjava.litemall.core.util.CharUtil; import org.linlinjava.litemall.wx.dao.UserToken; import java.time.LocalDateTime; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java index 22da12ea..4a2214a7 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java @@ -5,7 +5,7 @@ import org.apache.commons.logging.LogFactory; import org.linlinjava.litemall.db.domain.LitemallAddress; import org.linlinjava.litemall.db.service.LitemallAddressService; import org.linlinjava.litemall.db.service.LitemallRegionService; -import org.linlinjava.litemall.db.util.ResponseUtil; +import org.linlinjava.litemall.core.util.ResponseUtil; import org.linlinjava.litemall.wx.annotation.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java index bfdb45f8..04744ff5 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java @@ -7,14 +7,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.linlinjava.litemall.db.domain.LitemallUser; import org.linlinjava.litemall.db.service.LitemallUserService; -import org.linlinjava.litemall.db.util.JacksonUtil; -import org.linlinjava.litemall.db.util.ResponseUtil; +import org.linlinjava.litemall.core.util.JacksonUtil; +import org.linlinjava.litemall.core.util.ResponseUtil; import org.linlinjava.litemall.wx.dao.FullUserInfo; import org.linlinjava.litemall.wx.dao.UserInfo; import org.linlinjava.litemall.wx.dao.UserToken; import org.linlinjava.litemall.wx.service.UserTokenManager; import org.linlinjava.litemall.wx.util.IpUtil; -import org.linlinjava.litemall.wx.util.bcrypt.BCryptPasswordEncoder; +import org.linlinjava.litemall.core.util.bcrypt.BCryptPasswordEncoder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; -import java.time.LocalDate; import java.time.LocalDateTime; import java.util.HashMap; import java.util.List; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxBrandController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxBrandController.java index 22e806a5..0f644665 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxBrandController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxBrandController.java @@ -4,7 +4,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.linlinjava.litemall.db.domain.LitemallBrand; import org.linlinjava.litemall.db.service.LitemallBrandService; -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; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCartController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCartController.java index f6a4badc..966cbd8f 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCartController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCartController.java @@ -5,8 +5,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.linlinjava.litemall.db.domain.*; import org.linlinjava.litemall.db.service.*; -import org.linlinjava.litemall.db.util.JacksonUtil; -import org.linlinjava.litemall.db.util.ResponseUtil; +import org.linlinjava.litemall.core.util.JacksonUtil; +import org.linlinjava.litemall.core.util.ResponseUtil; import org.linlinjava.litemall.wx.annotation.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCatalogController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCatalogController.java index b35ac9a6..b8e79d45 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCatalogController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCatalogController.java @@ -2,7 +2,7 @@ package org.linlinjava.litemall.wx.web; import org.linlinjava.litemall.db.domain.LitemallCategory; import org.linlinjava.litemall.db.service.LitemallCategoryService; -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; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCollectController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCollectController.java index 5b7a8dbe..0e04d0fc 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCollectController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCollectController.java @@ -5,13 +5,12 @@ import org.linlinjava.litemall.db.domain.LitemallCollect; import org.linlinjava.litemall.db.domain.LitemallGoods; import org.linlinjava.litemall.db.service.LitemallCollectService; import org.linlinjava.litemall.db.service.LitemallGoodsService; -import org.linlinjava.litemall.db.util.JacksonUtil; -import org.linlinjava.litemall.db.util.ResponseUtil; +import org.linlinjava.litemall.core.util.JacksonUtil; +import org.linlinjava.litemall.core.util.ResponseUtil; import org.linlinjava.litemall.wx.annotation.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.time.LocalDate; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCommentController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCommentController.java index 363c971f..5d7d1c66 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCommentController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCommentController.java @@ -5,14 +5,13 @@ import org.linlinjava.litemall.db.domain.LitemallComment; import org.linlinjava.litemall.db.service.LitemallCommentService; import org.linlinjava.litemall.db.service.LitemallCouponService; import org.linlinjava.litemall.db.service.LitemallUserService; -import org.linlinjava.litemall.db.util.ResponseUtil; +import org.linlinjava.litemall.core.util.ResponseUtil; import org.linlinjava.litemall.wx.annotation.LoginUser; import org.linlinjava.litemall.wx.service.UserInfoService; import org.linlinjava.litemall.wx.dao.UserInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.time.LocalDate; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxFootprintController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxFootprintController.java index a2b6042b..5f7561f2 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxFootprintController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxFootprintController.java @@ -4,8 +4,8 @@ import org.linlinjava.litemall.db.domain.LitemallFootprint; import org.linlinjava.litemall.db.domain.LitemallGoods; import org.linlinjava.litemall.db.service.LitemallFootprintService; import org.linlinjava.litemall.db.service.LitemallGoodsService; -import org.linlinjava.litemall.db.util.JacksonUtil; -import org.linlinjava.litemall.db.util.ResponseUtil; +import org.linlinjava.litemall.core.util.JacksonUtil; +import org.linlinjava.litemall.core.util.ResponseUtil; import org.linlinjava.litemall.wx.annotation.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java index fac11919..7ee7ec4f 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java @@ -5,8 +5,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.linlinjava.litemall.db.domain.*; import org.linlinjava.litemall.db.service.*; -import org.linlinjava.litemall.db.util.ResponseUtil; import org.linlinjava.litemall.db.util.SortUtil; +import org.linlinjava.litemall.core.util.ResponseUtil; import org.linlinjava.litemall.wx.annotation.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import java.time.LocalDate; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java index 56b95bb7..98a9432e 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java @@ -4,7 +4,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.linlinjava.litemall.db.domain.*; import org.linlinjava.litemall.db.service.*; -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; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxIndexController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxIndexController.java index d8330cae..7b62f20d 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxIndexController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxIndexController.java @@ -2,9 +2,7 @@ package org.linlinjava.litemall.wx.web; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.linlinjava.litemall.db.service.*; -import org.linlinjava.litemall.db.util.ResponseUtil; -import org.springframework.beans.factory.annotation.Autowired; +import org.linlinjava.litemall.core.util.ResponseUtil; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java index 79cf723a..f4ddc7fe 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java @@ -4,10 +4,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.linlinjava.litemall.db.domain.*; import org.linlinjava.litemall.db.service.*; -import org.linlinjava.litemall.db.util.JacksonUtil; import org.linlinjava.litemall.db.util.OrderHandleOption; import org.linlinjava.litemall.db.util.OrderUtil; -import org.linlinjava.litemall.db.util.ResponseUtil; +import org.linlinjava.litemall.core.util.JacksonUtil; +import org.linlinjava.litemall.core.util.ResponseUtil; import org.linlinjava.litemall.wx.annotation.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.PlatformTransactionManager; @@ -201,8 +201,11 @@ public class WxOrderController { for (LitemallOrderGoods orderGoods : orderGoodsList) { Map orderGoodsVo = new HashMap<>(); orderGoodsVo.put("id", orderGoods.getId()); + orderGoodsVo.put("orderId", orderGoods.getOrderId()); + orderGoodsVo.put("goodsId", orderGoods.getGoodsId()); orderGoodsVo.put("goodsName", orderGoods.getGoodsName()); orderGoodsVo.put("number", orderGoods.getNumber()); + orderGoodsVo.put("retailPrice", orderGoods.getRetailPrice()); orderGoodsVo.put("picUrl", orderGoods.getPicUrl()); orderGoodsVo.put("goodsSpecificationValues", orderGoods.getGoodsSpecificationValues()); orderGoodsVoList.add(orderGoodsVo); diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxPayController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxPayController.java index f655d03c..2e03ba38 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxPayController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxPayController.java @@ -7,7 +7,7 @@ import org.linlinjava.litemall.db.domain.LitemallUser; import org.linlinjava.litemall.db.service.LitemallOrderGoodsService; import org.linlinjava.litemall.db.service.LitemallOrderService; import org.linlinjava.litemall.db.service.LitemallUserService; -import org.linlinjava.litemall.db.util.ResponseUtil; +import org.linlinjava.litemall.core.util.ResponseUtil; import org.linlinjava.litemall.wx.annotation.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.xml.ws.Response; @RestController @RequestMapping("/wx/pay") diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxRegionController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxRegionController.java index 1c030b0c..7f5b027c 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxRegionController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxRegionController.java @@ -4,7 +4,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxSearchController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxSearchController.java index 47b212a6..211d5cf9 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxSearchController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxSearchController.java @@ -4,7 +4,7 @@ import org.linlinjava.litemall.db.domain.LitemallKeyword; import org.linlinjava.litemall.db.domain.LitemallSearchHistory; import org.linlinjava.litemall.db.service.LitemallKeywordService; import org.linlinjava.litemall.db.service.LitemallSearchHistoryService; -import org.linlinjava.litemall.db.util.ResponseUtil; +import org.linlinjava.litemall.core.util.ResponseUtil; import org.linlinjava.litemall.wx.annotation.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxTopicController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxTopicController.java index 00cd704a..832c4a9a 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxTopicController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxTopicController.java @@ -2,7 +2,7 @@ package org.linlinjava.litemall.wx.web; 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.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/pom.xml b/pom.xml index be45135c..22f78913 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,7 @@ pom + litemall-core litemall-db litemall-os-api litemall-wx-api