Merge branch 'master' of https://gitee.com/microapp/flash-waimai

README.md

@@ -70,7 +70,4 @@ mongorestore.exe -d flash-waimai d:\\elm
 - 该项目不适用与商城系统解决方案，如果有商城系统需求，可以查看另外一个商城的开源系统[https://gitee.com/microapp/linjiashop](https://gitee.com/microapp/linjiashop)(支持H5,微信小程序,APP)
 
 ## 交流
-- QQ群:936439613 微信:myenilu
-# License
-
-[GPL](https://github.com/microapp-store/flash-waimai/blob/master/COPYING)
+- QQ群:936439613 微信:myenilu 

flash-waimai-api/pom.xml

@@ -25,6 +25,11 @@
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.8</version>
+        </dependency>
     </dependencies>
 
     <build>

flash-waimai-api/src/main/java/cn/enilu/flash/api/controller/business/CaptchaController.java

@@ -11,12 +11,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-import sun.misc.BASE64Encoder;
+
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.Base64;
 import java.util.Map;
 import java.util.UUID;
 
@@ -41,8 +42,8 @@ public class CaptchaController extends BaseController {
         logger.info("captchCode:{}", map.get("strEnsure").toString().toLowerCase());
         try {
             ImageIO.write((BufferedImage) map.get("image"), "png", outputStream);
-            BASE64Encoder encoder = new BASE64Encoder();
-            String base64 = encoder.encode(outputStream.toByteArray());
+            Base64.Encoder encoder = Base64.getEncoder();
+            String base64 = String.valueOf(encoder.encode(outputStream.toByteArray()));
             String captchaBase64 = "data:image/png;base64," + base64.replaceAll("\r\n", "");
             return Rets.success(Maps.newHashMap("captchCodeId",captchCodeId,"code",captchaBase64));
         } catch (IOException e) {

flash-waimai-api/src/main/resources/application-dev.properties

@@ -1,6 +1,6 @@
 ## 开发环境配置
 debug=true
-spring.datasource.url=jdbc:mysql://localhost:3306/flash-waimai?useUnicode=true&characterEncoding=UTF8
+spring.datasource.url=jdbc:mysql://localhost:3306/waimai?useUnicode=true&characterEncoding=UTF-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=GMT%2B8
 spring.datasource.username=root
 spring.datasource.password=root
 # 开启该配置自动创建数据库

flash-waimai-api/src/main/resources/application.properties

@@ -21,7 +21,7 @@ spring.datasource.druid.stat-view-servlet.login-password= druidpassword
 spring.datasource.druid.stat-view-servlet.allow= 127.0.0.1
 ###监控配置 end###
 
-spring.datasource.driverClassName=com.mysql.jdbc.Driver
+spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 spring.cache.ehcache.config=classpath:ehcache.xml 
 
 ###################  spring配置  ###################

flash-waimai-core/pom.xml

@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

pom.xml

@@ -29,7 +29,7 @@
         <file_encoding>UTF-8</file_encoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <!--driver libs-->
-        <mysql.connector.java.version>5.1.45</mysql.connector.java.version>
+        <mysql.connector.java.version>8.0.11</mysql.connector.java.version>
         <!--auth libs-->
         <spring.security.jwt.version>1.0.9.RELEASE</spring.security.jwt.version>
         <spring.security.oauth2.version>2.2.0.RELEASE</spring.security.oauth2.version>
@@ -51,7 +51,7 @@
         <commons-lang3.version>3.6</commons-lang3.version>
         <kaptcha.version>2.3.2</kaptcha.version>
         <github.kaptcha.version>1.0.0</github.kaptcha.version>
-        <lombok.version>1.16.20</lombok.version>
+        <lombok.version>1.18.4</lombok.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -65,7 +65,7 @@
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
-                <scope>compile</scope>
+                <scope>provided</scope>
                 <version>${lombok.version}</version>
             </dependency>
 
@@ -307,8 +307,6 @@
                 <version>1.0.6</version>
             </dependency>
             <!-- message end-->
-
-
         </dependencies>
 
     </dependencyManagement>