@@ -94,6 +94,10 @@ subprojects { | |||
implementation 'io.minio:minio:8.4.5' | |||
implementation 'cn.hutool:hutool-all:5.7.12' | |||
implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.10.0' | |||
implementation "org.apache.skywalking:apm-toolkit-trace:8.8.0" | |||
implementation "org.apache.skywalking:apm-toolkit-opentracing:8.8.0" | |||
implementation "org.apache.skywalking:apm-toolkit-logback-1.x:8.8.0" | |||
compileOnly 'org.projectlombok:lombok' | |||
testCompileOnly 'org.projectlombok:lombok' | |||
annotationProcessor 'org.projectlombok:lombok' |
@@ -32,14 +32,6 @@ public class PortalController extends MyValidController { | |||
return ApiResponse.of(res).setMessage("操作成功"); | |||
} | |||
@ApiOperation(value = "忘记密码") | |||
@PostMapping(value = "/changePasswordByCode") | |||
public ApiResponse<ChangePasswordByCodeResponse> register(@Valid @RequestBody ChangePasswordByCodeDTO dto) throws ManagerException { | |||
ChangePasswordByCodeResponse res = portalManager.register(dto); | |||
return ApiResponse.of(res).setMessage("操作成功"); | |||
} | |||
@ApiOperation(value = "重复注册校验") | |||
@PostMapping(value = "/registerCheck") | |||
public ApiResponse<RegisterCheckResponse> registerCheck(@Valid @RequestBody RegisterCheckRequest req) | |||
@@ -107,13 +99,11 @@ public class PortalController extends MyValidController { | |||
@ApiOperation(value = "通过验证码修改账号密码") | |||
@PostMapping(value = "/changePasswordByCode") | |||
public ApiResponse<ChangePasswordByCodeResponse> changePasswordByCode( | |||
@Valid @RequestBody ChangePasswordByCodeDTO dto) throws ManagerException { | |||
public ApiResponse<ChangePasswordByCodeResponse> changePasswordByCode(@Valid @RequestBody ChangePasswordByCodeDTO dto) throws ManagerException { | |||
ChangePasswordByCodeResponse res = portalManager.changePasswordByCode(dto); | |||
return ApiResponse.of(res).setMessage("操作成功"); | |||
} | |||
@ApiOperation(value = "已登录情况下,通过新手机号的验证码更换新手机号") | |||
@PostMapping(value = "/changeMobileByCode") | |||
public ApiResponse<ChangeMobileByCodeResponse> changeMobileByCode(@Valid @RequestBody ChangeMobileByCodeDTO dto) throws ManagerException { | |||
@@ -122,7 +112,7 @@ public class PortalController extends MyValidController { | |||
} | |||
@ApiOperation(value = "已登录情况下,通过Token获取用户信息") | |||
@PostMapping(value = "/changeMobileByCode") | |||
@PostMapping(value = "/findAccountInfoByToken") | |||
public ApiResponse<FindAccountInfoByTokenResponse> findAccountInfoByToken(@Valid @RequestBody FindAccountInfoByTokenRequest dto) throws ManagerException { | |||
FindAccountInfoByTokenResponse res = portalManager.findAccountInfoByToken(dto); | |||
return ApiResponse.of(res).setMessage("操作成功"); |
@@ -11,8 +11,6 @@ public interface PortalManager { | |||
RegisterResponse register(@Valid RegisterDTO req) throws ManagerException; | |||
ChangePasswordByCodeResponse register(ChangePasswordByCodeDTO dto) throws ManagerException; | |||
RegisterCheckResponse registerCheck(RegisterCheckRequest req) throws ManagerException; | |||
SendCodeResponse sendCode(@Valid SendCodeDTO dto) throws ManagerException; |
@@ -15,11 +15,6 @@ public class PortalManagerImpl extends AbstractCommManager implements PortalMana | |||
return jsonPostRepeat(dto.toRequest()); | |||
} | |||
@Override | |||
public ChangePasswordByCodeResponse register(ChangePasswordByCodeDTO dto) throws ManagerException { | |||
return jsonPostRepeat(dto.toRequest()); | |||
} | |||
@Override | |||
public RegisterCheckResponse registerCheck(RegisterCheckRequest req) throws ManagerException { | |||
return jsonPostRepeat(req); |
@@ -19,9 +19,6 @@ dependencies { | |||
implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery" | |||
implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config" | |||
implementation "org.springframework.cloud:spring-cloud-starter-openfeign" | |||
implementation "org.apache.skywalking:apm-toolkit-trace:8.8.0" | |||
implementation "org.apache.skywalking:apm-toolkit-opentracing:8.8.0" | |||
implementation "org.apache.skywalking:apm-toolkit-logback-1.x:8.8.0" | |||
// //MYSQL | |||
// runtimeOnly 'mysql:mysql-connector-java' | |||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-redis' |
@@ -19,9 +19,6 @@ dependencies { | |||
implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config" | |||
implementation 'com.alibaba:druid-spring-boot-starter:1.2.8' | |||
implementation "org.springframework.cloud:spring-cloud-starter-openfeign" | |||
implementation "org.apache.skywalking:apm-toolkit-trace:8.8.0" | |||
implementation "org.apache.skywalking:apm-toolkit-opentracing:8.8.0" | |||
implementation "org.apache.skywalking:apm-toolkit-logback-1.x:8.8.0" | |||
// //MYSQL | |||
// runtimeOnly 'mysql:mysql-connector-java' | |||
//ORACLE+库编码问题 |
@@ -20,12 +20,8 @@ dependencies { | |||
implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config" | |||
implementation 'com.alibaba:druid-spring-boot-starter:1.2.8' | |||
implementation "org.springframework.cloud:spring-cloud-starter-openfeign" | |||
implementation "org.apache.skywalking:apm-toolkit-trace:8.8.0" | |||
implementation "org.apache.skywalking:apm-toolkit-opentracing:8.8.0" | |||
implementation "org.apache.skywalking:apm-toolkit-logback-1.x:8.8.0" | |||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-redis' | |||
implementation group: 'com.alibaba', name: 'fastjson', version: '2.0.4' | |||
implementation group: 'com.alibaba', name: 'easyexcel', version: '3.2.1' | |||
implementation 'io.minio:minio:8.4.1' | |||
implementation 'com.squareup.okhttp3:okhttp:4.9.3' |
@@ -5,6 +5,7 @@ import cn.com.taiji.core.entity.dict.basic.SourceType; | |||
import cn.com.taiji.core.entity.user.AccountInfo; | |||
import cn.com.taiji.core.entity.user.Staff; | |||
import cn.com.taiji.core.manager.cache.RedisKeyGenerator; | |||
import cn.com.taiji.core.manager.tools.SystemFinals; | |||
import cn.com.taiji.core.model.comm.protocol.ias.portal.LoginConfirmRequest; | |||
import cn.com.taiji.core.model.comm.protocol.ias.portal.LoginConfirmResponse; | |||
import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError; | |||
@@ -64,9 +65,9 @@ public class LoginConfirmManager extends AbstractLoginManager { | |||
response.setAccessToken(accessToken); | |||
response.setOpenId(accountInfo.getOpenId()); | |||
if (loginSource == SourceType.WECHAT || loginSource == SourceType.ALI) { | |||
response.setServiceHallId(commonServiceHallId); // (来自黔通智联(自营)) | |||
response.setAgencyId(commonServiceHallId.substring(0, 11)); // 小程序返回网点的前11位(绑定的渠道)(小程序的默认是黔通智联(自营)) | |||
response.setStaffId(commonStaffId); // 普通用户专属员工 | |||
response.setServiceHallId(SystemFinals.commonServiceHallId); // (来自黔通智联(自营)) | |||
response.setAgencyId(SystemFinals.commonServiceHallId.substring(0, 11)); // 小程序返回网点的前11位(绑定的渠道)(小程序的默认是黔通智联(自营)) | |||
response.setStaffId(SystemFinals.commonStaffId); // 普通用户专属员工 | |||
} | |||
if (loginSource == SourceType.SERVICE_HALL || loginSource == SourceType.WEB) { | |||
response.setServiceHallId(staff.getServiceHallId()); |
@@ -20,9 +20,6 @@ dependencies { | |||
implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config" | |||
implementation 'com.alibaba:druid-spring-boot-starter:1.2.8' | |||
implementation "org.springframework.cloud:spring-cloud-starter-openfeign" | |||
implementation "org.apache.skywalking:apm-toolkit-trace:8.8.0" | |||
implementation "org.apache.skywalking:apm-toolkit-opentracing:8.8.0" | |||
implementation "org.apache.skywalking:apm-toolkit-logback-1.x:8.8.0" | |||
// //MYSQL | |||
// runtimeOnly 'mysql:mysql-connector-java' | |||
//ORACLE+库编码问题 |
@@ -19,9 +19,6 @@ dependencies { | |||
implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config" | |||
implementation 'com.alibaba:druid-spring-boot-starter:1.2.8' | |||
implementation "org.springframework.cloud:spring-cloud-starter-openfeign" | |||
implementation "org.apache.skywalking:apm-toolkit-trace:8.8.0" | |||
implementation "org.apache.skywalking:apm-toolkit-opentracing:8.8.0" | |||
implementation "org.apache.skywalking:apm-toolkit-logback-1.x:8.8.0" | |||
// //MYSQL | |||
// runtimeOnly 'mysql:mysql-connector-java' | |||
//ORACLE+库编码问题 |
@@ -19,9 +19,6 @@ dependencies { | |||
implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config" | |||
implementation 'com.alibaba:druid-spring-boot-starter:1.2.8' | |||
implementation "org.springframework.cloud:spring-cloud-starter-openfeign" | |||
implementation "org.apache.skywalking:apm-toolkit-trace:8.8.0" | |||
implementation "org.apache.skywalking:apm-toolkit-opentracing:8.8.0" | |||
implementation "org.apache.skywalking:apm-toolkit-logback-1.x:8.8.0" | |||
// //MYSQL | |||
// runtimeOnly 'mysql:mysql-connector-java' | |||
//ORACLE+库编码问题 |