hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
476474485@qq.com 2024-09-14 16:58:03 +08:00
parent 6e0b588959 55aa4c4a92
commit 2874005465
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -63,3 +63,4 @@ $RECYCLE.BIN/
/base-buildpackage/target/ /base-buildpackage/target/
/base-common/target/ /base-common/target/
/base-core/target/ /base-core/target/
/base-webapp/target/classes/com/hzya/frame/

4
base-buildpackage/src/main/resources/application.yml
View File

@ -1,5 +1,5 @@
server: server:
port: 9999 port: 10086
servlet: servlet:
context-path: /kangarooDataCenterV3 context-path: /kangarooDataCenterV3
localIP: 127.0.0.1 localIP: 127.0.0.1
@ -93,7 +93,7 @@ mybatis-plus:
db-config: db-config:
id-type: auto # 主键策略 id-type: auto # 主键策略
zt: zt:
url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface url: http://127.0.0.1:10086/kangarooDataCenterV3/entranceController/externalCallInterface
#JimuReport[minidao配置] #JimuReport[minidao配置]
minidao : minidao :
base-package: org.jeecg.modules.jmreport.desreport.dao* base-package: org.jeecg.modules.jmreport.desreport.dao*

6
base-service/src/main/java/com/hzya/frame/sysnew/login/impl/LoginServiceImpl.java
View File

@ -36,6 +36,7 @@ import com.hzya.frame.web.exception.BaseSystemException;
import org.checkerframework.checker.units.qual.C; import org.checkerframework.checker.units.qual.C;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -58,7 +59,8 @@ public class LoginServiceImpl implements ILoginService {
private ISysPersonDao sysPersonDao; private ISysPersonDao sysPersonDao;
@Resource @Resource
private ISysOrganDao sysOrganDao; private ISysOrganDao sysOrganDao;
@Value("${zt.url}")
private String url ;
@Resource @Resource
private ISysApplicationDao sysApplicationDao; private ISysApplicationDao sysApplicationDao;
@Resource @Resource
@ -171,7 +173,7 @@ public class LoginServiceImpl implements ILoginService {
String requestType = entity.getString("UserAgent");// pc端还是移动端 String requestType = entity.getString("UserAgent");// pc端还是移动端
JSONObject bodyParams = new JSONObject(); JSONObject bodyParams = new JSONObject();
bodyParams.put("code",code); bodyParams.put("code",code);
String result = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface"). String result = HttpRequest.post("url").
header("appId",appId). header("appId",appId).
header("apiCode",userApiCode). header("apiCode",userApiCode).
header("publicKey","ZJYAWb7lhAUTYqekPkU+uHJv1/ObJxb7dT7sD8HPRDGAgyhCe7eDIk+3zDUT+v578prj"). header("publicKey","ZJYAWb7lhAUTYqekPkU+uHJv1/ObJxb7dT7sD8HPRDGAgyhCe7eDIk+3zDUT+v578prj").

6
base-service/src/main/java/com/hzya/frame/sysnew/sendMessageLog/service/impl/SysSendMessageLogServiceImpl.java
View File

@ -25,6 +25,7 @@ import com.hzya.frame.sysnew.warningInterface.entity.SysWarningInterfaceEntity;
import com.hzya.frame.uuid.UUIDUtils; import com.hzya.frame.uuid.UUIDUtils;
import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.BaseResult;
import com.hzya.frame.web.entity.JsonResultEntity; import com.hzya.frame.web.entity.JsonResultEntity;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -55,7 +56,8 @@ public class SysSendMessageLogServiceImpl extends BaseService<SysSendMessageLogE
private ISysApplicationApiDao sysApplicationApiDao; private ISysApplicationApiDao sysApplicationApiDao;
@Resource @Resource
private ISysApplicationApiParaDao sysApplicationApiParaDao; private ISysApplicationApiParaDao sysApplicationApiParaDao;
@Value("${zt.url}")
private String url ;
private ISysSendMessageLogDao sysSendMessageLogDao; private ISysSendMessageLogDao sysSendMessageLogDao;
@Autowired @Autowired
@ -253,7 +255,7 @@ public class SysSendMessageLogServiceImpl extends BaseService<SysSendMessageLogE
logger.error("未找到该应用类型"); logger.error("未找到该应用类型");
break; break;
} }
String result = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface"). String result = HttpRequest.post(url).
header("appId",warningAppCode.toString()). header("appId",warningAppCode.toString()).
header("apiCode",warningApiCode.toString()). header("apiCode",warningApiCode.toString()).
header("publicKey","ZJYA7v6DubGMm8EdBPGo+Jj9wCpUeCGJEpfBRLiInq4dvDlCe7eDIk+3zDUT+v578prj"). header("publicKey","ZJYA7v6DubGMm8EdBPGo+Jj9wCpUeCGJEpfBRLiInq4dvDlCe7eDIk+3zDUT+v578prj").