Merge remote-tracking branch 'origin/dev-1223' into dev-1223

server/pom.xml

@@ -226,7 +226,7 @@
         <dependency>
             <groupId>com.pica.cloud.foundation</groupId>
             <artifactId>pica-cloud-proof-client</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.2</version>
             <exclusions>
                 <exclusion>
                     <groupId>io.swagger</groupId>

server/src/main/java/com/pica/cloud/account/account/server/controller/AutoCodeController.java

@@ -225,7 +225,7 @@ public class AutoCodeController extends AccountBaseController {
     public PicaResponse getJigsawCode(@RequestBody EncryptEntity entity,
                                       HttpServletRequest req) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
-        return PicaResponse.toResponse(authCodeService.getJigsawCode(req, super.getSourceType(), request.getMobile()));
+        return PicaResponse.toResponse(authCodeService.getJigsawCode(req, super.getSourceType(), request.getMobile(), request.getJigsawVersion()));
     }
 
     @ApiOperation("微信获取验证码")

server/src/main/java/com/pica/cloud/account/account/server/req/BaseRequest.java

@@ -54,6 +54,16 @@ public class BaseRequest {
     private Integer imageW;
     @ApiModelProperty("用户本地token")
     private String userTokenTourist;
+    @ApiModelProperty("拼图version")
+    private String jigsawVersion;
+
+    public String getJigsawVersion() {
+        return jigsawVersion;
+    }
+
+    public void setJigsawVersion(String jigsawVersion) {
+        this.jigsawVersion = jigsawVersion;
+    }
 
     public String getUserTokenTourist() {
         return userTokenTourist;

server/src/main/java/com/pica/cloud/account/account/server/service/AuthCodeService.java

@@ -22,7 +22,7 @@ public interface AuthCodeService {
 
     int validateJigsawCode(HttpServletRequest request, BaseRequest req);
 
-    JigsawCodeModel getJigsawCode(HttpServletRequest request, Integer sourceType, String mobile);
+    JigsawCodeModel getJigsawCode(HttpServletRequest request, Integer sourceType, String mobile, String jigsawVersion);
 
 
 }

server/src/main/java/com/pica/cloud/account/account/server/service/impl/AuthCodeServiceImpl.java

@@ -287,7 +287,7 @@ public class AuthCodeServiceImpl implements AuthCodeService {
      * @Return com.pica.cloud.account.account.server.model.JigsawCodeModel
      */
     @Override
-    public JigsawCodeModel getJigsawCode(HttpServletRequest request, Integer sourceType, String mobile) {
+    public JigsawCodeModel getJigsawCode(HttpServletRequest request, Integer sourceType, String mobile, String jigsawVersion) {
         if(!SourceTypeEnum.H5.getCode().equals(sourceType)) {
             logger.error("getJigsawCode-h5 sourceType error");
             throw new PicaWarnException(PicaResultCode.PARAM_IS_INVALID.code(), PicaResultCode.PARAM_IS_INVALID.message());
@@ -304,7 +304,12 @@ public class AuthCodeServiceImpl implements AuthCodeService {
         String key = Constants.JIGSAW_CODE_KEY.replace("{mobile}", mobile);
         if (needCheck > 0) {
             try {
-                picResp = sliderImageService.getPic();
+                if(null != jigsawVersion && jigsawVersion.equals("v1")){
+                    // 新版获取 拼图（指定公司背景图）
+                    picResp = sliderImageService.getPicV1();
+                }else {
+                    picResp = sliderImageService.getPic();
+                }
                 logger.info("getJigsawCode-getPic-code:{}", picResp.getCode());
             } catch (Exception e) {
                 logger.error("getJigsawCode-sliderImageService.getPic invoke exception", e.getMessage());

server/src/main/java/com/pica/cloud/account/account/server/service/impl/DoctorServiceImpl.java

@@ -95,24 +95,26 @@ public class DoctorServiceImpl implements DoctorService {
 
     @Override
     public int registerWelcome(DoctorReq doctorReq) {
-        logger.info("registerWelcome req:{}",JSONObject.toJSONString(doctorReq));
+        logger.info("registerWelcome req:{}", JSONObject.toJSONString(doctorReq));
         Doctor doctor = doctorMapper.selectByPrimaryKey(doctorReq.getId());
         if (null == doctor) {
             throw new PicaWarnException(AccountExceptionEnum.PICA_PARAMS_ERROR.getCode(),
                     AccountExceptionEnum.PICA_PARAMS_ERROR.getMessage());
         }
-        if(StringUtil.isNotNull(doctorReq.getDepartment())){
+        /*if(StringUtil.isNotNull(doctorReq.getDepartment())){
             doctor.setDepartment(doctorReq.getDepartment());
         }
         if(StringUtil.isNotNull(doctorReq.getTitle())){
             doctor.setTitle(doctorReq.getTitle());
-        }
-        if(StringUtil.isNotNull(doctorReq.getName())){
+        }*/
+        if (StringUtil.isNotNull(doctorReq.getName())) {
             doctor.setName(doctorReq.getName());
+            doctor.setModifyTime(new Date());
+            doctor.setModifyId(doctorReq.getId());
+            return doctorMapper.updateByPrimaryKeySelective(doctor);
         }
-        doctor.setModifyTime(new Date());
-        doctor.setModifyId(doctorReq.getId());
-        return doctorMapper.updateByPrimaryKeySelective(doctor);
+
+        return 0;
     }
 
     @Transactional