20191128 解决冲突

client/pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>com.pica.cloud.account</groupId>
     <artifactId>pica-cloud-account-client</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <name>pica-cloud-account-client</name>
     <packaging>jar</packaging>
 

client/src/main/java/com/pica/cloud/account/account/client/CaptchaClient.java

+package com.pica.cloud.account.account.client;
+
+import com.pica.cloud.foundation.entity.PicaResponse;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author andong
+ * @create 2019/7/19
+ */
+@FeignClient(name = "13201-pica-cloud-account")
+public interface CaptchaClient {
+
+    @GetMapping("/account/account/acknowledge")
+    PicaResponse<Boolean> acknowledge(@RequestParam("captchaToken") String captchaToken,
+                                   @RequestParam("captchaAnswer") String captchaAnswer);
+
+
+}

server/pom.xml

@@ -168,6 +168,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.xuxueli</groupId>
+            <artifactId>xxl-job-core</artifactId>
+            <version>2.1.0</version>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

server/src/main/java/com/pica/cloud/account/account/server/Test.java

 package com.pica.cloud.account.account.server;
 
 import com.alibaba.fastjson.JSONObject;
-import com.pica.cloud.account.account.server.entity.Doctor;
 import com.pica.cloud.account.account.server.entity.EncryptEntity;
 import com.pica.cloud.account.account.server.req.BaseRequest;
-import com.pica.cloud.account.account.server.req.PatientReq;
 import com.pica.cloud.account.account.server.util.AESUtil;
 import com.pica.cloud.account.account.server.util.RSAUtil;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 
 public class Test {
@@ -79,20 +76,36 @@ public class Test {
 //        String encryptEntity1Json = JSONObject.toJSONString(encryptEntity1);
 //        System.out.println(encryptEntity1Json);
 
-        System.out.println("--------------------登录接口-------------");
+//        System.out.println("--------------------登录接口-------------");
+//<<<<<<< HEAD
         String publicKey="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCa6j3SJwXr/pLLwb6Pq8pi9StPq+Wvm6vu+LWQB1hNqClWk0jQm5GnF6Kj0ac2gqgsMsutc3hhMaaX2QZvLX+gFQHC/ufGBdBbpPtDeGWsQItsMf/xqqlkLPkc7eVTyfsmrpQM7BG9LVvaPVXPVUcZfJNBaYuR4+Sf6Zi2ayI/hQIDAQAB";
-        BaseRequest login = new BaseRequest();
-        login.setMobile("13024112588");
-        login.setPassword("d0dcbf0d12a6b1e7fbfa2ce5848f3eff");
-        String con = JSONObject.toJSONString(login);
-
-        String contentResult = AESUtil.aesEncrypt(con, "YCPQPx4qpQjEjDea");
-
-        String keyResult = RSAUtil.encrypt("YCPQPx4qpQjEjDea",publicKey);
-        EncryptEntity encryptTest = new EncryptEntity();
-        encryptTest.setContent(contentResult);
-        encryptTest.setKey(keyResult);
-        System.out.println(JSONObject.toJSONString(encryptTest));
+//        BaseRequest login = new BaseRequest();
+//        login.setMobile("13024112588");
+//        login.setPassword("d0dcbf0d12a6b1e7fbfa2ce5848f3eff");
+//=======
+//
+//        BaseRequest login = new BaseRequest();
+//        login.setMobile("13024112588");
+//        login.setPassword("d0dcbf0d12a6b1e7fbfa2ce5848f3eff");  //qq123456
+//>>>>>>> dev-sensitive-20191112
+//        String con = JSONObject.toJSONString(login);
+//        //通过十六位随机数对参数明文进行加密 contentResult
+//        String contentResult = AESUtil.aesEncrypt(con, "YCPQPx4qpQjEjDea"); //十六位随机数
+//
+//<<<<<<< HEAD
+//        String contentResult = AESUtil.aesEncrypt(con, "YCPQPx4qpQjEjDea");
+//
+//        String keyResult = RSAUtil.encrypt("YCPQPx4qpQjEjDea",publicKey);
+//=======
+//        String publicKey="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCa6j3SJwXr/pLLwb6Pq8pi9StPq+Wvm6vu+LWQB1hNqClWk0jQm5GnF6Kj0ac2gqgsMsutc3hhMaaX2QZvLX+gFQHC/ufGBdBbpPtDeGWsQItsMf/xqqlkLPkc7eVTyfsmrpQM7BG9LVvaPVXPVUcZfJNBaYuR4+Sf6Zi2ayI/hQIDAQAB";
+//        //拿到RAS公钥，对上面的随机数进行加密
+//        String keyResult = RSAUtil.encrypt("YCPQPx4qpQjEjDea",publicKey);
+//
+//>>>>>>> dev-sensitive-20191112
+//        EncryptEntity encryptTest = new EncryptEntity();
+//        encryptTest.setContent(contentResult);
+//        encryptTest.setKey(keyResult);
+//        System.out.println(JSONObject.toJSONString(encryptTest));
 
         System.out.println("--------------------修改密码接口-------------");
         BaseRequest changePwd = new BaseRequest();
@@ -197,8 +210,6 @@ public class Test {
         changeMobileEntity.setKey(changeMobileKey);
         changeMobileEntity.setContent(changeMobileContent);
         System.out.println(JSONObject.toJSONString(changeMobileEntity));
-
-
     }
 
 

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

@@ -34,14 +34,14 @@ public class CaptchaController {
         return PicaResponse.toResponse(captchaToken);
     }
 
-    /*
+
     @ApiOperation("校验图形验证码")
     @GetMapping("/acknowledge")
-    public PicaResponse<Boolean> acknowledge(@ApiParam("token") @RequestParam("token") String token,
-                                             @ApiParam("answer") @RequestParam("answer") String answer) {
-        boolean valid = captchaService.acknowledge(token, answer);
+    public PicaResponse<Boolean> acknowledge(@ApiParam("captchaToken") @RequestParam("captchaToken") String captchaToken,
+                                             @ApiParam("captchaAnswer") @RequestParam("captchaAnswer") String captchaAnswer) {
+        boolean valid = captchaService.acknowledge(captchaToken, captchaAnswer);
         return PicaResponse.toResponse(valid);
     }
-    */
+
 
 }

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

 package com.pica.cloud.account.account.server.controller;
 
+import com.pica.cloud.account.account.server.util.AESUtil;
 import com.pica.cloud.account.account.server.util.RSAUtil;
 import com.pica.cloud.foundation.entity.PicaResponse;
 import io.swagger.annotations.Api;
@@ -7,6 +8,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -27,4 +30,17 @@ public class CipherController {
         return PicaResponse.toResponse(rsaPublicKey);
     }
 
+
+    /**
+     * todo:上线前需要注释掉
+     * @param key
+     * @return
+     * @throws Exception
+     */
+    @ApiOperation("解密操作")
+    @GetMapping(value = "/cipher/decrypt")
+    public PicaResponse<String> decryptPublicKey(@RequestParam String key) throws Exception {
+        return PicaResponse.toResponse(RSAUtil.decrypt(key, AESUtil.privateKey));
+    }
+
 }

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

@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.Map;
 
 @Api(description = "登录资源")
@@ -120,16 +121,18 @@ public class LoginController extends AccountBaseController {
     @PostMapping("/login/wechat/bind")
     public PicaResponse bindWeChat(@RequestBody EncryptEntity entity) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
-        request.setAccId(super.getAcctId());
-        loginService.bindWeChat(request);
-        return PicaResponse.toResponse();
+        long doctorId = super.getDoctorIdByToken();
+        String nickname = loginService.bindWeChat(doctorId, request);
+        Map<String, String> map = new HashMap();
+        map.put("nickname", nickname);
+        return PicaResponse.toResponse(map);
     }
 
     @ApiOperation("微信解除绑定接口")
     @PutMapping("/login/wechat/unbind")
     public PicaResponse unbindWeChat() {
-        Integer acctId = super.getAcctId();
-        loginService.unbindWeChat(acctId);
+        long doctorId = super.getDoctorIdByToken();
+        loginService.unbindWeChat(doctorId);
         return PicaResponse.toResponse();
     }
 

server/src/main/java/com/pica/cloud/account/account/server/entity/LoginResult.java

 package com.pica.cloud.account.account.server.entity;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.pica.cloud.account.account.server.util.AESUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -14,14 +15,16 @@ import io.swagger.annotations.ApiModelProperty;
 public class LoginResult {
     @ApiModelProperty("token")
     private String token;
-    @ApiModelProperty("用户id")
-    private Long userId;
+    @ApiModelProperty("用户id,已经加密处理")
+    private String userId;
     @ApiModelProperty("是否绑定")
     private String bindFlag;
     @ApiModelProperty("联合登录id")
     private String unionId;
     @ApiModelProperty("是否完善过信息，1.信息未补全， 2信息已补全，3已补全密码")
     private int entireFlag;
+    @ApiModelProperty("未加密手机号")
+    private String mobile;
 
     public String getToken() {
         return token;
@@ -31,12 +34,12 @@ public class LoginResult {
         this.token = token;
     }
 
-    public Long getUserId() {
+    public String getUserId() {
         return userId;
     }
 
-    public void setUserId(Long userId) {
-        this.userId = userId;
+    public void setUserId(String userId) {
+        this.userId = AESUtil.encryptV0(userId);
     }
 
     public String getBindFlag() {
@@ -62,4 +65,12 @@ public class LoginResult {
     public void setEntireFlag(int entireFlag) {
         this.entireFlag = entireFlag;
     }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
 }

server/src/main/java/com/pica/cloud/account/account/server/enums/AccountExceptionEnum.java

@@ -25,7 +25,8 @@ public enum AccountExceptionEnum {
     PICA_PARAMS_ERROR("216517", "传递参数有误"),
     PICA_SYSCODE_RETRY("216518", "请X秒后重试"),
     PICA_NOT_EXIST("216519", "该用户不存在"),
-    PICA_REGISTER_FAIL("216520", "注册失败");
+    PICA_REGISTER_FAIL("216520", "注册失败"),
+    PICA_WECHAT_CODE_ERROR("216521", "微信登录授权code不正确");
 
 
     private String code;

server/src/main/java/com/pica/cloud/account/account/server/job/AccountRepeatDataJob.java

@@ -25,5 +25,6 @@ public class AccountRepeatDataJob extends IJobHandler {
         accountInfoDetailMapper.processAccountRepeatData();
         XxlJobLogger.log("AccountRepeatDataJob");
         return SUCCESS;
+
     }
 }

server/src/main/java/com/pica/cloud/account/account/server/mapper/DoctorMapper.java

@@ -92,4 +92,6 @@ public interface DoctorMapper {
      * @return
      */
     //Long selectDoctorIdByMobile(String mobile);
+
+    Integer getAcctIdByDoctorId(long id);
 }
\ No newline at end of file

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

@@ -39,9 +39,9 @@ public interface LoginService {
     /**
      * 解除绑定
      *
-     * @param acctId 账户id
+     * @param doctorId 账户id
      */
-    void unbindWeChat(Integer acctId);
+    void unbindWeChat(long doctorId);
 
 
     /**
@@ -49,7 +49,7 @@ public interface LoginService {
      *
      * @param request 参数模型
      */
-    void bindWeChat(BaseRequest request);
+    String bindWeChat(long doctorId, BaseRequest request);
 
     PICAPDoctor queryDoctor(long doctorId);
 }

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

@@ -122,7 +122,8 @@ public class LoginServiceImpl implements LoginService {
                 String newToken = tokenUtils.generateToken(account);
                 LoginResult result = new LoginResult();
                 result.setToken(newToken);
-                result.setUserId(userId.longValue());
+                result.setUserId(userId+"");
+                result.setMobile(mobile);
                 if (productType == AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode()) {
                     result.setEntireFlag(doctorInfo.getEntireFlag());
                 }
@@ -170,7 +171,8 @@ public class LoginServiceImpl implements LoginService {
         String newToken = tokenUtils.generateToken(account);
         LoginResult result = new LoginResult();
         result.setToken(newToken);
-        result.setUserId(userId);
+        result.setUserId(userId+"");
+        result.setMobile(baseRequest.getMobile());
         //是否完善过个人信息（云鹊医app才需要）
         if (baseRequest.getProductType() == AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode()) {
             Doctor doctorEntity = doctorInfoMapper.selectByPrimaryKey(userId.intValue());
@@ -179,7 +181,6 @@ public class LoginServiceImpl implements LoginService {
         //记录登录日志
         LogLoginEntity entity = AccountLogEntityUtils.getLogLoginEntity(acctId, baseRequest.getProductType(), baseRequest.getSourceType(),
                 loginType, baseRequest.getLoginIp(), AccountTypeEnum.LOGIN_STATUS_SUCCESS.getCode(), AccountTypeEnum.LOG_TYPE_LOGIN.getCode());
-        ;
         picaLogUtils.info(entity);
         return result;
     }
@@ -187,6 +188,9 @@ public class LoginServiceImpl implements LoginService {
     @Override
     public LoginResult loginByWeChat(BaseRequest request) {
         WeChatEntity weChatEntity = WeChatUtils.getAuthorizationInfo(appId, appSecret, request.getWeChatCode());
+        if (weChatEntity == null || StringUtils.isEmpty(weChatEntity.getOpenid()) || StringUtils.isEmpty(weChatEntity.getAccess_token())) {
+            throw new PicaException(AccountExceptionEnum.PICA_WECHAT_CODE_ERROR.getCode(), AccountExceptionEnum.PICA_WECHAT_CODE_ERROR.getMessage());
+        }
         //todo：微信登录获取个人信息
         Map map = new HashMap();
         map.put("access_token", weChatEntity.getAccess_token());
@@ -209,8 +213,13 @@ public class LoginServiceImpl implements LoginService {
             String newToken = tokenUtils.generateToken(account);
             LoginResult result = new LoginResult();
             result.setToken(newToken);
-            result.setUserId(userId);
+            result.setUserId(userId+"");
             result.setBindFlag(AccountTypeEnum.BIND_STATUS_SUCCESS.getCode()+"");
+            if (request.getProductType() == AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode()) {
+                PICAPDoctor doctor = doctorInfoMapper.queryDoctor(userId);
+                result.setEntireFlag(doctor.getEntire_flag());
+                result.setMobile(AESUtil.decryptV0(doctor.getMobile_phone()));
+            }
             return result;
         } else {
             AccountWeChatInfoEntity entity = accountWeChatInfoMapper.selectByUnionId(unionId);
@@ -233,10 +242,9 @@ public class LoginServiceImpl implements LoginService {
             result = registerService.register(request);
             if (doubleWritingMode) {
                 //双写模式下,要在doctor表存储unionId
-
                 if (result.getUserId()!=null) {
                     Doctor doctor = new Doctor();
-                    doctor.setId(result.getUserId().intValue());
+                    doctor.setId(Integer.parseInt(result.getUserId()));
                     doctor.setUnionid(request.getUnionId());
                     doctorInfoMapper.updateByPrimaryKeySelective(doctor);
                 }
@@ -244,6 +252,7 @@ public class LoginServiceImpl implements LoginService {
         } else {
             result = processLogin(request, accountInfoEntity.getId(), AccountTypeEnum.LOGIN_WE_CHAT.getCode());
         }
+        result.setMobile(request.getMobile());
         AccountInfoEntity accountInfo = accountInfoDetailMapper.selectByMobile(AESUtil.encryptV0(request.getMobile()));
         Integer acctId = accountInfo.getId();
         processAccountUnion(acctId, request.getUnionId());
@@ -252,7 +261,8 @@ public class LoginServiceImpl implements LoginService {
 
     @Override
     @Transactional
-    public void unbindWeChat(Integer acctId) {
+    public void unbindWeChat(long doctorId) {
+        Integer acctId = doctorInfoMapper.getAcctIdByDoctorId(doctorId);
         accountUnionMapper.updateUnbindByAcctId(acctId);
         if (doubleWritingMode) {
             doctorService.unbindWeChat(acctId);
@@ -261,7 +271,7 @@ public class LoginServiceImpl implements LoginService {
 
     @Override
     @Transactional
-    public void bindWeChat(BaseRequest request) {
+    public String bindWeChat(long doctorId, BaseRequest request) {
         WeChatEntity weChatEntity = WeChatUtils.getAuthorizationInfo(appId, appSecret, request.getWeChatCode());
         Map map = new HashMap();
         map.put("access_token", weChatEntity.getAccess_token());
@@ -272,8 +282,12 @@ public class LoginServiceImpl implements LoginService {
         AccountWeChatInfoEntity entity = accountWeChatInfoMapper.selectByUnionId(unionId);
         if (entity == null) {
             processWeChatInfoUser(weChatUserInfoEntity, request.getWeChatLoginType());
+        } else {
+            updateWechatInfoUser(entity, weChatUserInfoEntity);
         }
-        processAccountUnion(request.getAccId(), unionId);
+        Integer acctId = doctorInfoMapper.getAcctIdByDoctorId(doctorId);
+        processAccountUnion(acctId, unionId);
+        return weChatUserInfoEntity.getNickname();
     }
 
     /**
@@ -325,6 +339,16 @@ public class LoginServiceImpl implements LoginService {
         accountWeChatInfoMapper.insertSelective(accountWeChatInfoEntity);
     }
 
+    private void updateWechatInfoUser(AccountWeChatInfoEntity entity, WeChatUserInfoEntity weChatUserInfoEntity) {
+        String nickname = weChatUserInfoEntity.getNickname();
+        if (StringUtils.isNotEmpty(nickname) && !nickname.equals(entity.getNickname())) {
+            AccountWeChatInfoEntity info = new AccountWeChatInfoEntity();
+            info.setId(entity.getId());
+            info.setNickname(nickname);
+            accountWeChatInfoMapper.updateByPrimaryKeySelective(info);
+        }
+    }
+
     public PICAPDoctor queryDoctor(long doctorId) {
         PICAPDoctor doctor = doctorInfoMapper.queryDoctor(doctorId);
         if (doctor == null) {

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

@@ -147,8 +147,9 @@ public class RegisterServiceImpl implements RegisterService {
                     String newToken = tokenUtils.generateToken(account);
                     LoginResult result = new LoginResult();
                     result.setToken(newToken);
-                    result.setUserId(userId);
+                    result.setUserId(userId+"");
                     result.setEntireFlag(1);
+                    result.setMobile(mobile);
                   /*  ByteArrayOutputStream bos = new ByteArrayOutputStream();
                     DataOutputStream dos = new DataOutputStream(bos);
                     try {

server/src/main/java/com/pica/cloud/account/account/server/starter/JobExecutorConfiguration.java

+package com.pica.cloud.account.account.server.starter;
+
+import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Created on 2019/11/6 15:39
+ * author:crs
+ * Description:配置式job
+ */
+@Configuration
+public class JobExecutorConfiguration {
+
+    private Logger logger = LoggerFactory.getLogger(JobExecutorConfiguration.class);
+
+    @Value("${xxl.job.admin.addresses}")
+    private String adminAddresses;
+
+    @Value("${xxl.job.executor.appname}")
+    private String appName;
+
+    @Value("${xxl.job.executor.ip}")
+    private String ip;
+
+    @Value("${xxl.job.executor.port}")
+    private int port;
+
+    @Value("${xxl.job.accessToken}")
+    private String accessToken;
+
+    @Value("${xxl.job.executor.logpath}")
+    private String logPath;
+
+    @Value("${xxl.job.executor.logretentiondays}")
+    private int logRetentionDays;
+
+    @Bean(initMethod = "start", destroyMethod = "destroy")
+    public XxlJobSpringExecutor xxlJobExecutor() {
+        logger.info("pica-job config init.");
+        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+        xxlJobSpringExecutor.setAppName(appName);
+        xxlJobSpringExecutor.setIp(ip);
+        xxlJobSpringExecutor.setPort(port);
+        xxlJobSpringExecutor.setAccessToken(accessToken);
+        xxlJobSpringExecutor.setLogPath(logPath);
+        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
+
+        return xxlJobSpringExecutor;
+    }
+
+
+}
+

server/src/main/java/com/pica/cloud/account/account/server/util/AESUtil.java

@@ -168,7 +168,11 @@ public class AESUtil {
     public static void main(String[] args) throws Exception {
         String KEY="zJJ$c5md3$yuuhWW";
         System.out.println("-------------加密---------");
+<<<<<<< HEAD
         String content = "13671795786";
+=======
+        String content = "13916000001";
+>>>>>>> dev-sensitive-20191112
         System.out.println("加密前：" + content);
         System.out.println("加密密钥和解密密钥：" + KEY);
 
@@ -179,32 +183,11 @@ public class AESUtil {
         System.out.println("解密后：" + decrypt);
 
           //请求参数解密处理
-//        String encrypt="DC7Sc7ydClKJztuIz/E/5fXuQ8hqdr4W8mxL/XACtqT2wzK3jBiRXnoPOvR9lANIinXInrdbY5rCIwTiI9DeWFiwPP7cSF0cjnQOY11oJLjVg9qV9VZQXbFyDYVhRv8bbto5hD4evryzbdPTq6A23fD5LmXFYnWKdbSzZfFUl/w=";
-//        String decrypt = RSAUtil.decrypt(encrypt,privateKey);
+//        String key="Vi/4mtanXFW8huqyNi5/XMRWzTkMVFkHCDE53g49ye4AqUsaiKbINdmkFD+g+RyKeS2tEb+6ELukic3GCtZd0wT4iNzK9YVZoMDFQ9JaZwMn0HXSefnSGociozj5hRXHaim3oOuufRKmtJw372rVg4DEVuGLaIpBzdB5wNlaTbY=";
+//        String decrypt = RSAUtil.decrypt(key,privateKey);
 //        System.out.println(decrypt);
-//        //System.out.println("YCPQPx4qpQjEjDea");
-//        String content="z9zZyUYwKkYy08l0s1qH9CSnoNnXZbbhHVbAUwGIsOXKPGeTkZFnbL1HYJQXBdKqGzKZt8E5lDzdTGUiUVkkK8GO27fsSrRMewY5T6ndSuo=";
+//        String content="lz8KLqk3rWsNLgMxCpuWOb0fQm3s4z6Oej67dYGu5cY=";
 //        String result = AESUtil.aesDecrypt(content, decrypt);
 //        System.out.println(result);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     }
-
-
-
-
 }

server/src/main/resources/bootstrap-dev.properties

@@ -69,6 +69,7 @@ xxl.job.executor.logpath=/opt/xxl-job-logs/jobhandler
 ### xxl-job log retention days
 xxl.job.executor.logretentiondays=-1
 
+
 pica.cloud.message.url=https://dev-sc.yunqueyi.com/message
 
 

server/src/main/resources/bootstrap-prod.properties

@@ -66,4 +66,5 @@ xxl.job.executor.logpath=/opt/xxl-job-logs/jobhandler
 xxl.job.executor.logretentiondays=-1
 
 
+
 pica.cloud.message.url=https://sc.yunqueyi.com/message

server/src/main/resources/bootstrap-test1.properties

@@ -51,10 +51,17 @@ spring.rabbitmq.username=appuser
 spring.rabbitmq.password=AqLfvyWOvLQEUzdI
 spring.rabbitmq.virtual-host=account-register-vhost
 
+<<<<<<< HEAD
 
 # Job config begin
 # 控制器地址：服务启动自动注册到控制器中
 xxl.job.admin.addresses=http://192.168.110.133:7899/job
+=======
+# Job config begin
+# 控制器地址：服务启动自动注册到控制器中
+xxl.job.admin.addresses=http://192.168.110.133:7899/job
+
+>>>>>>> dev-sensitive-20191112
 #执行器命名规则job-exec-<申请Port>
 xxl.job.executor.appname=job-exec-7906
 xxl.job.executor.ip=
@@ -68,4 +75,6 @@ xxl.job.executor.logpath=/opt/xxl-job-logs/jobhandler
 ### xxl-job log retention days
 xxl.job.executor.logretentiondays=-1
 
+
 pica.cloud.message.url=https://test1-sc.yunqueyi.com/message
+

server/src/main/resources/bootstrap-test2.properties

@@ -50,3 +50,20 @@ spring.rabbitmq.port=5672
 spring.rabbitmq.username=appuser
 spring.rabbitmq.password=AqLfvyWOvLQEUzdI
 spring.rabbitmq.virtual-host=account-register-vhost
+
+# Job config begin
+# 控制器地址：服务启动自动注册到控制器中
+xxl.job.admin.addresses=http://192.168.110.124:7899/job
+
+#执行器命名规则job-exec-<申请Port>
+xxl.job.executor.appname=job-exec-7906
+xxl.job.executor.ip=
+xxl.job.executor.port=7906
+
+### xxl-job, access token
+xxl.job.accessToken=
+
+### 确保改目录可写/opt/xxl-job-logs/jobhandler
+xxl.job.executor.logpath=/opt/xxl-job-logs/jobhandler
+### xxl-job log retention days
+xxl.job.executor.logretentiondays=-1

server/src/main/resources/bootstrap-uat.properties

@@ -54,6 +54,7 @@ spring.rabbitmq.virtual-host=account-register-vhost
 # Job config begin
 # 控制器地址：服务启动自动注册到控制器中
 xxl.job.admin.addresses=http://192.168.110.141:7899/job
+
 #执行器命名规则job-exec-<申请Port>
 xxl.job.executor.appname=job-exec-7906
 xxl.job.executor.ip=
@@ -67,4 +68,6 @@ xxl.job.executor.logpath=/opt/xxl-job-logs/jobhandler
 ### xxl-job log retention days
 xxl.job.executor.logretentiondays=-1
 
+
 pica.cloud.message.url=https://uat-sc.yunqueyi.com/message
+

server/src/main/resources/bootstrap.properties

-spring.profiles.active=uat
\ No newline at end of file
+spring.profiles.active=dev
\ No newline at end of file

server/src/main/resources/mybatis/AccountInfoEntityMapper.xml

@@ -50,6 +50,12 @@
       update account_info set created_id=#{acctId}, modified_id=#{acctId} where id=#{acctId}
   </update>
 
+    <update id="processAccountRepeatData">
+        update account_info set delete_flag=2, modified_id=101432928, modified_time=now() where id in (select id from (select pd.id from account_info pd
+        inner JOIN (SELECT mobile_phone,MIN(id) as id FROM account_info WHERE delete_flag=1 and mobile_phone is not null GROUP BY mobile_phone having count(*)>1) inn
+        on pd.id != inn.id and pd.mobile_phone = inn.mobile_phone) ttt);
+    </update>
+
     <!--逻辑删除用户-->
     <update id="updateDeleteByPrimaryKey" parameterType="java.lang.Integer">
       update account_info set delete_flag=2,modified_time=now(), modified_id=#{acctId} where id=#{acctId}

server/src/main/resources/mybatis/AccountUnionEntityMapper.xml

@@ -29,7 +29,8 @@
         select
         <include refid="Base_Column_List"/>
         from account_union
-        where union_id = #{unionId}
+        where union_id = #{unionId} and delete_flag = 1
+        limit 1
     </select>
 
     <!--解除绑定关系-->

server/src/main/resources/mybatis/AccountWeChatInfoEntityMapper.xml

@@ -40,11 +40,12 @@
   </select>
 
   <!--通过UnionId获取微信信息-->
-  <select id="selectByUnionId" resultMap="BaseResultMap" parameterType="java.lang.Integer">
+  <select id="selectByUnionId" resultMap="BaseResultMap" parameterType="java.lang.String">
     select
     <include refid="Base_Column_List"/>
     from account_wechat_info
-    where unionid = #{id}
+    where unionid = #{id} and delete_flag = 1
+    limit 1
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >

server/src/main/resources/mybatis/DoctorMapper.xml

@@ -87,6 +87,8 @@
     update p_doctor set delete_flag=2, modify_id=101432928, modify_time=now() where id in (select id from (select pd.id from p_doctor pd
     inner JOIN (SELECT mobile_phone,MIN(id) as id FROM p_doctor WHERE delete_flag=1 and mobile_phone is not null GROUP BY mobile_phone having count(*)>1) inn
     on pd.id != inn.id and pd.mobile_phone = inn.mobile_phone) ttt);
+
+
     </update>
 
 
@@ -1026,4 +1028,8 @@
         FROM p_doctor aa
         where aa.id = #{doctorId} and aa.delete_flag = 1
     </select>
+
+    <select id="getAcctIdByDoctorId" resultType="java.lang.Integer" parameterType="java.lang.Long">
+      select acct_id from p_doctor where id = #{id}
+    </select>
 </mapper>
\ No newline at end of file