Skip to content

P
pica-cloud-account
提交 1746fbec 编写于 作者: rushui.chen's avatar rushui.chen
浏览文件
操作

Merge remote-tracking branch 'origin/release' into release

上级 ded241f4 f7935d22
隐藏空白字符变更
内嵌 并排
正在显示 包含 181 行增加 和 98 行删除
server/pom.xml
浏览文件 @ 1746fbec
......@@ -57,19 +57,15 @@
<dependency>
<groupId>com.pica.cloud.foundation</groupId>
<artifactId>pica-cloud-service-starter</artifactId>
<version>1.2.5-SNAPSHOT</version>
<version>1.2.6-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.pica.cloud.foundation</groupId>
<artifactId>pica-cloud-redis</artifactId>
<groupId>com.pica.cloud.foundation</groupId>
</exclusion>
<exclusion>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
<artifactId>pica-cloud-entity</artifactId>
<groupId>com.pica.cloud.foundation</groupId>
</exclusion>
</exclusions>
</dependency>
......@@ -94,25 +90,7 @@
<dependency>
<groupId>com.pica.cloud.foundation</groupId>
<artifactId>pica-cloud-utils</artifactId>
<version>2.0.1-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</exclusion>
<exclusion>
<groupId>com.dianping.cat</groupId>
<artifactId>cat-client</artifactId>
</exclusion>
<exclusion>
<groupId>com.pica.cloud.foundation</groupId>
<artifactId>pica-cloud-entity</artifactId>
</exclusion>
</exclusions>
<version>1.3.2-OLD</version>
</dependency>
<dependency>
......
server/src/main/java/com/pica/cloud/account/account/server/controller/AccountController.java
浏览文件 @ 1746fbec
......@@ -52,9 +52,8 @@ public class AccountController extends AccountBaseController {
private AccountService accountService;
@Autowired
private CaptchaService captchaService;
@Autowired
@Qualifier("cacheMigrateClient")
private ICacheClient redisClient;
@GetMapping("/test")
......
server/src/main/java/com/pica/cloud/account/account/server/controller/AutoCodeController.java
浏览文件 @ 1746fbec
......@@ -54,7 +54,6 @@ public class AutoCodeController extends AccountBaseController {
private AccountService accountService;
@Autowired
@Qualifier("cacheMigrateClient")
private ICacheClient cacheClient;
......
server/src/main/java/com/pica/cloud/account/account/server/controller/LoginController.java
浏览文件 @ 1746fbec
......@@ -33,7 +33,6 @@ public class LoginController extends AccountBaseController {
private LoginService loginService;
@Autowired
@Qualifier("cacheMigrateClient")
private ICacheClient redisClient;
@Autowired
......
server/src/main/java/com/pica/cloud/account/account/server/controller/RedisTestController.java 0 → 100644
浏览文件 @ 1746fbec
//package com.pica.cloud.account.account.server.controller;
//
//import com.alibaba.fastjson.JSON;
//import com.pica.cloud.foundation.entity.PicaResponse;
//import com.pica.cloud.foundation.entity.PicaUser;
//import com.pica.cloud.foundation.redis.ICacheClient;
//
//import com.pica.cloud.foundation.service.starter.common.BaseController;
//import com.pica.cloud.foundation.service.starter.interceptor.LoginPermission;
//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 redis.clients.jedis.Jedis;
//import redis.clients.jedis.JedisSentinelPool;
//
//import java.util.*;
//
//@RestController
//public class RedisTestController extends BaseController {
// @Autowired
// private ICacheClient redisClient;
//
// @RequestMapping(value = "/redis", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
// @LoginPermission
// public PicaResponse<Map<String, String>> redis() {
// // http://localhost:11501/hospital/hospitals/redis
// // cluster
// String token = getTokenFromHeader();
// Map<String, String> map = new HashMap<>();
// map.put("id", "1111111");
// map.put("token", token);
// map.put("sysCode", getSysCodeFromHeader());
//
// try {
// token = redisClient.saveToken(map, 3600);
// } catch (Exception ex) {
// // nothing to do
// }
// System.out.println(token);
// Map<String, String> map1 = redisClient.getToken(token);
// System.out.println(JSON.toJSON(map1));
// PicaUser user = fetchPicaUser();
// System.out.println(JSON.toJSON(user));
//
// // sentinel
// Set<String> set1 = new HashSet<>();
// set1.add("192.168.140.27:17000");
// set1.add("192.168.140.28:17000");
// set1.add("192.168.140.29:17000");
// JedisSentinelPool pool1 = new JedisSentinelPool("master01", set1, "Uu49Kz1olY85HQBu");
// Jedis jedis1 = pool1.getResource();
// System.out.println("sentinel dev - " + jedis1.get("token-" + token));
//
// Set<String> set2 = new HashSet<>();
// set2.add("192.168.110.68:17000");
// set2.add("192.168.110.69:17001");
// set2.add("192.168.110.70:17002");
// JedisSentinelPool pool2 = new JedisSentinelPool("master01", set2, "Uu49Kz1olY85HQBu");
// Jedis jedis2 = pool2.getResource();
// System.out.println("sentinel test - " + jedis2.get("token-" + token));
//
// Set<String> set3 = new HashSet<>();
// set3.add("192.168.110.177:17000");
// set3.add("192.168.110.178:17000");
// set3.add("192.168.110.179:17000");
// JedisSentinelPool pool3 = new JedisSentinelPool("master01", set3, "Uu49Kz1olY85HQBu");
// Jedis jedis3 = pool3.getResource();
// System.out.println("sentinel uat - " + jedis3.get("token-" + token));
//
// redisClient.deleteToken(token);
//
// try {
// PicaUser user1 = fetchPicaUser();
// } catch (Exception ex) {
// System.out.println("Exception -> the user has been deleted");
// }
//
// Map<String, String> map2 = new HashMap<>();
// map2.put("id", "1111111");
// map2.put("token", token);
// map2.put("sysCode", getSysCodeFromHeader());
// try {
// token = redisClient.saveToken(map2, 3600);
// } catch (Exception ex) {
// // nothing to do
// }
//
// String clusterKey = "cluster-key-001";
// String clusterValue = "cluster-value-001";
//
// redisClient.set(clusterKey, clusterValue);
// System.out.println("cluster -> " + redisClient.get(clusterKey));
// System.out.println("dev get cluster value -> " + pool1.getResource().get(clusterKey));
// System.out.println("test1 get cluster value -> " + pool2.getResource().get(clusterKey));
// System.out.println("uat get cluster value -> " + pool3.getResource().get(clusterKey));
//
// String sentKey = "sent-key-001";
// String sentValue = "sent-value-001";
// pool1.getResource().set(sentKey, sentValue);
// System.out.println("dev sentinel -> " + pool1.getResource().get(sentKey));
//
// pool2.getResource().set(sentKey, sentValue);
// System.out.println("test1 sentinel -> " + pool2.getResource().get(sentKey));
//
// pool3.getResource().set(sentKey, sentValue);
// System.out.println("uat sentinel -> " + pool3.getResource().get(sentKey));
//
// return PicaResponse.toResponse(token);
// }
//}
server/src/main/java/com/pica/cloud/account/account/server/controller/RegisterController.java
浏览文件 @ 1746fbec
......@@ -24,9 +24,6 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/register")
public class RegisterController extends AccountBaseController {
@Autowired
private RegisterService registerService;
......@@ -34,7 +31,6 @@ public class RegisterController extends AccountBaseController {
private AccountUtils accountUtils;
@Autowired
@Qualifier("cacheMigrateClient")
private ICacheClient redisClient;
@ApiOperation("PC端，移动端注册接口")
......
server/src/main/java/com/pica/cloud/account/account/server/job/DoctorRepeatDataJob.java
浏览文件 @ 1746fbec
package com.pica.cloud.account.account.server.job;
import com.pica.cloud.account.account.server.mapper.DoctorMapper;
import com.pica.cloud.foundation.redis.ICacheClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
/**
* Created on 2019/10/29 15:37
* author:crs
* Description:doctor表重复记录处理
*/
@Component
public class DoctorRepeatDataJob {
private final String KEY = "cacheProcessDoctorRepeat";
private Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired
@Qualifier("cacheMigrateClient")
private ICacheClient cacheClient;
@Autowired
private DoctorMapper doctorMapper;
/**
* 1、使用分布式锁保证一个微服务执行；
* 2、定时任务；
*/
@Scheduled(cron = "0 0 0/1 * * ?")
public void processDoctorRepeatData() {
//通过接口幂等性逻辑处理
String exist = cacheClient.get(KEY);
if (exist==null){
cacheClient.set(KEY,"1");
cacheClient.expire(KEY, 60 * 10);
logger.info("DoctorRepeatDataJob:开始执行刷新doctor表中重复的记录");
int row = doctorMapper.processDoctorRepeatData();
logger.info("此次数据刷新影响的行数：{}", row);
try {
//防止任务一秒跑完，其他机器的时间晚了几秒
Thread.sleep(30*1000);
} catch (InterruptedException ex) {
logger.error(ex.getMessage(), ex);
}
//释放锁
cacheClient.del(KEY);
}
}
}
//package com.pica.cloud.account.account.server.job;
//
//import com.pica.cloud.account.account.server.mapper.DoctorMapper;
//import com.pica.cloud.foundation.redis.ICacheClient;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.beans.factory.annotation.Qualifier;
//
//import org.springframework.scheduling.annotation.Scheduled;
//import org.springframework.stereotype.Component;
//
///**
// * Created on 2019/10/29 15:37
// * author:crs
// * Description:doctor表重复记录处理
// */
//@Component
//public class DoctorRepeatDataJob {
// private final String KEY = "cacheProcessDoctorRepeat";
//
// private Logger logger = LoggerFactory.getLogger(this.getClass());
//
// @Autowired
//
// private ICacheClient cacheClient;
//
// @Autowired
// private DoctorMapper doctorMapper;
//
// /**
// * 1、使用分布式锁保证一个微服务执行；
// * 2、定时任务；
// */
// @Scheduled(cron = "0 0 0/1 * * ?")
// public void processDoctorRepeatData() {
// //通过接口幂等性逻辑处理
// String exist = cacheClient.get(KEY);
// if (exist==null){
// cacheClient.set(KEY,"1");
// cacheClient.expire(KEY, 60 * 10);
// logger.info("DoctorRepeatDataJob:开始执行刷新doctor表中重复的记录");
// int row = doctorMapper.processDoctorRepeatData();
// logger.info("此次数据刷新影响的行数：{}", row);
// try {
// //防止任务一秒跑完，其他机器的时间晚了几秒
// Thread.sleep(30*1000);
// } catch (InterruptedException ex) {
// logger.error(ex.getMessage(), ex);
// }
// //释放锁
// cacheClient.del(KEY);
// }
// }
//}
server/src/main/java/com/pica/cloud/account/account/server/service/impl/AccountServiceImpl.java
浏览文件 @ 1746fbec
......@@ -38,7 +38,7 @@ public class AccountServiceImpl implements AccountService {
@Autowired
private AccountInfoDetailMapper accountInfoDetailMapper;
@Autowired
@Qualifier("cacheMigrateClient")
private ICacheClient cacheClient;
@Value("${doubleWritingMode}")
......@@ -102,6 +102,7 @@ public class AccountServiceImpl implements AccountService {
account.setModifyId(0L);
account.setAcctId(acctId);
account.setCreatTime(currentTime);
account.setRegisterSource(AccountTypeEnum.DEVICE_TYPE_H5.getCode());
account.setModifyTime(currentTime);
account.setFirstLoginTime(currentTime);
account.setLastLoginTime(currentTime);
......
server/src/main/java/com/pica/cloud/account/account/server/service/impl/DoctorServiceImpl.java
浏览文件 @ 1746fbec
......@@ -131,6 +131,7 @@ public class DoctorServiceImpl implements DoctorService {
doctor.setCreatId(doctorId.intValue());
doctor.setCreatTime(currentTime);
doctor.setModifyTime(new Date());
doctor.setRegisterSource(AccountTypeEnum.DEVICE_TYPE_ADMIN.getCode());
doctor.setDeleteFlag(1);
doctorMapper.insertSelective(doctor);
return doctor.getId();
......
server/src/main/java/com/pica/cloud/account/account/server/service/impl/LoginServiceImpl.java
浏览文件 @ 1746fbec
......@@ -67,7 +67,7 @@ public class LoginServiceImpl implements LoginService {
private DoctorService doctorService;
@Autowired
@Qualifier("cacheMigrateClient")
private ICacheClient redisClient;
@Value("${doubleWritingMode}")
......
server/src/main/java/com/pica/cloud/account/account/server/service/impl/RegisterServiceImpl.java
浏览文件 @ 1746fbec
......@@ -2,7 +2,6 @@ package com.pica.cloud.account.account.server.service.impl;
import com.pica.cloud.account.account.common.req.OCINRequest;
import com.pica.cloud.account.account.server.entity.*;
import com.pica.cloud.account.account.server.enums.AccountAgreementEnum;
import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
import com.pica.cloud.account.account.server.exception.AccountException;
......@@ -27,7 +26,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.HashMap;
import java.util.concurrent.ExecutorService;
@Service
......@@ -68,7 +66,7 @@ public class RegisterServiceImpl implements RegisterService {
private AgreementLogEntityMapper agreementLogEntityMapper;
@Autowired
@Qualifier("cacheMigrateClient")
private ICacheClient redisClient;
/**
......@@ -255,6 +253,7 @@ public class RegisterServiceImpl implements RegisterService {
account.setModifyTime(currentTime);
account.setFirstLoginTime(currentTime);
account.setLastLoginTime(currentTime);
account.setRegisterSource(sourceType);
account.setPassword("");
account.setName(name);
accountMapper.insertSelective(account);
......
server/src/main/java/com/pica/cloud/account/account/server/service/impl/TokenServiceImpl.java
浏览文件 @ 1746fbec
......@@ -26,7 +26,7 @@ import static com.pica.cloud.foundation.utils.utils.json.Object2Map.objectToMapS
public class TokenServiceImpl implements TokenService {
@Autowired
@Qualifier("cacheMigrateClient")
private ICacheClient redisClient;
@Override
......
server/src/main/java/com/pica/cloud/account/account/server/util/AccountUtils.java
浏览文件 @ 1746fbec
......@@ -25,7 +25,7 @@ import org.springframework.stereotype.Component;
public class AccountUtils {
@Autowired
@Qualifier("cacheMigrateClient")
private ICacheClient cacheClient;
private Logger logger = LoggerFactory.getLogger(AccountController.class);
......
server/src/main/java/com/pica/cloud/account/account/server/util/TokenUtils.java
浏览文件 @ 1746fbec
......@@ -26,7 +26,7 @@ public class TokenUtils {
private Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired
@Qualifier("cacheMigrateClient")
private ICacheClient cacheClient;
@Autowired
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或