diff --git a/dq-financial-crms/src/main/resources/bootstrap.properties b/dq-financial-crms/src/main/resources/bootstrap.properties index 5c07b6fc..7a214b20 100644 --- a/dq-financial-crms/src/main/resources/bootstrap.properties +++ b/dq-financial-crms/src/main/resources/bootstrap.properties @@ -1,7 +1,7 @@ #服务名称 spring.application.name=dq-financial-crms #配置中心地址 -spring.cloud.nacos.config.server-addr=192.168.31.140:8848 +spring.cloud.nacos.config.server-addr=127.0.0.1:8848 spring.cloud.nacos.config.file-extension=yml #redis配置 spring.redis.host=127.0.0.1 diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyForController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyForController.java new file mode 100644 index 00000000..674ee466 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyForController.java @@ -0,0 +1,21 @@ +package com.daqing.financial.guarantee.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 抄送详情表 前端控制器 + *

+ * + * @author Qyq + * @since 2021-01-15 + */ +@RestController +@RequestMapping("/dg-copy-for") +public class DgCopyForController { + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyUserController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyUserController.java new file mode 100644 index 00000000..9b098043 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyUserController.java @@ -0,0 +1,21 @@ +package com.daqing.financial.guarantee.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 抄送用户表 前端控制器 + *

+ * + * @author Qyq + * @since 2021-01-15 + */ +@RestController +@RequestMapping("/dg-copy-user") +public class DgCopyUserController { + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessUserController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessUserController.java new file mode 100644 index 00000000..80134a6a --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessUserController.java @@ -0,0 +1,21 @@ +package com.daqing.financial.guarantee.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 业务模块选择抄送用户表 前端控制器 + *

+ * + * @author Qyq + * @since 2021-01-15 + */ +@RestController +@RequestMapping("/dg-process-user") +public class DgProcessUserController { + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgCopyForMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgCopyForMapper.java new file mode 100644 index 00000000..89bc4295 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgCopyForMapper.java @@ -0,0 +1,19 @@ +package com.daqing.financial.guarantee.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.daqing.framework.domain.guarantee.DgCopyFor; +import org.apache.ibatis.annotations.Mapper; + +/** + *

+ * 抄送详情表 Mapper 接口 + *

+ * + * @author Qyq + * @since 2021-01-15 + */ +@Mapper +public interface DgCopyForMapper extends BaseMapper { + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgCopyUserMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgCopyUserMapper.java new file mode 100644 index 00000000..520da2f2 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgCopyUserMapper.java @@ -0,0 +1,19 @@ +package com.daqing.financial.guarantee.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.daqing.framework.domain.guarantee.DgCopyUser; +import org.apache.ibatis.annotations.Mapper; + +/** + *

+ * 抄送用户表 Mapper 接口 + *

+ * + * @author Qyq + * @since 2021-01-15 + */ +@Mapper +public interface DgCopyUserMapper extends BaseMapper { + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgProcessUserMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgProcessUserMapper.java new file mode 100644 index 00000000..a05395d7 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgProcessUserMapper.java @@ -0,0 +1,19 @@ +package com.daqing.financial.guarantee.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.daqing.framework.domain.guarantee.DgProcessUser; +import org.apache.ibatis.annotations.Mapper; + +/** + *

+ * 业务模块选择抄送用户表 Mapper 接口 + *

+ * + * @author Qyq + * @since 2021-01-15 + */ +@Mapper +public interface DgProcessUserMapper extends BaseMapper { + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgCopyForService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgCopyForService.java new file mode 100644 index 00000000..0a9cd5b9 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgCopyForService.java @@ -0,0 +1,17 @@ +package com.daqing.financial.guarantee.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.daqing.framework.domain.guarantee.DgCopyFor; + +/** + *

+ * 抄送详情表 服务类 + *

+ * + * @author Qyq + * @since 2021-01-15 + */ +public interface IDgCopyForService extends IService { + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgCopyUserService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgCopyUserService.java new file mode 100644 index 00000000..85ea827d --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgCopyUserService.java @@ -0,0 +1,17 @@ +package com.daqing.financial.guarantee.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.daqing.framework.domain.guarantee.DgCopyUser; + +/** + *

+ * 抄送用户表 服务类 + *

+ * + * @author Qyq + * @since 2021-01-15 + */ +public interface IDgCopyUserService extends IService { + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgProcessUserService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgProcessUserService.java new file mode 100644 index 00000000..3fadb8af --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgProcessUserService.java @@ -0,0 +1,17 @@ +package com.daqing.financial.guarantee.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.daqing.framework.domain.guarantee.DgProcessUser; + +/** + *

+ * 业务模块选择抄送用户表 服务类 + *

+ * + * @author Qyq + * @since 2021-01-15 + */ +public interface IDgProcessUserService extends IService { + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgCopyForServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgCopyForServiceImpl.java new file mode 100644 index 00000000..15ad3039 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgCopyForServiceImpl.java @@ -0,0 +1,20 @@ +package com.daqing.financial.guarantee.service.impl; + +import com.daqing.financial.guarantee.mapper.DgCopyForMapper; +import com.daqing.financial.guarantee.service.IDgCopyForService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.daqing.framework.domain.guarantee.DgCopyFor; +import org.springframework.stereotype.Service; + +/** + *

+ * 抄送详情表 服务实现类 + *

+ * + * @author Qyq + * @since 2021-01-15 + */ +@Service +public class DgCopyForServiceImpl extends ServiceImpl implements IDgCopyForService { + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgCopyUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgCopyUserServiceImpl.java new file mode 100644 index 00000000..d3401cc9 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgCopyUserServiceImpl.java @@ -0,0 +1,20 @@ +package com.daqing.financial.guarantee.service.impl; + +import com.daqing.financial.guarantee.mapper.DgCopyUserMapper; +import com.daqing.financial.guarantee.service.IDgCopyUserService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.daqing.framework.domain.guarantee.DgCopyUser; +import org.springframework.stereotype.Service; + +/** + *

+ * 抄送用户表 服务实现类 + *

+ * + * @author Qyq + * @since 2021-01-15 + */ +@Service +public class DgCopyUserServiceImpl extends ServiceImpl implements IDgCopyUserService { + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgProcessUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgProcessUserServiceImpl.java new file mode 100644 index 00000000..fb8cad4c --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgProcessUserServiceImpl.java @@ -0,0 +1,20 @@ +package com.daqing.financial.guarantee.service.impl; + +import com.daqing.financial.guarantee.mapper.DgProcessUserMapper; +import com.daqing.financial.guarantee.service.IDgProcessUserService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.daqing.framework.domain.guarantee.DgProcessUser; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务模块选择抄送用户表 服务实现类 + *

+ * + * @author Qyq + * @since 2021-01-15 + */ +@Service +public class DgProcessUserServiceImpl extends ServiceImpl implements IDgProcessUserService { + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/MyBatisPlusCodeGenerator.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/MyBatisPlusCodeGenerator.java index c071c1d4..06bfebc6 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/MyBatisPlusCodeGenerator.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/MyBatisPlusCodeGenerator.java @@ -25,7 +25,7 @@ public class MyBatisPlusCodeGenerator { public static final String PACKAGE_NAME = "com.daqing.financial.guarantee"; public static void main(String[] args) { - String[] tables = new String[] {"dg_assets_money"};//表名数组 + String[] tables = new String[] {"dg_copy_for","dg_process_user","dg_copy_user"};//表名数组 String[] tablePrefixs = new String[] {""};//去掉前缀 executeCode(PACKAGE_NAME,tables,tablePrefixs); } diff --git a/dq-financial-guarantee/src/main/resources/bootstrap.properties b/dq-financial-guarantee/src/main/resources/bootstrap.properties index 1ea5bbcd..7bad9204 100644 --- a/dq-financial-guarantee/src/main/resources/bootstrap.properties +++ b/dq-financial-guarantee/src/main/resources/bootstrap.properties @@ -1,7 +1,7 @@ #服务名称 spring.application.name=dq-financial-guarantee #配置中心地址 -spring.cloud.nacos.config.server-addr=192.168.31.140:8848 +spring.cloud.nacos.config.server-addr=127.0.0.1:8848 spring.cloud.nacos.config.file-extension=yml #redis配置 spring.redis.host=127.0.0.1 diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgCopyForMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgCopyForMapper.xml new file mode 100644 index 00000000..842cb068 --- /dev/null +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgCopyForMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgCopyUserMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgCopyUserMapper.xml new file mode 100644 index 00000000..2e17964c --- /dev/null +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgCopyUserMapper.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgProcessUserMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgProcessUserMapper.xml new file mode 100644 index 00000000..716d486d --- /dev/null +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgProcessUserMapper.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java index 67ee76f7..a761da71 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java @@ -156,7 +156,7 @@ public class UserLoginController implements UserLoginControllerApi { headerImg = URLDecoder.decode(imgUrl,encoder); //account = new String(username.getBytes("GBK"),"iso-8859-1"); log.info("account==========="+account+"headerImg============="+headerImg); - response.sendRedirect("http://www.huorantech.cn/dq/index.html#/login?token="+token+"&account="+account+"&headerImg="+headerImg); + response.sendRedirect("http://8.129.127.185/dq/index.html#/login?token="+token+"&account="+account+"&headerImg="+headerImg); //response.sendRedirect("http://www.huorantech.cn/dq/index.html#/Dashboard?token="+token+"&account="+account+"&headerImg="+headerImg); } }else { diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/HrmsAccessRecordsLogServiceImpl.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/HrmsAccessRecordsLogServiceImpl.java index 67a34190..69a4772b 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/HrmsAccessRecordsLogServiceImpl.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/HrmsAccessRecordsLogServiceImpl.java @@ -190,7 +190,7 @@ public class HrmsAccessRecordsLogServiceImpl extends ServiceImpl1时间段以及对应登录人数,或者2对应的2->3时间段以及对应的登录人数 String s1 = frontCompWithZore(2, i); String s2 = frontCompWithZore(2, i+1); @@ -202,14 +202,14 @@ public class HrmsAccessRecordsLogServiceImpl extends ServiceImpl imple if(dbUser == null){//openId不存在,返回绑定手机号页面,须另写绑定手机号接口 log.info("dbUser为空,openId不存在,请先绑定手机号哦~~~"); try { - response.sendRedirect("http://www.huorantech.cn/dq/index.html#/bind-phone?matched="+md5OpenId);//跳转绑定手机号页面 + //response.sendRedirect("http://www.huorantech.cn/dq/index.html#/bind-phone?matched="+md5OpenId);//跳转绑定手机号页面 + response.sendRedirect("http://8.129.127.185/dq/index.html#/bind-phone?matched="+md5OpenId);//跳转绑定手机号页面 } catch (IOException e) { e.printStackTrace(); } @@ -151,7 +152,8 @@ public class UserServiceImpl extends ServiceImpl imple if (countWeChatId > 0){ try { log.info("微信重复了,我走到了这里............................."); - response.sendRedirect("http://www.huorantech.cn/dq/index.html#/workbench-manpower?token="+token+"&message=1"); + //response.sendRedirect("http://www.huorantech.cn/dq/index.html#/workbench-manpower?token="+token+"&message=1"); + response.sendRedirect("http://8.129.127.185/dq/index.html#/workbench-manpower?token="+token+"&message=1"); } catch (IOException e) { e.printStackTrace(); } @@ -161,7 +163,8 @@ public class UserServiceImpl extends ServiceImpl imple if (result){ try { log.info("转发成功---------------------------------------"); - response.sendRedirect("http://www.huorantech.cn/dq/index.html#/workbench-manpower?token="+token); + //response.sendRedirect("http://www.huorantech.cn/dq/index.html#/workbench-manpower?token="+token); + response.sendRedirect("http://8.129.127.185/dq/index.html#/workbench-manpower?token="+token); }catch (IOException e){ e.printStackTrace(); } diff --git a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties index e78457bd..f9eefee2 100644 --- a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties +++ b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties @@ -1,7 +1,7 @@ #服务名称 spring.application.name=dq-financial-hrms-auth #配置中心地址 -spring.cloud.nacos.config.server-addr=192.168.31.140:8848 +spring.cloud.nacos.config.server-addr=127.0.0.1:8848 spring.cloud.nacos.config.file-extension=yml #redis配置 spring.redis.host=127.0.0.1 diff --git a/dq-financial-hrms/src/main/resources/bootstrap.properties b/dq-financial-hrms/src/main/resources/bootstrap.properties index 98937ed0..8c9c398e 100644 --- a/dq-financial-hrms/src/main/resources/bootstrap.properties +++ b/dq-financial-hrms/src/main/resources/bootstrap.properties @@ -1,7 +1,7 @@ ##服务名称 spring.application.name=dq-financial-hrms #配置中心地址 -spring.cloud.nacos.config.server-addr=192.168.31.140:8848 +spring.cloud.nacos.config.server-addr=127.0.0.1:8848 spring.cloud.nacos.config.file-extension=yml #redis配置 spring.redis.host=127.0.0.1 diff --git a/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java b/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java index e532e026..dd0830b8 100644 --- a/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java +++ b/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java @@ -33,16 +33,16 @@ public class PromptSuccess { public static final String UPLOAD_FILE_PATH = "//usr//local//nginx//html//admin//headImg//"; // linux图片存放路径 //public static final String IMAGE_URL_PATH = "http://www.huorantech.cn/headImg/"; // 数据库/预加载图片路径 - //public static final String IMAGE_URL_PATH = "http://8.129.127.185:8080/headImg/"; // 数据库/预加载图片路径 - public static final String IMAGE_URL_PATH = "http://47.107.237.129:8080/headImg/"; // 数据库/预加载图片路径 + public static final String IMAGE_URL_PATH = "http://8.129.127.185:8080/headImg/"; // 数据库/预加载图片路径 + //public static final String IMAGE_URL_PATH = "http://47.107.237.129:8080/headImg/"; // 数据库/预加载图片路径 public static final String[] LETTERS = {"A","B","C","D","E"}; // 员工姓名重复时自动加的字母,可再添加 public static final String STATUS_REFUSE = "拒绝"; //public static final String ENCLOSUREFILE_URL_PATH = "http://www.huorantech.cn/enclosureFile/"; // 附件文件存放路径 - //public static final String ENCLOSUREFILE_URL_PATH = "http://8.129.127.185:8080/enclosureFile/"; // 附件文件存放路径 - public static final String ENCLOSUREFILE_URL_PATH = "http://47.107.237.129:8080/enclosureFile/"; // 附件文件存放路径 + public static final String ENCLOSUREFILE_URL_PATH = "http://8.129.127.185:8080/enclosureFile/"; // 附件文件存放路径 + //public static final String ENCLOSUREFILE_URL_PATH = "http://47.107.237.129:8080/enclosureFile/"; // 附件文件存放路径 public static final String FILE_URL_PATH = "//usr//local//nginx//html//admin//enclosureFile//"; // 附件文件存放路径 diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgCopyFor.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgCopyFor.java new file mode 100644 index 00000000..88b74beb --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgCopyFor.java @@ -0,0 +1,81 @@ +package com.daqing.framework.domain.guarantee; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; + +/** + *

+ * 抄送详情表 + *

+ * + * @author Qyq + * @since 2021-01-15 + */ +@TableName("dg_copy_for") +public class DgCopyFor implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 业务id + */ + private Integer businessId; + + /** + * 业务模块进程id + */ + private Integer processId; + + /** + * 截图url + */ + private String picUrl; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + public Integer getBusinessId() { + return businessId; + } + + public void setBusinessId(Integer businessId) { + this.businessId = businessId; + } + public Integer getProcessId() { + return processId; + } + + public void setProcessId(Integer processId) { + this.processId = processId; + } + public String getPicUrl() { + return picUrl; + } + + public void setPicUrl(String picUrl) { + this.picUrl = picUrl; + } + + @Override + public String toString() { + return "DgCopyFor{" + + "id=" + id + + ", businessId=" + businessId + + ", processId=" + processId + + ", picUrl=" + picUrl + + "}"; + } +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgCopyUser.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgCopyUser.java new file mode 100644 index 00000000..9b283407 --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgCopyUser.java @@ -0,0 +1,68 @@ +package com.daqing.framework.domain.guarantee; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; + +/** + *

+ * 抄送用户表 + *

+ * + * @author Qyq + * @since 2021-01-15 + */ +@TableName("dg_copy_user") +public class DgCopyUser implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 抄送id + */ + private Integer copyId; + + /** + * 用户id + */ + private Integer userId; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + public Integer getCopyId() { + return copyId; + } + + public void setCopyId(Integer copyId) { + this.copyId = copyId; + } + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + @Override + public String toString() { + return "DgCopyUser{" + + "id=" + id + + ", copyId=" + copyId + + ", userId=" + userId + + "}"; + } +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgProcessUser.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgProcessUser.java new file mode 100644 index 00000000..bded2da9 --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgProcessUser.java @@ -0,0 +1,68 @@ +package com.daqing.framework.domain.guarantee; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; + +/** + *

+ * 业务模块选择抄送用户表 + *

+ * + * @author Qyq + * @since 2021-01-15 + */ +@TableName("dg_process_user") +public class DgProcessUser implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 业务模块id + */ + private Integer processId; + + /** + * 用户id + */ + private Integer userId; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + public Integer getProcessId() { + return processId; + } + + public void setProcessId(Integer processId) { + this.processId = processId; + } + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + @Override + public String toString() { + return "DgProcessUser{" + + "id=" + id + + ", processId=" + processId + + ", userId=" + userId + + "}"; + } +} diff --git a/dq-govern-gateway/src/main/resources/bootstrap.properties b/dq-govern-gateway/src/main/resources/bootstrap.properties index 9872b12e..6dea21cb 100644 --- a/dq-govern-gateway/src/main/resources/bootstrap.properties +++ b/dq-govern-gateway/src/main/resources/bootstrap.properties @@ -1,7 +1,7 @@ #服务名称 spring.application.name=dq-govern-gateway #配置中心地址 -spring.cloud.nacos.config.server-addr=192.168.31.140:8848 +spring.cloud.nacos.config.server-addr=127.0.0.1:8848 spring.cloud.nacos.config.file-extension=yml #redis配置 spring.redis.host=127.0.0.1 diff --git a/dq_financial_hrms/src/main/resources/mapper/hrauth/HrmsAccessRecordsLogMapper.xml b/dq_financial_hrms/src/main/resources/mapper/hrauth/HrmsAccessRecordsLogMapper.xml deleted file mode 100644 index a5118b31..00000000 --- a/dq_financial_hrms/src/main/resources/mapper/hrauth/HrmsAccessRecordsLogMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - -