Skip to content

Z
zrch-risk-39
提交 2ca4fbe4 authored 作者: kxjia's avatar kxjia
浏览文件
操作

Merge branch 'master' of http://47.97.51.208/root/zrch-risk-39

上级 19686bd7 da0976ba
隐藏空白字符变更
内嵌 并排
正在显示 包含 250 行增加 和 168 行删除
zrch-risk-client-39/src/views/flowable/task/todo/components/TodoIndex.vue
浏览文件 @ 2ca4fbe4
......@@ -590,7 +590,7 @@
//alert("dd"+isFixed.value);
// if (!isFixed.value) {
//alert("dd"+userType.value);
if (userType.value === 'user') {
submitData.values['approval'] = formData.checkSendUser;
submitData.values['copyUser'] = formData.copyUser;
......@@ -604,7 +604,12 @@
} else if (formData.checkSendRole) {
submitData.values['approval'] = formData.checkSendRole;
submitData.values['approvalType'] = 'role';
}else{
submitData.values['approval'] = formData.checkSendUser;
submitData.values['copyUser'] = formData.copyUser;
submitData.values['approvalType'] = 'user';
}
console.log("ssss why ----",submitData);
const result = await complete(submitData);
message.success('任务发送成功');
......
zrch-risk-client-39/src/views/mytaskflowcc/MyTaskFlowCc.api.ts
浏览文件 @ 2ca4fbe4
......@@ -11,6 +11,7 @@ enum Api {
deleteBatch = '/my/myTaskFlowCc/deleteBatch',
importExcel = '/my/myTaskFlowCc/importExcel',
exportXls = '/my/myTaskFlowCc/exportXls',
updateStatus = '/my/myTaskFlowCc/updateStatus',
}
/**
* 导出api
......@@ -62,3 +63,12 @@ export const saveOrUpdate = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.save;
return defHttp.post({url: url, params});
}
/**
* 抄送 抄阅 查看处理
* @param params
*/
export const updateStatus = (params) => {
return defHttp.delete({url: Api.updateStatus, params}, {joinParamsToUrl: true}).then(() => {
//handleSuccess();
});
}
zrch-risk-client-39/src/views/mytaskflowcc/MyTaskFlowCcList.vue
浏览文件 @ 2ca4fbe4
......@@ -68,7 +68,7 @@
import { useListPage } from '/@/hooks/system/useListPage'
import MyTaskFlowCcModal from './components/MyTaskFlowCcModal.vue'
import {columns, searchFormSchema, superQuerySchema} from './MyTaskFlowCc.data';
import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './MyTaskFlowCc.api';
import {list, deleteOne, batchDelete, getImportUrl,getExportUrl,updateStatus} from './MyTaskFlowCc.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import { useUserStore } from '/@/store/modules/user';
import { useMessage } from '/@/hooks/web/useMessage';
......@@ -265,6 +265,8 @@
const myTaskFlow = await getMyTaskFlow({ deploymentId: record.deployId, dataId: record.targetId });
const taskData = pickStartResult(myTaskFlow);
console.log("--------------myTaskFlow ",myTaskFlow);
if (!taskData || !taskData.taskId) {
message.error('未获取到待办任务信息');
return;
......@@ -281,6 +283,9 @@
isShowDrawer.value = true;
await nextTick();
refTodoIndex.value?.iniData?.(taskData);
updateStatus({id: record.id});
handleSuccess();
} catch (e) {
console.error('获取流程任务信息失败:', e);
message.error('获取任务信息失败，请重试');
......
zrch-risk-server-39/jeecg-module-system/jeecg-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java
浏览文件 @ 2ca4fbe4
......@@ -160,6 +160,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
}
if (DelegationState.PENDING.equals(task.getDelegationState())) {
taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.DELEGATE.getType(), taskVo.getComment());
taskService.resolveTask(taskVo.getTaskId(), taskVo.getValues());
......@@ -167,12 +168,12 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
} else {
// 获取流程变量
Map<String, Object> formValues = getProcessVariables(taskVo.getTaskId());
String zdmc="";
String zdval="";
String tasktitle="";
String zdmc = "";
String zdval = "";
String tasktitle = "";
if(formValues.get("dataName")==null){
if(formValues.get("_value")!=null) {
if (formValues.get("dataName") == null) {
if (formValues.get("_value") != null) {
Map zdv = (Map) formValues.get("_value");
zdmc = (String) zdv.get("dataName");
......@@ -180,10 +181,29 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
tasktitle = (String) zdv.get("tasktitle");
}
}else{
zdmc=(String)formValues.get("dataName");
zdval=formValues.get("dataId").toString();
tasktitle=(String)formValues.get("tasktitle");
} else {
zdmc = (String) formValues.get("dataName");
zdval = formValues.get("dataId").toString();
tasktitle = (String) formValues.get("tasktitle");
}
//处理多用户 多实例
String approval = ""; //发送人
Object approvalUserObject = taskVo.getValues().get("approval");
if (approvalUserObject != null) {
approval = approvalUserObject.toString();
}
// 2. 设置流程变量
Map<String, Object> variables = new HashMap<>();
List<String> approverIds=null;
if (!approval.equals("") && approval.indexOf(",") > 0) {
// 1. 接收前端数据
approverIds = Arrays.asList(approval.split(","));
// 2. 设置流程变量
variables.put("assigneeList", approverIds); // 对应BPMN里的collection
}
......@@ -191,90 +211,116 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
//Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
SysUser loginUser = iFlowThirdService.getLoginUser();
taskService.complete(taskVo.getTaskId(), taskVo.getValues());
if (!approval.equals("") && approval.indexOf(",") > 0) {
taskService.complete(taskVo.getTaskId(), variables);
List<Task> nextTask2List = taskService.createTaskQuery()
.processInstanceId(taskVo.getInstanceId())
.active().list();
for(int k=0;k<nextTask2List.size();k++){
Task ntaxk= nextTask2List.get(k);
taskService.setAssignee(ntaxk.getId(), approverIds.get(k));
}
} else {
taskService.complete(taskVo.getTaskId(), taskVo.getValues());
//处理抄送
String copyUser=""; //抄送人
String copyUser = ""; //抄送人
Object copyUserObject = taskVo.getValues().get("copyUser");
if(copyUserObject!=null) {
if (copyUserObject != null) {
copyUser = copyUserObject.toString();
}
String userType ="";
String approvalId="";
String userType = "";
String approvalId = "";
Object userTypeObject = taskVo.getValues().get("approvalType");
if(userTypeObject!=null) {
userType = userTypeObject.toString();
}
if (userTypeObject != null) {
userType = userTypeObject.toString();
}
Object approvalObject = taskVo.getValues().get("approval");
if(approvalObject!=null) {
if (approvalObject != null) {
approvalId = approvalObject.toString();
}
this.saveMyTaskFlowHis(task,userType,approvalId,cdate,loginUser.getId(),ProcessConstants.TASK_TYPE_HAND,OptionType,copyUser,ProcessConstants.OPTION_TYPE_CC);
this.saveMyTaskFlowHis(task, userType, approvalId, cdate, loginUser.getId(), ProcessConstants.TASK_TYPE_HAND, OptionType, copyUser, ProcessConstants.OPTION_TYPE_CC);
FlowForm flowForm=sysDeployFormService.selectSysDeployFormByDeployId(deploymentId);
FlowForm flowForm = sysDeployFormService.selectSysDeployFormByDeployId(deploymentId);
List<Task> task2List = taskService.createTaskQuery().processInstanceId(taskVo.getInstanceId()).active().list();
Task nextTask = null;/**taskService.createTaskQuery()
.processInstanceId(taskVo.getInstanceId())
.singleResult();*/
if (CollUtil.isNotEmpty(task2List)){
nextTask = task2List.get(0);
}
if (nextTask != null) {
Task nextTask = taskService.createTaskQuery()
.processInstanceId(taskVo.getInstanceId())
.singleResult();
if(nextTask!=null){
if (task.getTaskDefinitionKey().equals(nextTask.getTaskDefinitionKey())){
//* 当前节点是会签节点，没有走完
if(userType.equals("user")) {
}else{
if (userType.equals("user")) {
taskService.setAssignee(nextTask.getId(), approvalId);
} else {
taskService.addCandidateGroup(nextTask.getId(),approvalId);
taskService.addCandidateGroup(nextTask.getId(), approvalId);
}
}
this.saveMyTaskFlow(task.getId(),nextTask,userType,approvalId,"待"+OptionType,null);
this.saveMyTaskFlow(task.getId(), nextTask, userType, approvalId, "待" + OptionType, null);
if(flowForm!=null){
if (flowForm != null) {
String tabname= flowForm.getFormTableName();
if(tabname!=null&&!tabname.equals("")&&zdmc!=null&&!zdmc.equals("")&&zdval!=null&&!zdval.equals("")){
String tabname = flowForm.getFormTableName();
if (tabname != null && !tabname.equals("") && zdmc != null && !zdmc.equals("") && zdval != null && !zdval.equals("")) {
String formContent=zdmc+"="+zdval;
FlowForm flowFormben=new FlowForm();
flowFormben.setFormTableName(tabname);
flowFormben.setFormContent(formContent);
flowFormben.setFormTp("2");
flowFormben.setFormUrl(deploymentId);
if(tabname!=null&&tabname.equals("st_plan_man")){
flowFormben.setFormRules(nextTask.getName());
}else{
flowFormben.setFormRules(null);
}
String formContent = zdmc + "=" + zdval;
FlowForm flowFormben = new FlowForm();
flowFormben.setFormTableName(tabname);
flowFormben.setFormContent(formContent);
flowFormben.setFormTp("2");
flowFormben.setFormUrl(deploymentId);
if (tabname != null && tabname.equals("st_plan_man")) {
flowFormben.setFormRules(nextTask.getName());
} else {
flowFormben.setFormRules(null);
}
//formRules 传递节点名
sysDeployFormService.updateBisTabBpmStatus(flowFormben);
//formRules 传递节点名
sysDeployFormService.updateBisTabBpmStatus(flowFormben);
}
}
}
}else{
//是最后一个 id 判断是最后一个节点
if(flowForm!=null){
} else {
//是最后一个 id 判断是最后一个节点
if (flowForm != null) {
String tabname= flowForm.getFormTableName();
if(tabname!=null&&!tabname.equals("")&&zdmc!=null&&!zdmc.equals("")&&zdval!=null&&!zdval.equals("")){
String formContent=zdmc+"="+zdval;
FlowForm flowFormben=new FlowForm();
flowFormben.setFormTableName(tabname);
flowFormben.setFormContent(formContent);
flowFormben.setFormTp("3");
flowFormben.setFormUrl(deploymentId);
flowFormben.setFormRules("");
sysDeployFormService.updateBisTabBpmStatus(flowFormben);
}
String tabname = flowForm.getFormTableName();
if (tabname != null && !tabname.equals("") && zdmc != null && !zdmc.equals("") && zdval != null && !zdval.equals("")) {
String formContent = zdmc + "=" + zdval;
FlowForm flowFormben = new FlowForm();
flowFormben.setFormTableName(tabname);
flowFormben.setFormContent(formContent);
flowFormben.setFormTp("3");
flowFormben.setFormUrl(deploymentId);
flowFormben.setFormRules("");
sysDeployFormService.updateBisTabBpmStatus(flowFormben);
}
}
}
}
}
}
......@@ -1679,17 +1725,18 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
if (Objects.nonNull(multiInstance)) {
// 会签 多实例
String collectionString = multiInstance.getInputDataItem();
if(values!=null){
Object colObj = values.get(collectionString);
List<String> userNameList = null;
if(colObj!=null){
if (colObj != null) {
userNameList = (List) colObj;
}
if (CollUtil.isNotEmpty(userNameList)){
if (CollUtil.isNotEmpty(userNameList)) {
// 待办人员从变量中获取 否则就是节点中配置的用户 sysUserFromTask
List<SysUser> userList = Lists.newArrayList();
for (String username : userNameList) {
SysUser userByUsername = iFlowThirdService.getUserByUsername(username);
if (userByUsername==null){
if (userByUsername == null) {
throw new CustomException(username + " 用户名未找到");
} else {
userList.add(userByUsername);
......@@ -1699,8 +1746,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
} else {
// 变量中没有传入，写入节点中配置的用户
List<String> collect_username = sysUserFromTask.stream().map(SysUser::getUsername).collect(Collectors.toList());
values.put(collectionString,collect_username);
values.put(collectionString, collect_username);
}
}
} else {
// todo 读取自定义节点属性做些啥？
//String dataType = userTask.getAttributeValue(ProcessConstants.NAMASPASE, ProcessConstants.PROCESS_CUSTOM_DATA_TYPE);
......@@ -2794,103 +2842,103 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
zdval=formValues.get("dataId").toString();
tasktitle=(String)formValues.get("tasktitle");
}
Long formId = Long.parseLong(nextTask.getFormKey());
FlowForm sysForm = flowFormService.getById(formId); // 假设有这个方法
if(nextTask.getFormKey()!=null) {
Long formId = Long.parseLong(nextTask.getFormKey());
FlowForm sysForm = flowFormService.getById(formId); // 假设有这个方法
MyTask myTask = new MyTask();
if(userType.equals("user")) {
myTask.setUid(approvalId);
} else {
myTask.setRoleid(approvalId);
}
myTask.setTp(5);
myTask.setTarget(nextTask.getName());
if(zdval!=null&&!zdval.equals("")){
myTask.setTargetId(zdval); //zdval
}
myTask.setStTime(new Date());
myTask.setTaskName(messageTaskName);
myTask.setName(nextTask.getName());
myTask.setSta(0);
myTask.setPriority("M");
myTask.setDes("");
//myTask.setLinkAddr("/project/plan/StPlanManList?"+zdmc+"="+zdval);
if(sysForm!=null){
if(sysForm.getFormTp().equals("2")){
myTask.setLinkAddr(sysForm.getFormListurl());
}else{
myTask.setLinkAddr("/flowable/task/todo/index");
MyTask myTask = new MyTask();
if (userType.equals("user")) {
myTask.setUid(approvalId);
} else {
myTask.setRoleid(approvalId);
}
}
myTask.setTp(5);
myTask.setTarget(nextTask.getName());
if (zdval != null && !zdval.equals("")) {
myTask.setTargetId(zdval); //zdval
}
myTaskService.save(myTask);
myTask.setStTime(new Date());
myTask.setTaskName(messageTaskName);
myTask.setName(nextTask.getName());
myTask.setSta(0);
myTask.setPriority("M");
myTask.setDes("");
//myTask.setLinkAddr("/project/plan/StPlanManList?"+zdmc+"="+zdval);
if (sysForm != null) {
if (sysForm.getFormTp().equals("2")) {
myTask.setLinkAddr(sysForm.getFormListurl());
} else {
myTask.setLinkAddr("/flowable/task/todo/index");
}
}
myTaskService.save(myTask);
//有了以上信息，可以向相关表写入 相关信息了
MyTaskFlow taskFlow = new MyTaskFlow();
taskFlow.setTaskId(nextTask.getId());
taskFlow.setProcDefId(nextTask.getProcessDefinitionId());
taskFlow.setProcInsId(nextTask.getProcessInstanceId());
taskFlow.setExecutionId(nextTask.getExecutionId());
if (zdval != null && !zdval.equals("")) {
taskFlow.setTargetId(zdval);
}
//有了以上信息，可以向相关表写入 相关信息了
MyTaskFlow taskFlow=new MyTaskFlow();
taskFlow.setTaskId(nextTask.getId());
taskFlow.setProcDefId(nextTask.getProcessDefinitionId());
taskFlow.setProcInsId(nextTask.getProcessInstanceId());
taskFlow.setExecutionId(nextTask.getExecutionId());
if(zdval!=null&&!zdval.equals("")){
taskFlow.setTargetId(zdval);
}
taskFlow.setDeployId(deploymentId);
taskFlow.setFormTableName(sysForm.getFormTableName());
if (userType.equals("user")) {
taskFlow.setUid(approvalId);
} else {
taskFlow.setRoleid(approvalId);
}
taskFlow.setDeployId(deploymentId);
taskFlow.setFormTableName(sysForm.getFormTableName());
if(userType.equals("user")) {
taskFlow.setUid(approvalId);
} else {
taskFlow.setRoleid(approvalId);
}
taskFlow.setTaskDefinitionKey(nextTask.getTaskDefinitionKey());
taskFlow.setTaskDefinitionKey(nextTask.getTaskDefinitionKey());
myTaskFlowService.save(taskFlow);
myTaskFlowService.save(taskFlow);
//写抄送信息
if (copyUser != null && !copyUser.equals("")) {
MyTaskFlowCc myTaskFlowCc = new MyTaskFlowCc();
myTaskFlowCc.setCcid(copyUser);
myTaskFlowCc.setTaskId(nextTask.getId());
myTaskFlowCc.setProcDefId(nextTask.getProcessDefinitionId());
myTaskFlowCc.setProcInsId(nextTask.getProcessInstanceId());
myTaskFlowCc.setExecutionId(nextTask.getExecutionId());
if (zdval != null && !zdval.equals("")) {
myTaskFlowCc.setTargetId(zdval);
}
//写抄送信息
if(copyUser!=null&&!copyUser.equals("")){
MyTaskFlowCc myTaskFlowCc=new MyTaskFlowCc();
myTaskFlowCc.setCcid(copyUser);
myTaskFlowCc.setTaskId(nextTask.getId());
myTaskFlowCc.setProcDefId(nextTask.getProcessDefinitionId());
myTaskFlowCc.setProcInsId(nextTask.getProcessInstanceId());
myTaskFlowCc.setExecutionId(nextTask.getExecutionId());
if(zdval!=null&&!zdval.equals("")){
myTaskFlowCc.setTargetId(zdval);
}
myTaskFlowCc.setDeployId(deploymentId);
myTaskFlowCc.setFormTableName(sysForm.getFormTableName());
if (userType.equals("user")) {
myTaskFlowCc.setUid(approvalId);
} else {
myTaskFlowCc.setRoleid(approvalId);
}
myTaskFlowCc.setDeployId(deploymentId);
myTaskFlowCc.setFormTableName(sysForm.getFormTableName());
if(userType.equals("user")) {
myTaskFlowCc.setUid(approvalId);
} else {
myTaskFlowCc.setRoleid(approvalId);
}
myTaskFlowCc.setTaskDefinitionKey(nextTask.getTaskDefinitionKey());
myTaskFlowCc.setTaskDefinitionKey(nextTask.getTaskDefinitionKey());
myTaskFlowCcService.save(myTaskFlowCc);
myTaskFlowCcService.save(myTaskFlowCc);
}
}
String tabname = sysForm.getFormTableName();
if (tabname != null && !tabname.equals("") && zdmc != null && !zdmc.equals("") && zdval != null && !zdval.equals("")) {
String formContent = zdmc + "=" + zdval;
FlowForm flowFormben = new FlowForm();
flowFormben.setFormTableName(tabname);
flowFormben.setFormContent(formContent);
flowFormben.setFormTp(approvalId);
String tabname= sysForm.getFormTableName();
if(tabname!=null&&!tabname.equals("")&&zdmc!=null&&!zdmc.equals("")&&zdval!=null&&!zdval.equals("")){
String formContent=zdmc+"="+zdval;
FlowForm flowFormben=new FlowForm();
flowFormben.setFormTableName(tabname);
flowFormben.setFormContent(formContent);
flowFormben.setFormTp(approvalId);
sysDeployFormService.updateBisTabUid(flowFormben);
}
sysDeployFormService.updateBisTabUid(flowFormben);
}
......@@ -2948,12 +2996,15 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
}
taskFlowHis.setDeployId(DeployId);
FlowForm tsysForm =null;
if(task.getFormKey()!=null) {
Long tformId = Long.parseLong(task.getFormKey());
tsysForm = flowFormService.getById(tformId); // 假设有这个方法
if (tsysForm != null && tsysForm.getFormTableName() != null) {
taskFlowHis.setFormTableName(tsysForm.getFormTableName());
}
Long tformId = Long.parseLong(task.getFormKey());
FlowForm tsysForm = flowFormService.getById(tformId); // 假设有这个方法
if(tsysForm!=null&&tsysForm.getFormTableName()!=null){
taskFlowHis.setFormTableName(tsysForm.getFormTableName());
}
if(userType.equals("user")) {
taskFlowHis.setUid(approvalId);
......@@ -2977,24 +3028,24 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
//写抄送信息
if(copyUser!=null&&!copyUser.equals("")){
MyTaskFlowCc myTaskFlowCc=new MyTaskFlowCc();
if(copyUser!=null&&!copyUser.equals("")) {
MyTaskFlowCc myTaskFlowCc = new MyTaskFlowCc();
myTaskFlowCc.setCcid(copyUser);
myTaskFlowCc.setTaskId(task.getId());
myTaskFlowCc.setProcDefId(task.getProcessDefinitionId());
myTaskFlowCc.setProcInsId(task.getProcessInstanceId());
myTaskFlowCc.setExecutionId(task.getExecutionId());
if(zdval!=null&&!zdval.equals("")){
if (zdval != null && !zdval.equals("")) {
myTaskFlowCc.setTargetId(zdval);
}
myTaskFlowCc.setDeployId(DeployId);
if(tsysForm!=null&&tsysForm.getFormTableName()!=null){
if (tsysForm != null && tsysForm.getFormTableName() != null) {
myTaskFlowCc.setFormTableName(tsysForm.getFormTableName());
}
if(userType.equals("user")) {
if (userType.equals("user")) {
myTaskFlowCc.setUid(approvalId);
} else {
myTaskFlowCc.setRoleid(approvalId);
......@@ -3012,6 +3063,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
}
}
}
......
zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/my/controller/MyTaskFlowCcController.java
浏览文件 @ 2ca4fbe4
package org.jeecg.modules.stm.my.controller;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
......@@ -179,4 +176,16 @@ public class MyTaskFlowCcController extends JeecgController<MyTaskFlowCc, IMyTas
return super.importExcel(request, response, MyTaskFlowCc.class);
}
@DeleteMapping(value = "/updateStatus")
public void updateStatus(@RequestParam(name="id",required=true) String id) {
MyTaskFlowCc myTaskFlowCc=new MyTaskFlowCc();
myTaskFlowCc.setId(Integer.valueOf(id));
myTaskFlowCc.setReadTime(new Date());
myTaskFlowCc.setStatus("1");
myTaskFlowCcService.updateById(myTaskFlowCc);
}
}
zrch-risk-server-39/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
浏览文件 @ 2ca4fbe4
......@@ -33,9 +33,9 @@ flowable:
# enabled: false
spring:
# main:
# # 启动加速 (建议开发环境，开启后flyway自动升级失效)
# lazy-initialization: true
# main:
# # 启动加速 (建议开发环境，开启后flyway自动升级失效)
# lazy-initialization: true
liquibase:
enabled: false
flyway:
......@@ -61,7 +61,7 @@ spring:
mail.smtp.writetimeout: 10000 # 写入超时（毫秒）
mail.smtp.auth: true
smtp.ssl.enable: true
# mail.debug: true # 启用调试模式(查看详细日志)
# mail.debug: true # 启用调试模式(查看详细日志)
## quartz定时任务,采用数据库方式
quartz:
job-store-type: jdbc
......@@ -166,19 +166,19 @@ spring:
slow-sql-millis: 5000
datasource:
master:
# url: jdbc:mysql://47.98.203.68:3306/zrch_stm_db_3.9?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
# username: root
# password: ZhongRunChangHong/123
# url: jdbc:mysql://47.98.203.68:3306/zrch_stm_db_3.9?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
# username: root
# password: ZhongRunChangHong/123
url: jdbc:mysql://localhost:3306/zrch_stm_db_3.9_new?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root
password: 123456
driver-class-name: com.mysql.cj.jdbc.Driver
# # shardingjdbc数据源
# sharding-db:
# driver-class-name: org.apache.shardingsphere.driver.ShardingSphereDriver
# url: jdbc:shardingsphere:classpath:sharding.yaml
# # shardingjdbc数据源
# sharding-db:
# driver-class-name: org.apache.shardingsphere.driver.ShardingSphereDriver
# url: jdbc:shardingsphere:classpath:sharding.yaml
#redis 配置
data:
redis:
......@@ -296,7 +296,7 @@ jeecg:
#大屏报表参数设置
jmreport:
#多租户模式，默认值为空(created:按照创建人隔离、tenant:按照租户隔离) (v1.6.2+ 新增)
saasMode:
saasMode:
# 平台上线安全配置(v1.6.2+ 新增)
firewall:
# 数据源安全 (开启后，不允许使用平台数据源、SQL解析加签并且不允许查询数据库)
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论