Merge branch 'master' of https://git.dayouqiantu.cn/yshopb2c/yshop

yshop-app/src/main/java/co/yixiang/modules/auth/rest/AuthController.java

@@ -62,7 +62,7 @@ public class AuthController {
     private final RedisUtils redisUtil;
     private final AuthService authService;
 
-    @Value("${single.login:false}")
+    @Value("${single.login}")
     private Boolean singleLogin;
 
 

yshop-app/src/main/java/co/yixiang/modules/services/CreatShareProductService.java

@@ -682,10 +682,10 @@ public class CreatShareProductService {
             }
             g.drawImage(priductUrl.getScaledInstance(750,590,Image.SCALE_DEFAULT),0,0,null);
 
-            File newFileT = new File("Alibaba-PuHuiTi-Regular.otf");
+            File newFileT = new File("simsunb.ttf");
             if(!newFileT.exists()){
                 InputStream streamT =  getClass().getClassLoader()
-                        .getResourceAsStream("Alibaba-PuHuiTi-Regular.otf");
+                        .getResourceAsStream("simsunb.ttf");
                 FileUtils.copyInputStreamToFile(streamT, newFileT);
             }
             Font font =  Font.createFont(Font.TRUETYPE_FONT, newFileT);

yshop-app/src/main/resources/config/application-dev.yml

@@ -69,7 +69,9 @@ yshop:
     jwt-key: yshopmini
     token-expired-in: 86400000
 
-
+# 是否限制单用户登录
+single:
+  login: false
 
 
 #是否开启 swagger-ui

yshop-app/src/main/resources/config/application-prod.yml

@@ -62,7 +62,9 @@ spring:
     # spring cache 缓存类型为redis  也可以是其他的实现
     type: redis
 
-
+# 是否限制单用户登录
+single:
+  login: false
 
 yshop:
   security: