From c58316993ee13c6f4dc727f9a052b6ba4e8fff7d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 25 一月 2024 17:37:43 +0800
Subject: [PATCH] 开发业务接口
---
server/service/src/main/java/com/doumee/service/business/CompanyService.java | 2
server/platform/src/main/java/com/doumee/api/business/CompanyController.java | 6
server/platform/src/main/java/com/doumee/api/system/SystemUserController.java | 9 ++
server/platform/src/main/java/com/doumee/task/ScheduleTool.java | 9 ++
server/service/src/main/java/com/doumee/config/mybatis/MyBatisPlusConfig.java | 4 +
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 66 +++++++++++++++-
server/service/src/main/java/com/doumee/service/business/third/SignService.java | 21 +++--
server/service/src/main/java/com/doumee/dao/business/model/Multifile.java | 2
server/dianziqian/src/main/java/com/jzq/JzqHttpApiTest.java | 14 ++-
server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java | 75 ++++++++++--------
server/service/src/main/java/com/doumee/dao/system/dto/CreateSystemUserDTO.java | 2
11 files changed, 155 insertions(+), 55 deletions(-)
diff --git a/server/dianziqian/src/main/java/com/jzq/JzqHttpApiTest.java b/server/dianziqian/src/main/java/com/jzq/JzqHttpApiTest.java
index a0bd2bb..a6a98a7 100644
--- a/server/dianziqian/src/main/java/com/jzq/JzqHttpApiTest.java
+++ b/server/dianziqian/src/main/java/com/jzq/JzqHttpApiTest.java
@@ -84,14 +84,16 @@
// req.setLegalMobile("153XXXXXXXX");
Map<String, Object> params=bodyParams;
String url=SERVICE_URL+"/v2/user/organizationCreate";
- params.put("name","瀹夊窘璞嗙背绉戞妧鏈夐檺鍏徃");
+ params.put("name","瀹夊窘璞嗙背绉戞妧鏈夐檺鍏徃1");
params.put("identificationType",1);
- params.put("organizationRegNo","913401000967388938");
+ params.put("organizationRegNo","913401000967388931");
params.put("organizationType",0);
- params.put("organizationCode","913401000967388938");
+ params.put("organizationCode","913401000967388931");
params.put("organizationRegImg", new File("D://test.png"));
- params.put("legalName","鏉ㄩ緳");
- params.put("emailOrMobile","jp@doumee.com");
+ params.put("legalName","鏉ㄩ緳1");
+ params.put("emailOrMobile","jp1@doumee.com");
+
+ System.out.println(JSONObject.toJSONString(params));
String str= HttpClientUtils.init().getPost(url,null,params,true);
System.out.println(str);
}
@@ -217,7 +219,7 @@
public static void main(String[] args) {
-// new JzqHttpApiTest().testOrganizationCreate();
+ new JzqHttpApiTest().testOrganizationCreate();
// new JzqHttpApiTest().testOrganizationAuditStatus();
// new JzqHttpApiTest().uploadEntSign("璞嗙背绉戞妧鍏珷鏂�",new File("D://sing.png"),"jp@doumee.com");
diff --git a/server/platform/src/main/java/com/doumee/api/business/CompanyController.java b/server/platform/src/main/java/com/doumee/api/business/CompanyController.java
index 2345fc5..14d8f81 100644
--- a/server/platform/src/main/java/com/doumee/api/business/CompanyController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/CompanyController.java
@@ -110,9 +110,9 @@
@ApiOperation("鏌ヨ鍏ㄩ儴鏁版嵁(璐﹀彿鍒嗛厤浼佷笟浣跨敤)")
@PostMapping("/pageAll")
@RequiresPermissions("business:companypermission:create")
- public ApiResponse<PageData<Company>> findPageAll (@RequestBody PageWrap<Company> pageWrap) {
- pageWrap.getModel().setQueryFlag(Constants.ONE);//鏌ヨ鍏ㄩ儴
- return ApiResponse.success(companyService.findPage(pageWrap));
+ public ApiResponse<List<Company>> findPageAll (@RequestBody Company pageWrap) {
+ pageWrap.setQueryFlag(Constants.ONE);//鏌ヨ鍏ㄩ儴
+ return ApiResponse.success(companyService.findList(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
diff --git a/server/platform/src/main/java/com/doumee/api/system/SystemUserController.java b/server/platform/src/main/java/com/doumee/api/system/SystemUserController.java
index a70010a..3b050f1 100644
--- a/server/platform/src/main/java/com/doumee/api/system/SystemUserController.java
+++ b/server/platform/src/main/java/com/doumee/api/system/SystemUserController.java
@@ -70,6 +70,15 @@
systemUserBiz.create(systemUser);
return ApiResponse.success(null);
}
+ @PreventRepeat
+ @ApiOperation("淇敼鐢ㄦ埛鐘舵��")
+ @GetMapping("/updUserStatus")
+ @RequiresPermissions("system:user:update")
+ public ApiResponse updUserStatus( @RequestParam Integer id,@RequestParam Integer status) {
+ systemUserBiz.updUserStatus(id,status);
+ return ApiResponse.success(null);
+ }
+
@ApiOperation("鍒犻櫎")
@GetMapping("/delete/{id}")
diff --git a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
index 3edcc84..06d04c0 100644
--- a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
@@ -31,6 +31,15 @@
* @throws Exception
*/
@Scheduled(fixedDelay= 60*1000,initialDelay = 30000)
+ public void startSignAuthAuto() throws Exception {
+ log.info("==============瀹氭椂娉ㄥ唽浼佷笟鍚涘瓙绛捐处鍙�=======start======");
+ companyService.startSignAuthAuto();
+ log.info("==============瀹氭椂娉ㄥ唽浼佷笟鍚涘瓙绛捐处鍙�======end=======");
+ }
+ /**
+ * @throws Exception
+ */
+ @Scheduled(fixedDelay= 60*1000,initialDelay = 30000)
public void dealComSignAuthStatus() throws Exception {
log.info("==============瀹氭椂鏌ヨ浼佷笟鐢靛瓙绛捐璇佺姸鎬�=======start======");
companyService.dealSignAuthStatus();
diff --git a/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java b/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
index 990a06a..d108c33 100644
--- a/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
@@ -1,5 +1,6 @@
package com.doumee.biz.system.impl;
+import cn.emay.sdk.core.dto.sms.response.SmsResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.doumee.biz.system.SystemUserBiz;
import com.doumee.core.constants.ResponseStatus;
@@ -7,6 +8,7 @@
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.SmsEmailMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.system.dto.*;
import com.doumee.dao.system.model.SystemDepartment;
@@ -14,12 +16,14 @@
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.system.model.SystemUserRole;
import com.doumee.service.business.CompanyService;
+import com.doumee.service.business.impl.SmsEmailServiceImpl;
import com.doumee.service.system.*;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -34,9 +38,13 @@
@Autowired
private SystemUserService systemUserService;
+ @Autowired
+ private SmsEmailMapper smsEmailMapper;
@Autowired
private CompanyService companyService;
+ @Value("${debug_model}")
+ private boolean debugModel;
@Autowired
private SystemUserRoleService systemUserRoleService;
@@ -109,22 +117,29 @@
public void create(CreateSystemUserDTO systemUser) {
// 楠岃瘉鐢ㄦ埛鍚�
// systemUser.setUsername(systemUser.getMobile());
+ if(StringUtils.isBlank(systemUser.getMobile()) || StringUtils.isBlank(systemUser.getCaptcha())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(!debugModel){
+ SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,systemUser.getMobile(),systemUser.getCaptcha());
+ }
SystemUser queryUserDto = new SystemUser();
queryUserDto.setUsername(systemUser.getUsername());
queryUserDto.setDeleted(Boolean.FALSE);
queryUserDto.setType(Constants.ZERO);
+
SystemUser user = systemUserService.findOne(queryUserDto);
if (user != null) {
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鐧诲綍璐﹀彿宸插瓨鍦�");
}
- // 楠岃瘉宸ュ彿
- if (StringUtils.isNotBlank(systemUser.getEmpNo())) {
+ // 楠岃瘉鎵嬫満鍙�
+ if (StringUtils.isNotBlank(systemUser.getMobile())) {
queryUserDto = new SystemUser();
queryUserDto.setDeleted(Boolean.FALSE);
- queryUserDto.setEmpNo(systemUser.getEmpNo());
+ queryUserDto.setEmpNo(systemUser.getMobile());
user = systemUserService.findOne(queryUserDto);
if (user != null) {
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿宸插瓨鍦�");
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙峰凡瀛樺湪");
}
}
// 鐢熸垚瀵嗙爜鐩�
@@ -132,6 +147,10 @@
// 鐢熸垚瀵嗙爜
systemUser.setPassword(Utils.Secure.encryptPassword(systemUser.getPassword(), salt));
systemUser.setSalt(salt);
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ systemUser.setType(loginUserInfo.getType());
+ systemUser.setStatus(Constants.ZERO);
+ systemUser.setCompanyId(loginUserInfo.getCompanyId());
Integer userId = systemUserService.create(systemUser);
// 璁剧疆閮ㄩ棬
if (systemUser.getDepartmentId() != null) {
@@ -152,17 +171,7 @@
systemDepartmentUser.setOperaTime(new Date());
systemDepartmentUserService.create(systemDepartmentUser);
}
- // 璁剧疆宀椾綅
-// if (systemUser.getPositionIds() != null && systemUser.getPositionIds().size() > 0) {
-// for (Integer positionId : systemUser.getPositionIds()) {
-// SystemPositionUser systemPositionUser = new SystemPositionUser();
-// systemPositionUser.setPositionId(positionId);
-// systemPositionUser.setUserId(userId);
-// systemPositionUser.setOperaUser(systemUser.getCreateUser());
-// systemPositionUser.setOperaTime(new Date());
-// systemPositionUserService.create(systemPositionUser);
-// }
-// }
+
}
@Override
@@ -181,15 +190,30 @@
}
// 楠岃瘉宸ュ彿
- if (StringUtils.isNotBlank(systemUser.getEmpNo())) {
+ if (StringUtils.isNotBlank(systemUser.getMobile())) {
queryUserDto = new SystemUser();
- queryUserDto.setEmpNo(systemUser.getEmpNo());
+ queryUserDto.setEmpNo(systemUser.getMobile());
queryUserDto.setDeleted(Boolean.FALSE);
user = systemUserService.findOne(queryUserDto);
if (user != null && !user.getId().equals(systemUser.getId())) {
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿宸插瓨鍦�");
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙峰凡瀛樺湪");
+ }
+ user = systemUserService.findById(systemUser.getId());
+ if(user == null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝鐢ㄦ埛淇℃伅涓嶅瓨鍦紒");
+ }
+ if(!StringUtils.equals(systemUser.getMobile(),user.getMobile())){
+ //濡傛灉鎵嬫満鍙峰彂鐢熷彉鍖栭獙璇侀獙璇佺爜
+ if(StringUtils.isBlank(systemUser.getMobile()) || StringUtils.isBlank(systemUser.getCaptcha())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐭俊楠岃瘉鐮佷笉鑳戒负绌猴紒");
+ }
+ if(!debugModel){
+ SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,systemUser.getMobile(),systemUser.getCaptcha());
+ }
}
}
+ systemUser.setType(null);//涓嶆敮鎸佷慨鏀�
+ systemUser.setCompanyId(null);//涓嶆敮鎸佷慨鏀�
// 淇敼鐢ㄦ埛
systemUserService.updateById(systemUser);
// 璁剧疆閮ㄩ棬
@@ -204,20 +228,7 @@
systemDepartmentUser.setOperaTime(new Date());
systemDepartmentUserService.create(systemDepartmentUser);
}
- // 璁剧疆宀椾綅
- /* SystemPositionUser deletePositionDto = new SystemPositionUser();
- deletePositionDto.setUserId(systemUser.getId());
- systemPositionUserService.delete(deletePositionDto);
- if (systemUser.getPositionIds() != null && systemUser.getPositionIds().size() > 0) {
- for (Integer positionId : systemUser.getPositionIds()) {
- SystemPositionUser systemPositionUser = new SystemPositionUser();
- systemPositionUser.setPositionId(positionId);
- systemPositionUser.setUserId(systemUser.getId());
- systemPositionUser.setOperaUser(systemUser.getUpdateUser());
- systemPositionUser.setOperaTime(new Date());
- systemPositionUserService.create(systemPositionUser);
- }
- }*/
+
}
@Override
diff --git a/server/service/src/main/java/com/doumee/config/mybatis/MyBatisPlusConfig.java b/server/service/src/main/java/com/doumee/config/mybatis/MyBatisPlusConfig.java
index fcc0401..dd29939 100644
--- a/server/service/src/main/java/com/doumee/config/mybatis/MyBatisPlusConfig.java
+++ b/server/service/src/main/java/com/doumee/config/mybatis/MyBatisPlusConfig.java
@@ -20,4 +20,8 @@
interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
return interceptor;
}
+ @Bean
+ public EasySqlInjector sqlInjector() {
+ return new EasySqlInjector();
+ }
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java b/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java
index 4e00b65..a0fde81 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java
@@ -20,7 +20,7 @@
@ApiModel("闄勪欢涓婁紶淇℃伅琛�")
@TableName("`multifile`")
public class Multifile {
-
+ @TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@ExcelColumn(name="涓婚敭")
private Integer id;
diff --git a/server/service/src/main/java/com/doumee/dao/system/dto/CreateSystemUserDTO.java b/server/service/src/main/java/com/doumee/dao/system/dto/CreateSystemUserDTO.java
index 8db25bf..4c94f3f 100644
--- a/server/service/src/main/java/com/doumee/dao/system/dto/CreateSystemUserDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/system/dto/CreateSystemUserDTO.java
@@ -23,4 +23,6 @@
@ApiModelProperty(value = "瀛愯处鍙疯妭鐐�")
private String sonUserId;
+ @ApiModelProperty(value = "鐭俊楠岃瘉鐮�")
+ private String captcha;
}
diff --git a/server/service/src/main/java/com/doumee/service/business/CompanyService.java b/server/service/src/main/java/com/doumee/service/business/CompanyService.java
index 9b8c718..c0a46ba 100644
--- a/server/service/src/main/java/com/doumee/service/business/CompanyService.java
+++ b/server/service/src/main/java/com/doumee/service/business/CompanyService.java
@@ -97,6 +97,8 @@
long count(Company company);
void startSignAuth(Integer id);
+
+ void startSignAuthAuto( );
void dealSignAuthStatus();
void dealSignIdStatus();
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 8ba0cf6..ffd8aca 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -268,6 +268,11 @@
multifileList.add(initMultiFileByCompay(company,company.getSignImg(),Constants.MultiFile.COM_SING_IMG.getKey()));
objList.add(Constants.MultiFile.COM_SING_IMG.getKey());
company.setSignIdStatus(Constants.ZERO);//鏍囪鐢靛瓙绛剧珷鏈笂浼�
+ if(StringUtils.isNotBlank(company.getSignId())){
+ //鍒犻櫎鐜版湁鐨勭绔�
+ signService.deleteEntSign(company.getSignId());
+ }
+ company.setSignId("");
}
if(company.getIdcardImgList()!=null && company.getIdcardImgList()!=null){
for(Multifile f : company.getIdcardImgList()){
@@ -405,7 +410,9 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氥�愬悕绉般�戙�愮粺涓�淇＄敤浠ｇ爜鎴栬�呫�愪紒涓氳处鍙枫�戝凡瀛樺湪锛岃纭鍚庨噸鏂版彁浜わ紒");
}
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-
+ if(Constants.equalsInteger(model.getSignIdStatus(),Constants.ONE)){
+ company.setSignId(model.getSignId());
+ }
dealFileDataForUpdate(company);
Company update = new Company();
@@ -423,7 +430,10 @@
update.setInvoiceAddr(company.getInvoiceAddr());
update.setSignIdStatus(company.getSignIdStatus());
update.setInvoiceEmail(company.getInvoiceEmail());
- if(StringUtils.isNotBlank(company.getEmail())){
+ if(StringUtils.isNotBlank(company.getEmail())
+ ||!StringUtils.equals(company.getName(),model.getName())
+ ||!StringUtils.equals(company.getLegalName(),model.getLegalName())
+ ||!StringUtils.equals(company.getCode(),model.getCode()) ){
//濡傛灉閭鍙戠敓鏀瑰彉
update.setSignStatus(Constants.ZERO);
}
@@ -524,6 +534,33 @@
//鏇存柊璁よ瘉鐘舵��
companyMapper.updateById(update);
}
+ @Override
+ public void startSignAuthAuto( ){
+ List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>().lambda()
+ .eq(Company::getIsdeleted,Constants.ZERO)
+ .eq(Company::getSignStatus,Constants.ZERO));
+ if(companyList!=null && companyList.size()>0) {
+ for (Company company : companyList) {
+ Multifile f = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .eq(Multifile::getObjType,Constants.MultiFile.COM_BUSINESS_LICENSE.getKey())
+ .eq(Multifile::getObjId,company.getId())
+ .last("limit 1"));
+ if(f == null){
+ return;
+ }
+ String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.OSS,Constants.COMPANY_FILE).getCode();
+ boolean status = signService.organizationCreate(company.getName(),company.getCode(),company.getLegalName(),company.getEmail(), path + f.getFileurl(),null);
+ Company update = new Company();
+ update.setId(company.getId());
+ update.setSignStatus(status?Constants.ONE:Constants.TWO);
+ update.setSignDate(new Date());
+ //鏇存柊璁よ瘉鐘舵��
+ companyMapper.updateById(update);
+ }
+ }
+
+ }
/**
* 鐢靛瓙绛捐璇�
* public boolean organizationCreate (String fullname,String creditCode,String legalName,String email,File businessimg,String notifyUrl){
@@ -553,7 +590,6 @@
//鏇存柊璁よ瘉鐘舵��
companyMapper.updateById(update);
}
-
}
}
@@ -567,7 +603,7 @@
public void dealSignIdStatus(){
List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>().lambda()
.eq(Company::getIsdeleted,Constants.ZERO)
- .eq(Company::getSignStatus,Constants.ONE)
+ .eq(Company::getSignStatus,Constants.THREE)
.eq(Company::getSignIdStatus,Constants.ZERO));
if(companyList!=null && companyList.size()>0){
for(Company company :companyList){
@@ -600,12 +636,32 @@
}
+// @Override
+// public List<Company> findList(Company company) {
+// QueryWrapper<Company> wrapper = new QueryWrapper<>(company);
+// return companyMapper.selectList(wrapper);
+// }
+//
@Override
public List<Company> findList(Company company) {
QueryWrapper<Company> wrapper = new QueryWrapper<>(company);
+ company.setIsdeleted(Constants.ZERO);
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(company.getQueryFlag() == 0){
+ //鍙兘鐪嬫潈闄愯寖鍥村唴
+ if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
+ wrapper.lambda().eq(Company::getId,-1);//璁剧疆鏃犳晥璁块棶
+ }else {
+ wrapper.lambda().in(Company::getId, user.getCompanyIdList());
+ }
+// queryWrapper.exists("select b.id from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id");
+ } else if (company.getQueryFlag() == 1) {
+ //鏌ヨ鏄惁鏈夋煡鐪嬫瑠闄�
+ wrapper.select("*,(select count(1) from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
+ }
return companyMapper.selectList(wrapper);
}
-
+
@Override
public PageData<Company> findPage(PageWrap<Company> pageWrap) {
IPage<Company> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
diff --git a/server/service/src/main/java/com/doumee/service/business/third/SignService.java b/server/service/src/main/java/com/doumee/service/business/third/SignService.java
index e2aabab..9289e06 100644
--- a/server/service/src/main/java/com/doumee/service/business/third/SignService.java
+++ b/server/service/src/main/java/com/doumee/service/business/third/SignService.java
@@ -83,11 +83,11 @@
}
public void initParams(){
- long ts=System.currentTimeMillis();
+ long ts=System.currentTimeMillis()/1000;
String nonce=DigestUtils.md5Hex(System.currentTimeMillis()+"");
String sign=DigestUtils.sha256Hex("nonce"+nonce+"ts"+ts+"app_key"+APP_KEY+"app_secret"+APP_SECRET);
bodyParams=new IdentityHashMap<>();
- bodyParams.put("ts",ts);
+ bodyParams.put("ts",System.currentTimeMillis()/1000);
bodyParams.put("app_key",APP_KEY);
bodyParams.put("sign",sign);
bodyParams.put("nonce",nonce);//杩欏彧鍙槸涓轰簡鐢熸垚涓�涓殢鏈哄��
@@ -125,6 +125,7 @@
*/
public boolean organizationCreate (String fullname,String creditCode,String legalName,String email,String businessimgPath, String notifyUrl){
try {
+ initParams();
File businessimg =netFileToLoclFile(businessimgPath);
if(businessimg == null || !businessimg.isFile() || !businessimg.exists()){
return false;
@@ -166,10 +167,12 @@
*/
public boolean organizationReApply(String fullname,String creditCode,String legalName,String email,String businessimgPath,String notifyUrl){
try {
+
File businessimg = new File(new URI(businessimgPath));
if(businessimg == null|| !businessimg.isFile() || !businessimg.exists()){
return false ;
}
+ initParams();
Map<String, Object> params=bodyParams;
String url=SERVICE_URL+"/v2/user/organizationReapply";
params.put("name",fullname);
@@ -230,6 +233,7 @@
*/
public int organizationAuditStatus (String email){
try {
+ initParams();
Map<String, Object> params=bodyParams;
String url=SERVICE_URL+"/v2/user/organizationAuditStatus";
params.put("emailOrMobile",email);
@@ -257,6 +261,7 @@
*/
public String applySign(String name,String fileUrl,String fullname,String creditCoe,String email,String postionJson,String singId,String notifyUrl){
try {
+ initParams();
String url=SERVICE_URL+"/v2/sign/applySign";
Map<String, Object> params=bodyParams;
params.put("contractName",name); //鍚堝悓鍚嶇О
@@ -305,7 +310,7 @@
* @param postionJson
*/
public String applySignLocalFile(String name,String fullname,String file,String creditCoe,String email,String postionJson,String singId,String notifyUrl){
- try {
+ try { initParams();
String url=SERVICE_URL+"/v2/sign/applySign";
Map<String, Object> params=bodyParams;
params.put("contractName",name); //鍚堝悓鍚嶇О
@@ -352,7 +357,7 @@
* @param creditCode
*/
public String signLink(String applyNo,String name,String creditCode) {
- try {
+ try { initParams();
Map<String, Object> params = bodyParams;
String url = SERVICE_URL + "/v2/sign/link";
params.put("applyNo",applyNo); //鍙戣捣鍚堝悓绛剧讲鎺ュ彛杩斿洖鐨凙PL缂栧彿
@@ -377,7 +382,7 @@
*/
public String linkFile(String applyNo) {
- try {
+ try { initParams();
Map<String, Object> params = bodyParams;
String url = SERVICE_URL + "/v2/sign/linkFile";
//鏋勫缓璇锋眰鍙傛暟
@@ -401,8 +406,8 @@
*/
public String uploadEntSign(String signName,String path,String email ) {
- try {
- File signImgFile = new File(new URI(path));
+ try { initParams();
+ File signImgFile =netFileToLoclFile(path);
Map<String, Object> params = bodyParams;
String url = SERVICE_URL + "/v2/user/uploadEntSign";
//鏋勫缓璇锋眰鍙傛暟
@@ -427,7 +432,7 @@
*/
public boolean deleteEntSign(String signId ) {
- try {
+ try { initParams();
Map<String, Object> params = bodyParams;
String url = SERVICE_URL + "/v2/user/deleteEntSign";
//鏋勫缓璇锋眰鍙傛暟
--
Gitblit v1.9.3