fs-admin/src/main/java/com/fs/his/controller/FsUserController.java

@@ -93,7 +93,7 @@ public class FsUserController extends BaseController
         if (fsUser.getPhoneMk()!=null&&fsUser.getPhoneMk()!=""){
             fsUser.setPhone(encryptPhone(fsUser.getPhoneMk()));
         }
-        if(StringUtils.isNotEmpty(fsUser.getPhone())){
+        if(StringUtils.isNotEmpty(fsUser.getPhone())&&fsUser.getPhone().length()>11){
             fsUser.setPhone(encryptPhone(fsUser.getPhone()));
         }
         List<FsUserVO> list = fsUserService.selectFsUserListVO(fsUser);

fs-service/src/main/java/com/fs/hisStore/enums/SysConfigEnum.java

@@ -85,7 +85,7 @@ public enum SysConfigEnum {
     //红包流量,joinTime.switch.config
     JOIN_TIME_SWITCH_CONFIG("joinTime.switch.config", "红包流量"),
     //签到配置,store.sign
-    SIGN_CONFIG("store.sign", "签到配置"),
+    SIGN_CONFIG("his.sign", "签到配置"),
     //商城支付配置,store.pay
     STORE_PAY_CONFIG("store.pay", "商城支付配置");
 

fs-service/src/main/java/com/fs/hisStore/service/impl/FsUserSignScrmServiceImpl.java

@@ -122,7 +122,7 @@ public class FsUserSignScrmServiceImpl implements IFsUserSignScrmService
     @Override
     @Transactional
     public Long sign(FsUserScrm user) {
-        String json=configService.selectConfigByKey("store.sign");
+        String json=configService.selectConfigByKey("his.sign");
         if(StringUtils.isEmpty(json)) {
             throw new CustomException("请先配置签到天数");
         }
@@ -194,7 +194,7 @@ public class FsUserSignScrmServiceImpl implements IFsUserSignScrmService
 
     @Override
     public Long getSign(FsUserScrm user) {
-        String json=configService.selectConfigByKey("store.sign");
+        String json=configService.selectConfigByKey("his.sign");
         if(StringUtils.isEmpty(json)) {
             throw new CustomException("请先配置签到天数");
         }

fs-service/src/main/resources/application-druid-bly.yml

@@ -30,7 +30,7 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://192.168.0.224:3306/bly_store?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://192.168.0.224:3306/bly_store2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
                     password: bly@2025
                 # 从库数据源

fs-user-app/src/main/java/com/fs/app/controller/store/IntegralScrmController.java

@@ -110,7 +110,7 @@ public class IntegralScrmController extends AppBaseController {
     public R getUserSign(HttpServletRequest request){
         FsUserScrm user=userService.selectFsUserByUserId(Long.parseLong(getUserId()));
         //获取签到配置
-        String json=configService.selectConfigByKey("store.sign");
+        String json=configService.selectConfigByKey("his.sign");
         //判断用户昨天是否签到过
         Long signNum=userSignService.getSign(user);
         Boolean isDaySign=userSignService.isDaySign(user);

fs-user-app/src/main/java/com/fs/app/controller/store/UserSignScrmController.java

@@ -46,7 +46,7 @@ public class UserSignScrmController extends AppBaseController {
     public R getUserSign(HttpServletRequest request){
         FsUserScrm user=userService.selectFsUserById(Long.parseLong(getUserId()));
         //获取签到配置
-        String json=configService.selectConfigByKey("store.sign");
+        String json=configService.selectConfigByKey("his.sign");
         //判断用户昨天是否签到过
         Long signNum=signService.getSign(user);
         Boolean isDaySign=signService.isDaySign(user);