Merge remote-tracking branch 'origin/dev' into dev
commit
e03237f349
|
|
@ -34,9 +34,6 @@ public class GbsUserSyncInterceptor implements WebMvcConfigurer {
|
|||
|
||||
private final String[] anonymousUrl = {
|
||||
"/**/images/**",
|
||||
"/**/account/syncUserToGBS/**",
|
||||
"/**/org-info/save/**",
|
||||
"/**/account/save/**",
|
||||
"/**/file/**",
|
||||
"/**/tree/**"
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,13 +2,22 @@ package org.qinan.safetyeval.adapter.web;
|
|||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import org.qinan.safetyeval.client.api.AccountApi;
|
||||
import org.qinan.safetyeval.client.api.OrgInfoApi;
|
||||
import org.qinan.safetyeval.client.co.AccountCO;
|
||||
import org.qinan.safetyeval.client.co.OrgInfoCO;
|
||||
import org.qinan.safetyeval.client.dto.AccountAddCmd;
|
||||
import org.qinan.safetyeval.client.dto.OrgInfoAddCmd;
|
||||
import org.qinan.safetyeval.client.dto.SendMessageCmd;
|
||||
import org.qinan.safetyeval.client.dto.SingleResponse;
|
||||
import org.qinan.safetyeval.infrastructure.remote.SmsRemote;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
|
@ -27,12 +36,36 @@ public class ImagesOpenController {
|
|||
@Resource
|
||||
private SmsRemote smsRemote;
|
||||
|
||||
@Resource
|
||||
private AccountApi accountApi;
|
||||
|
||||
@Resource
|
||||
private OrgInfoApi orgInfoApi;
|
||||
|
||||
@ApiOperation("发送短信")
|
||||
@PostMapping("/sendMessage")
|
||||
public com.alibaba.cola.dto.SingleResponse<Boolean> sendMessage(@Validated @RequestBody SendMessageCmd cmd) {
|
||||
return smsRemote.sign(cmd.getMobile());
|
||||
}
|
||||
|
||||
@ApiOperation("新增用户（注册）")
|
||||
@PostMapping("/account/save")
|
||||
public SingleResponse<AccountCO> register(@Validated @RequestBody AccountAddCmd cmd) {
|
||||
return accountApi.add(cmd);
|
||||
}
|
||||
|
||||
@ApiOperation("新增机构信息（注册）")
|
||||
@PostMapping("/org-info/save")
|
||||
public SingleResponse<OrgInfoCO> orgInfoSave(@Validated @RequestBody OrgInfoAddCmd cmd) {
|
||||
return orgInfoApi.add(cmd);
|
||||
}
|
||||
|
||||
@ApiOperation("用户同步 GBS")
|
||||
@GetMapping("/account/syncUserToGBS")
|
||||
public SingleResponse<AccountCO> syncUserToGBS(@ApiParam("账号") @RequestParam String account) {
|
||||
return accountApi.syncUserToGBS(account);
|
||||
}
|
||||
|
||||
@ApiOperation("发送短信")
|
||||
@PostMapping("/test")
|
||||
public SingleResponse test() {
|
||||
|
|
|
|||
|
|
@ -108,7 +108,9 @@ public class QualFilingGatewayImpl implements QualFilingGateway {
|
|||
wrapper.eq(QualFilingDO::getOrgId, query.getOrgId());
|
||||
}
|
||||
if (StringUtils.hasText(query.getFilingNo())) {
|
||||
wrapper.eq(QualFilingDO::getFilingNo, query.getFilingNo());
|
||||
// 暂无编号数据, 使用id查询
|
||||
wrapper.eq(QualFilingDO::getId, query.getFilingNo());
|
||||
// wrapper.eq(QualFilingDO::getFilingNo, query.getFilingNo());
|
||||
}
|
||||
if (StringUtils.hasText(query.getFilingUnitName())) {
|
||||
wrapper.like(QualFilingDO::getFilingUnitName, query.getFilingUnitName());
|
||||
|
|
@ -171,9 +173,15 @@ public class QualFilingGatewayImpl implements QualFilingGateway {
|
|||
if (Objects.nonNull(dataObject.getId())) {
|
||||
// 编辑
|
||||
InsertFieldDefaults.applyForUpdate(dataObject);
|
||||
if (dataObject.getFilingStatusCode() == 2) {
|
||||
dataObject.setSubmitTime(LocalDateTime.now());
|
||||
}
|
||||
qualFilingMapper.updateById(dataObject);
|
||||
} else {
|
||||
InsertFieldDefaults.apply(dataObject);
|
||||
if (dataObject.getFilingStatusCode() == 2) {
|
||||
dataObject.setSubmitTime(LocalDateTime.now());
|
||||
}
|
||||
qualFilingMapper.insert(dataObject);
|
||||
}
|
||||
if (Objects.isNull(dataObject.getId())) {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
# 线上 prod 专用配置（打包进 jar，不依赖项目内 nacos/ 目录）
|
||||
# 解决 FileStorageRuntimeException: 没有找到对应的存储平台！platform:local
|
||||
# OSS 凭证优先取 Nacos config-common.common.aliyun.oss，取不到时用下方默认值
|
||||
# OSS 与本地开发环境保持一致（test-dragon-yf-pub）
|
||||
|
||||
dromara:
|
||||
x-file-storage:
|
||||
|
|
@ -9,9 +8,9 @@ dromara:
|
|||
aliyun-oss:
|
||||
- platform: aliyun-oss-1
|
||||
enable-storage: true
|
||||
access-key: ${common.aliyun.oss.accessKeyId:LTAI5tP6UnjpDRBjsUaxbLz9}
|
||||
secret-key: ${common.aliyun.oss.accessKeySecret:9XCpOutOC1lTE7E4twbUOHGzaxoMRz}
|
||||
access-key: LTAI5tFerUgBCLEbXtinDD6d
|
||||
secret-key: XyGVNV2RvW8U3ceoJDiy9A9oLvCGYp
|
||||
end-point: oss-cn-hangzhou.aliyuncs.com
|
||||
bucket-name: ${common.aliyun.oss.bucketName:cqqypx}
|
||||
domain: https://${common.aliyun.oss.bucketName:cqqypx}.oss-cn-hangzhou.aliyuncs.com/
|
||||
bucket-name: test-dragon-yf-pub
|
||||
domain: https://test-dragon-yf-pub.oss-cn-hangzhou.aliyuncs.com/
|
||||
base-path: jjb/
|
||||
|
|
|
|||
|
|
@ -5,7 +5,8 @@
|
|||
banner: false
|
||||
db-config:
|
||||
id-type: assign_id
|
||||
logic-delete-value: 1
|
||||
logic-not-delete-value: 0
|
||||
logic-delete-field: deleteEnum
|
||||
logic-delete-value: "true"
|
||||
logic-not-delete-value: "false"
|
||||
configuration:
|
||||
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/7/8 15:29:29] App_Identifier[safetyEval]"><meta charset="UTF-8"/><meta name="renderer" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/><meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><title>--</title><script>(function () {
|
||||
<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/7/8 16:47:20] App_Identifier[safetyEval]"><meta charset="UTF-8"/><meta name="renderer" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/><meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><title>--</title><script>(function () {
|
||||
const APP_ENV = {
|
||||
antd: {
|
||||
'ant-prefix': 'micro-temp',
|
||||
|
|
@ -89,4 +89,4 @@
|
|||
},
|
||||
|
||||
}
|
||||
}</script><script defer="defer" src="/safetyEval/static/js/379.7b4c2533d0a3b689.js"></script><script defer="defer" src="/safetyEval/static/js/121.ae75e71830bf4ae0.js"></script><script defer="defer" src="/safetyEval/static/js/289.f12da2fe2f6ad2ae.js"></script><script defer="defer" src="/safetyEval/static/js/main.a42edbbd465b6cbd.js"></script><link href="/safetyEval/static/css/main.cb6068c6562f0d94.css" rel="stylesheet"></head><body><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative;overflow-y: auto"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息 */console.log("%c@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/7/8 15:29:29] App_Identifier[safetyEval] Frontend_Branch[dev] Backend_Branch[dev]", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>
|
||||
}</script><script defer="defer" src="/safetyEval/static/js/934.ada55f776be86394.js"></script><script defer="defer" src="/safetyEval/static/js/121.ae75e71830bf4ae0.js"></script><script defer="defer" src="/safetyEval/static/js/289.f12da2fe2f6ad2ae.js"></script><script defer="defer" src="/safetyEval/static/js/main.013ab28d5c8d9507.js"></script><link href="/safetyEval/static/css/main.cb6068c6562f0d94.css" rel="stylesheet"></head><body><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative;overflow-y: auto"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息 */console.log("%c@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/7/8 16:47:20] App_Identifier[safetyEval] Frontend_Branch[dev] Backend_Branch[dev]", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>
|
||||
|
|
@ -1 +1 @@
|
|||
module.exports={javaGit:"http://47.92.113.182:3000/cq_anquan/safety-eval-service.git",javaGitName:"safety-eval-service",environment:{development:{javaGitBranch:"dev",API_HOST:"http://192.168.0.152"},production:{javaGitBranch:"dev",API_HOST:""}},appIdentifier:"safetyEval",contextInject:{appKey:"",fileUrl:"https://skqhdg.porthebei.com:9004/file/uploadFiles2/"},windowInject:{title:"微应用模板",links:[],element:{root:{id:"root"}},scripts:[]},server:{port:"8081",host:"192.168.0.187",open:!1},framework:{antd:{"ant-prefix":"micro-temp",fontFamily:"PingFangSC-Regular",colorPrimary:"#1677ff",borderRadius:2}},webpackConfig:{htmlWebpackPluginOption:{inject:!0}}};
|
||||
module.exports={javaGit:"http://47.92.113.182:3000/cq_anquan/safety-eval-service.git",javaGitName:"safety-eval-service",environment:{development:{javaGitBranch:"dev",API_HOST:"http://192.168.0.103"},production:{javaGitBranch:"dev",API_HOST:""}},appIdentifier:"safetyEval",contextInject:{appKey:"",fileUrl:"https://skqhdg.porthebei.com:9004/file/uploadFiles2/"},windowInject:{title:"微应用模板",links:[],element:{root:{id:"root"}},scripts:[]},server:{port:"8081",host:"192.168.0.187",open:!1},framework:{antd:{"ant-prefix":"micro-temp",fontFamily:"PingFangSC-Regular",colorPrimary:"#1677ff",borderRadius:2}},webpackConfig:{htmlWebpackPluginOption:{inject:!0}}};
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue