备份企业信息，小程序登录接口处理

dq-financial-api/src/main/java/com/daqing/financial/guarantee/DgApplyAmountInfoControllerApi.java

@@ -26,8 +26,8 @@ public interface DgApplyAmountInfoControllerApi {
 /*    @ApiOperation(value = "业务申请")
     ResponseResult businessApplication(BusinessApplicationRequest businessApplication);*/
 
-    @ApiOperation(value = "上传文件")
-    ResponseResult uploadFile(MultipartFile[] files)throws IOException;
+/*    @ApiOperation(value = "上传文件")
+    ResponseResult uploadFile(MultipartFile[] files)throws IOException;*/
 
     @ApiOperation(value = "删除服务器文件")
     boolean deleteServerFile(String filePath);

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

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java

@@ -109,6 +109,7 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
     @PostMapping("/uploadFile")// 浏览器地址栏输入的路径
     @ResponseBody
     public ResponseResult uploadFile(@RequestParam("file")MultipartFile[] files) throws IOException {
+        System.out.println(" 文件名称： 来了来了");
         /**
          * MultipartFile类是用来接收前台传过来的文件，常用的方法如下：
          * String getContentType()          //获取文件MIME类型

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgBusinessCompanyController.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;
+
+/**
+ * <p>
+ * 业务关联企业表 前端控制器
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-01-27
+ */
+@RestController
+@RequestMapping("/dg-business-company")
+public class DgBusinessCompanyController {
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgBusinessCompanyMapper.java

@@ -0,0 +1,19 @@
+package com.daqing.financial.guarantee.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.daqing.framework.domain.guarantee.DgBusinessCompany;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 业务关联企业表 Mapper 接口
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-01-27
+ */
+@Mapper
+public interface DgBusinessCompanyMapper extends BaseMapper<DgBusinessCompany> {
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/BusinessApplicationRequest.java

@@ -209,4 +209,130 @@ public class BusinessApplicationRequest implements Serializable {
     @ApiModelProperty(value = "申请类型：0->员工申请；1->客户申请")
     private Integer applyType;
 
+    /**
+     * 注册资金（万元）
+     */
+    @ApiModelProperty(value = "注册资金（万元）")
+    private String registeredCapital;
+
+    /**
+     * 社会统一代码
+     */
+    @ApiModelProperty(value = "社会统一代码")
+    private String socialUnifiedCode;
+
+    /**
+     * 员工人数
+     */
+    @ApiModelProperty(value = "员工人数")
+    private String empNum;
+
+    /**
+     * 联系人
+     */
+    @ApiModelProperty(value = "联系人")
+    private String linkman;
+
+    /**
+     * 联系人的联系电话
+     */
+    @ApiModelProperty(value = "联系人的联系电话")
+    private String linkPhone;
+
+    /**
+     * 业务来源
+     */
+    @ApiModelProperty(value = "业务来源")
+    private String businessSource;
+
+    /**
+     * 经营范围
+     */
+    @ApiModelProperty(value = "经营范围")
+    private String businessScope;
+
+    /**
+     * 经营地址
+     */
+    @ApiModelProperty(value = "经营地址")
+    private String businessAddr;
+
+    /**
+     * 注册时间
+     */
+    @ApiModelProperty(value = "注册时间")
+    private Date registerTime;
+
+    /**
+     * 注册地址
+     */
+    @ApiModelProperty(value = "注册地址")
+    private String registerAddr;
+
+    /**
+     * 法人-身份证号
+     */
+    @ApiModelProperty(value = "法人-身份证号")
+    private String legalIdNumber;
+
+    /**
+     * 法人-户口所在地
+     */
+    @ApiModelProperty(value = "法人-户口所在地")
+    private String legalHukouAddr;
+
+    /**
+     * 法人-联系电话
+     */
+    @ApiModelProperty(value = "法人-联系电话")
+    private String legalPhone;
+
+    /**
+     * 法人-家庭住址
+     */
+    @ApiModelProperty(value = "法人-家庭住址")
+    private String legalHomeAddr;
+
+    /**
+     * 法人-性别 1、男，0、女
+     */
+    @ApiModelProperty(value = "法人-性别 1、男，0、女")
+    private Integer legalGender;
+
+    /**
+     * 法人-姓名
+     */
+    @ApiModelProperty(value = "法人-姓名")
+    private String legalName;
+
+    /**
+     * 客户编号
+     */
+    @ApiModelProperty(value = "客户编号")
+    private String code;
+
+    /**
+     * 客户类型：1、企业类型，0：个人类型
+     */
+    @ApiModelProperty(value = "客户类型：1、企业类型，0：个人类型")
+    private Integer type;
+
+    /**
+     * 客户名称
+     */
+    @ApiModelProperty(value = "客户名称")
+    private String name;
+
+    /**
+     * 联系地址(指个人的)
+     */
+    @ApiModelProperty(value = "联系地址(指个人的)")
+    private String addr;
+
+    /**
+     * 联系电话（指个人或企业的）
+     */
+    @ApiModelProperty(value = "联系电话（指个人或企业的）")
+    private String phone;
+
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/BusinessApplicationDetailResponse.java

@@ -3,6 +3,7 @@ package com.daqing.financial.guarantee.model.response;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.daqing.framework.domain.guarantee.DgApplyAmountInfo;
+import com.daqing.framework.domain.guarantee.DgBusinessCompany;
 import com.daqing.framework.domain.guarantee.DgEnclosureInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -31,8 +32,8 @@ public class BusinessApplicationDetailResponse implements Serializable {
     /**
      * 企业详细
      */
-    @ApiModelProperty(value = "企业详细")
-    private LinkedHashMap linkedHashMap;
+/*    @ApiModelProperty(value = "企业详细")
+    private LinkedHashMap linkedHashMap;*/
 
     /**
      * 附件详细
@@ -43,8 +44,11 @@ public class BusinessApplicationDetailResponse implements Serializable {
     /**
      * 关联人信息列表
      */
-    @ApiModelProperty(value = "关联人信息列表")
-    private LinkedHashMap linkedHashMap2;
+/*    @ApiModelProperty(value = "关联人信息列表")
+    private LinkedHashMap linkedHashMap2;*/
+
+    @ApiModelProperty(value = "备份企业详细")
+    private DgBusinessCompany dgBusinessCompany;
 
 
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgBusinessCompanyService.java

@@ -0,0 +1,17 @@
+package com.daqing.financial.guarantee.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.daqing.framework.domain.guarantee.DgBusinessCompany;
+
+/**
+ * <p>
+ * 业务关联企业表 服务类
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-01-27
+ */
+public interface IDgBusinessCompanyService extends IService<DgBusinessCompany> {
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java

@@ -31,6 +31,7 @@ import com.daqing.framework.util.RedisUtil;
 import com.daqing.framework.utils.PageUtils;
 import com.daqing.framework.utils.excel.ExcelUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -86,6 +87,8 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
     private DgBusinessProcessStatusMapper dgBusinessProcessStatusMapper;
     @Resource
     private DgApplyAmountInfoController dgApplyAmountInfoController;
+    @Resource
+    private DgBusinessCompanyMapper dgBusinessCompanyMapper;
 
     @Override
     public String getRoles() {
@@ -171,7 +174,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         }
         dgApplyAmountInfo.setBusinessCode(businessCode);
 
-        dgApplyAmountInfoMapper.insert(dgApplyAmountInfo);
+        int insert = dgApplyAmountInfoMapper.insert(dgApplyAmountInfo);
 
         //新增到业务列表
         DgApplyAmountList dgApplyAmountList = new DgApplyAmountList();
@@ -229,6 +232,12 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         dgEnclosureInfo.setInspectionPhotos(ArraysUtil.toString(businessApplication.getInspectionPhotos()));
         dgEnclosureInfoMapper.insert(dgEnclosureInfo);
 
+        //备份企业信息，以防企业信息改动从而影响业务信息变更
+        DgBusinessCompany dgBusinessCompany = new DgBusinessCompany();
+        BeanUtils.copyProperties(businessApplication,dgBusinessCompany);
+        dgBusinessCompany.setBusinessId(dgApplyAmountInfo.getId());
+        dgBusinessCompanyMapper.insert(dgBusinessCompany);
+
         //如果审批状态为审核中，操作状态为已发起，则往担保部经理添加一条待审核的记录
         if(dgApplyAmountList.getStatus().equals(StatusCode.SP_IN_REVIEW) && dgApplyAmountList.getOperatingStatus().equals(StatusCode.CZ_LAUNCH)){
             DgApplyAmountList applyAmountList = new DgApplyAmountList();
@@ -288,12 +297,16 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         }
         dgApplyAmountInfo.setRemark(dgApplyAmountList.getApplyContent());
 
-        DgApplyAmountInfoRequest applyAmountInfo = new DgApplyAmountInfoRequest();
+/*        DgApplyAmountInfoRequest applyAmountInfo = new DgApplyAmountInfoRequest();
         applyAmountInfo.setCompanyId(dgApplyAmountInfo.getCompanyId());
         //根据企业id查询企业详情
         ResponseResult result = crmsFeignService.queryCustomerInfoById(applyAmountInfo);
 
-        LinkedHashMap linkedList = (LinkedHashMap)result.getData();
+        LinkedHashMap linkedList = (LinkedHashMap)result.getData();*/
+
+        //根据业务id查询备份企业信息
+        DgBusinessCompany dgBusinessCompany = dgBusinessCompanyMapper.selectOne(new QueryWrapper<DgBusinessCompany>()
+                .eq("business_id", dgApplyAmountList.getBusinessId()));
 
         //查询附件详细，附件关联业务主键id
         DgEnclosureInfoResponse dgEnclosureInfo = dgEnclosureInfoMapper.selectByCompanyId(dgApplyAmountList.getBusinessId());
@@ -342,18 +355,10 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         dgEnclosureInfo.setMeetingMinutesList((List<String>) arr1List2.get(12));
         dgEnclosureInfo.setMarriageCopyList((List<String>) arr1List2.get(13));
 
-/*        int page=1;
-        int size=10;
-        //关联人信息列表展示
-        ResponseResult list = crmsFeignService.companyPersonalList(page,size,dgApplyAmountInfo.getCompanyId());
-        LinkedHashMap personalList = (LinkedHashMap)list.getData();
-        System.out.println("关联人信息列表======================="+personalList);*/
-
         BusinessApplicationDetailResponse businessApplicationDetail= new BusinessApplicationDetailResponse();
         businessApplicationDetail.setDgApplyAmountInfo(dgApplyAmountInfo);
         businessApplicationDetail.setDgEnclosureInfo(dgEnclosureInfo);
-        businessApplicationDetail.setLinkedHashMap(linkedList);
-        //businessApplicationDetail.setLinkedHashMap2(personalList);
+        businessApplicationDetail.setDgBusinessCompany(dgBusinessCompany);
         return businessApplicationDetail;
     }
 
@@ -453,6 +458,13 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         //根据业务id删除对应的附件信息
         dgEnclosureInfoMapper.delete(new QueryWrapper<DgEnclosureInfo>().eq("business_id",businessApplication.getBusinessId()));
 
+        //修改备份企业信息
+        DgBusinessCompany dgBusinessCompany = new DgBusinessCompany();
+        BeanUtils.copyProperties(businessApplication,dgBusinessCompany);
+        System.out.println("dgBusinessCompany============="+dgBusinessCompany);
+        dgBusinessCompanyMapper.update(dgBusinessCompany,new QueryWrapper<DgBusinessCompany>()
+                .eq("business_id",businessApplication.getBusinessId()));
+
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
         String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgBusinessCompanyServiceImpl.java

@@ -0,0 +1,20 @@
+package com.daqing.financial.guarantee.service.impl;
+
+import com.daqing.financial.guarantee.mapper.DgBusinessCompanyMapper;
+import com.daqing.financial.guarantee.service.IDgBusinessCompanyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.daqing.framework.domain.guarantee.DgBusinessCompany;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 业务关联企业表 服务实现类
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-01-27
+ */
+@Service
+public class DgBusinessCompanyServiceImpl extends ServiceImpl<DgBusinessCompanyMapper, DgBusinessCompany> implements IDgBusinessCompanyService {
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgCopyForServiceImpl.java

@@ -19,6 +19,7 @@ import com.daqing.framework.model.response.PromptSuccess;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.List;
 

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_process_manage_visual","dg_process_manage"};//表名数组
+        String[] tables = new String[] {"dg_business_company"};//表名数组
         String[] tablePrefixs = new String[] {""};//去掉前缀
         executeCode(PACKAGE_NAME,tables,tablePrefixs);
     }

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
@@ -14,11 +14,6 @@ spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.max-idle=8
 spring.redis.jedis.pool.min-idle=0
 
-#设置请求头大小
-server.max-http-header-size=102400
-
-server.tomcat.max-http-post-size=10MB
-
 #本地测试环境
 spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
 

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgBusinessCompanyMapper.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.daqing.financial.guarantee.mapper.DgBusinessCompanyMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.daqing.framework.domain.guarantee.DgBusinessCompany">
+        <id column="id" property="id" />
+        <result column="business_id" property="businessId" />
+        <result column="registered_capital" property="registeredCapital" />
+        <result column="social_unified_code" property="socialUnifiedCode" />
+        <result column="emp_num" property="empNum" />
+        <result column="linkman" property="linkman" />
+        <result column="link_phone" property="linkPhone" />
+        <result column="business_source" property="businessSource" />
+        <result column="business_scope" property="businessScope" />
+        <result column="business_addr" property="businessAddr" />
+        <result column="register_time" property="registerTime" />
+        <result column="register_addr" property="registerAddr" />
+        <result column="legal_id_number" property="legalIdNumber" />
+        <result column="legal_hukou_addr" property="legalHukouAddr" />
+        <result column="legal_phone" property="legalPhone" />
+        <result column="legal_home_addr" property="legalHomeAddr" />
+        <result column="legal_gender" property="legalGender" />
+        <result column="legal_name" property="legalName" />
+        <result column="is_exist_related" property="isExistRelated" />
+        <result column="code" property="code" />
+        <result column="type" property="type" />
+        <result column="name" property="name" />
+        <result column="addr" property="addr" />
+        <result column="phone" property="phone" />
+    </resultMap>
+
+</mapper>

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/config/WeChatConfig.java

@@ -43,6 +43,18 @@ public class WeChatConfig implements Serializable {
     @Value("${wxopen.wechat_binding_redirect_url}")
     private String weChatBindingRedirectUrl;
 
+    /**
+     * 微信小程序appid
+     */
+    @Value("${wxxcx.appid}")
+    private String xcxAppid;
+
+    /**
+     * 微信小程序appsecret
+     */
+    @Value("${wxxcx.appsecret}")
+    private String xcxAppsecret;
+
     /**
      * 微信开放平台二维码连接
      */

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java

@@ -165,8 +165,8 @@ 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://8.129.127.185:8080/dq/index.html#/login?token="+token+"&account="+account+"&headerImg="+headerImg);
-                response.sendRedirect("https://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("https://www.huorantech.cn/index/#/login?token="+token+"&account="+account+"&headerImg="+headerImg);
             }
         }else {
             userService.weChatBinding(code,response,state);
@@ -219,10 +219,11 @@ public class UserLoginController implements UserLoginControllerApi {
      * @param code
      * @return
      */
-    @RequestMapping(value = "/wxAuthLogin")
-    public String wxAuthLogin(String code){
+    @PostMapping(value = "/wxAuthLogin")
+    public ResponseResult wxAuthLogin(@RequestBody String code){
 
-        return userLoginService.wxAuthLogin(code);
+        String openid = userLoginService.wxAuthLogin(code);
+        return ResponseResult.SUCCESS(openid);
     }
 
 }

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java

@@ -323,7 +323,8 @@ public class UserLoginServiceImpl extends ServiceImpl<UserLoginDao, UserEntity>
 /*        String url="https://api.weixin.qq.com/sns/jscode2session?appid="+APPID+
                 "&secret="+SECRET+"&js_code="+ code +"&grant_type=authorization_code";*/
 
-        String url = weChatConfig.getWX_AUTH_URL();
+        String url = String.format(weChatConfig.getWX_AUTH_URL(),weChatConfig.getXcxAppid(),weChatConfig.getXcxAppsecret(),code);
+
         System.out.println("url==============="+url);
         //发送请求给微信后端
         CloseableHttpClient httpClient= HttpClients.createDefault();
@@ -343,7 +344,7 @@ public class UserLoginServiceImpl extends ServiceImpl<UserLoginDao, UserEntity>
                 Login login=new Login();
                 login.setOpenid(jsonObject.getString("openid"));
                 login.setSession_key(jsonObject.getString("session_key"));
-                result.append(login.getOpenid()+"hello_world"+login.getSession_key());
+                result.append(login.getOpenid());
                 System.out.println(result.toString());
             }
         } catch (IOException e) {

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserServiceImpl.java

@@ -90,8 +90,8 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
         if(dbUser == null){//openId不存在，返回绑定手机号页面,须另写绑定手机号接口
             log.info("dbUser为空，openId不存在，请先绑定手机号哦~~~");
             try {
-                response.sendRedirect("https://www.huorantech.cn/dq/index.html#/bind-phone?matched="+md5OpenId);//跳转绑定手机号页面
-                //response.sendRedirect("http://8.129.127.185:8080/dq/index.html#/bind-phone?matched="+md5OpenId);//跳转绑定手机号页面
+                //response.sendRedirect("https://www.huorantech.cn/index/#/bind-phone?matched="+md5OpenId);//跳转绑定手机号页面
+                response.sendRedirect("http://8.129.127.185/dq/index.html#/bind-phone?matched="+md5OpenId);//跳转绑定手机号页面
             } catch (IOException e) {
                 e.printStackTrace();
             }
@@ -152,8 +152,8 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
         if (countWeChatId > 0){
                 try {
                     log.info("微信重复了,我走到了这里.............................");
-                    response.sendRedirect("https://www.huorantech.cn/dq/index.html#/workbench-manpower?token="+token+"&message=1");
-                    //response.sendRedirect("http://8.129.127.185:8080/dq/index.html#/workbench-manpower?token="+token+"&message=1");
+                    //response.sendRedirect("https://www.huorantech.cn/index/#/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();
                 }
@@ -163,8 +163,8 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
             if (result){
                 try {
                     log.info("转发成功---------------------------------------");
-                    response.sendRedirect("https://www.huorantech.cn/dq/index.html#/workbench-manpower?token="+token);
-                    //response.sendRedirect("http://8.129.127.185:8080/dq/index.html#/workbench-manpower?token="+token);
+                    //response.sendRedirect("https://www.huorantech.cn/index/#/workbench-manpower?token="+token);
+                    response.sendRedirect("http://8.129.127.185/dq/index.html#/workbench-manpower?token="+token);
                 }catch (IOException e){
                     e.printStackTrace();
                 }

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

dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/PermissionController.java

@@ -127,7 +127,9 @@ public class PermissionController implements PermissionControllerApi {
         String userId = RedisUtil.get("dq:token:" + token);
         //获取当前用户拥有的角色ids
         String roleIds= RedisUtil.get("dq:userRole:" + userId);
-
+        if(roleIds.equals(null) || roleIds.equals("")){
+            return ResponseResult.FAIL(40010,"无登录权限，请联系管理员处理！");
+        }
         List list = permissionService.getPermission(roleIds);
         return new ResponseResult<List<RolePermissionEntity>>().SUCCESS(list);
     }

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

dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java

@@ -32,17 +32,17 @@ public class PromptSuccess {
 
     public static final String UPLOAD_FILE_PATH = "//usr//local//nginx//html//admin//headImg//"; // linux图片存放路径
 
-    public static final String IMAGE_URL_PATH = "https://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 = "https://www.huorantech.cn/headImg/"; // 数据库/预加载图片路径
+    public static final String IMAGE_URL_PATH = "http://8.129.127.185/headImg/"; // 数据库/预加载图片路径
+    //public static final String IMAGE_URL_PATH = "http://47.107.237.129/headImg/"; // 数据库/预加载图片路径
 
     public static final String[] LETTERS = {"A","B","C","D","E"}; // 员工姓名重复时自动加的字母,可再添加
 
     public static final String STATUS_REFUSE = "拒绝";
 
-    public static final String ENCLOSUREFILE_URL_PATH = "https://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 = "https://www.huorantech.cn/enclosureFile/"; // 附件文件存放路径
+    public static final String ENCLOSUREFILE_URL_PATH = "http://8.129.127.185/enclosureFile/"; // 附件文件存放路径
+    //public static final String ENCLOSUREFILE_URL_PATH = "http://47.107.237.129/enclosureFile/"; // 附件文件存放路径
 
     public static final String FILE_URL_PATH = "//usr//local//nginx//html//admin//enclosureFile//"; // 附件文件存放路径
 

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgBusinessCompany.java

@@ -0,0 +1,145 @@
+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 lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 业务关联企业表
+ * </p>
+ *
+ * @author Qyq
+ * @since 2021-01-27
+ */
+@TableName("dg_business_company")
+@Data
+public class DgBusinessCompany implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 业务id
+     */
+    private Integer businessId;
+
+    /**
+     * 注册资金（万元）
+     */
+    private String registeredCapital;
+
+    /**
+     * 社会统一代码
+     */
+    private String socialUnifiedCode;
+
+    /**
+     * 员工人数
+     */
+    private String empNum;
+
+    /**
+     * 联系人
+     */
+    private String linkman;
+
+    /**
+     * 联系人的联系电话
+     */
+    private String linkPhone;
+
+    /**
+     * 业务来源
+     */
+    private String businessSource;
+
+    /**
+     * 经营范围
+     */
+    private String businessScope;
+
+    /**
+     * 经营地址
+     */
+    private String businessAddr;
+
+    /**
+     * 注册时间
+     */
+    private Date registerTime;
+
+    /**
+     * 注册地址
+     */
+    private String registerAddr;
+
+    /**
+     * 法人-身份证号
+     */
+    private String legalIdNumber;
+
+    /**
+     * 法人-户口所在地
+     */
+    private String legalHukouAddr;
+
+    /**
+     * 法人-联系电话
+     */
+    private String legalPhone;
+
+    /**
+     * 法人-家庭住址
+     */
+    private String legalHomeAddr;
+
+    /**
+     * 法人-性别 1、男，0、女
+     */
+    private Integer legalGender;
+
+    /**
+     * 法人-姓名
+     */
+    private String legalName;
+
+    /**
+     * 是否存在关联人 0->否；1->是
+     */
+    private Integer isExistRelated;
+
+    /**
+     * 客户编号
+     */
+    private String code;
+
+    /**
+     * 客户类型：1、企业类型，0：个人类型
+     */
+    private Integer type;
+
+    /**
+     * 客户名称
+     */
+    private String name;
+
+    /**
+     * 联系地址(指个人的)
+     */
+    private String addr;
+
+    /**
+     * 联系电话（指个人或企业的）
+     */
+    private String phone;
+}

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

dq-govern-gateway/src/main/resources/jwt.properties

@@ -28,7 +28,9 @@ jwt.ignoreUrlList=/apiHrmsAuth/hrms/auth/userlogin/getBackPwd,\
   /api-hrms/hrms/user/uploadFile,\
   /apiHrmsAuth/hrms/auth/permission/getUserRoles,\
   /api-hrms/hrms/permission/getPermission,\
-  /api-guarantee/guarantee/efficiency/personalEfficiencyListExport
+  /api-guarantee/guarantee/efficiency/personalEfficiencyListExport,\
+  /api-guarantee/dg-copy-user/exportCopyForMe,\
+  /apiHrmsAuth/hrms/auth/userlogin/wxAuthLogin