Merge remote-tracking branch 'origin/master'

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

@@ -212,6 +212,8 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
                             if(response.getPresenterId().equals(res.get("id"))){//如果提单人id相同情况下，就往对象里面赋值
                                 response.setAccount(JSONObject.toJSONString(res.get("account")).replace("\"",""));
                                 response.setDeptName(JSONObject.toJSONString(res.get("deptName")).replace("\"",""));
+                            }else{
+                                response.setAccount("客户");
                             }
                         }
                     }

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

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

@@ -141,8 +141,8 @@ public class UserLoginController implements UserLoginControllerApi {
                 //account = new String(username.getBytes("GBK"),"iso-8859-1");
                 log.info("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);
+//                response.sendRedirect("https://www.huorantech.cn/index/#/login?token="+token+"&account="+account+"&headerImg="+headerImg);
-//                response.sendRedirect("https://www.feifanhitech.com/index/#/login?token="+token+"&account="+account+"&headerImg="+headerImg);
+                response.sendRedirect("https://www.feifanhitech.com/index/#/login?token="+token+"&account="+account+"&headerImg="+headerImg);
             }
         }else {
             userService.weChatBinding(code,response,state);

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

@@ -241,7 +241,11 @@ public class UserLoginServiceImpl extends ServiceImpl<UserLoginDao, UserEntity>
         }
         recordsLog.setAccount(userEntity.getAccount());
         recordsLog.setName(name);
-        recordsLog.setType(0);//用户端类型：0->PC；1->小程序；
+        if(loginRequest.getType()==3 || loginRequest.getType()==4){//小程序登录
+            recordsLog.setType(1);//用户端类型：0->PC；1->小程序；
+        }else{
+            recordsLog.setType(0);
+        }
         recordsLog.setLoginTime(new Date());
         recordsLog.setUserId(userEntity.getId().intValue());
         hrmsAccessRecordsLogMapper.insert(recordsLog);
@@ -401,7 +405,7 @@ public class UserLoginServiceImpl extends ServiceImpl<UserLoginDao, UserEntity>
         //查询员工数据
         int count2 = userLoginDao.selectUserEmpCount(md5UnionId);
         if(identify==0){//员工小程序登录
-            loginRequest.setType(2);
+            loginRequest.setType(4);
             if(count<=0 || count2<=0){//如果微信绑定的不是员工
                 return ResponseResult.FAIL(60001,"您的账号没有权限，无法登录！");
             }

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

@@ -51,6 +51,8 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
     public UserEntity saveWeChatUser(String code,HttpServletResponse response) {
 
         String accessTokenUrl = String.format(weChatConfig.getOPEN_ACCESS_TOKEN_URL(),weChatConfig.getOpenAppid(),weChatConfig.getOpenAppsecret(),code);
+        System.out.println("code===="+code);
+        System.out.println("accessTokenUrl===="+accessTokenUrl);
 
         //获取access_token
         Map<String ,Object> baseMap =  HttpUtils.doGet(accessTokenUrl);
@@ -92,8 +94,8 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
         if(dbUser == null){//openId不存在，返回绑定手机号页面,须另写绑定手机号接口
             log.info("dbUser为空，openId不存在，请先绑定手机号哦~~~");
             try {
-//                response.sendRedirect("https://www.feifanhitech.com/index/#/bind-phone?matched="+md5UnionId);
+                response.sendRedirect("https://www.feifanhitech.com/index/#/bind-phone?matched="+md5UnionId);
-                response.sendRedirect("https://www.huorantech.cn/index/#/bind-phone?matched="+md5UnionId);//跳转绑定手机号页面
+//                response.sendRedirect("https://www.huorantech.cn/index/#/bind-phone?matched="+md5UnionId);//跳转绑定手机号页面
                 //response.sendRedirect("http://8.129.127.185/dq/index.html#/bind-phone?matched="+md5UnionId);//跳转绑定手机号页面
             } catch (IOException e) {
                 e.printStackTrace();
@@ -159,9 +161,9 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
         if (countWeChatId > 0){
                 try {
                     log.info("微信重复了,我走到了这里.............................");
-                    response.sendRedirect("https://www.huorantech.cn/index/#/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");
-//                    response.sendRedirect("https://www.feifanhitech.com/index/#/workbench-manpower?token="+token+"&message=1");
+                    response.sendRedirect("https://www.feifanhitech.com/index/#/workbench-manpower?token="+token+"&message=1");
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
@@ -171,9 +173,9 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
             if (result){
                 try {
                     log.info("转发成功---------------------------------------");
-                    response.sendRedirect("https://www.huorantech.cn/index/#/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);
-//                    response.sendRedirect("https://www.feifanhitech.com/index/#/workbench-manpower?token="+token);
+                    response.sendRedirect("https://www.feifanhitech.com/index/#/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/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 = "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 = "https://www.feifanhitech.com/headImg/"; // 数据库/预加载图片路径
+    public static final String IMAGE_URL_PATH = "https://www.feifanhitech.com/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 = "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 = "https://www.feifanhitech.com/enclosureFile/"; // 附件文件存放路径
+    public static final String ENCLOSUREFILE_URL_PATH = "https://www.feifanhitech.com/enclosureFile/"; // 附件文件存放路径
 
     public static final String FILE_URL_PATH = "//usr//local//nginx//html//admin//enclosureFile//"; // 附件文件存放路径
 

dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/request/LoginRequest.java

@@ -11,7 +11,7 @@ public class LoginRequest {
     @ApiModelProperty(value = "手机号码/账号")
     private String phone;
 
-    @ApiModelProperty(value = "登录类型(1:手机号 2:微信登录 3:客户小程序登录)")
+    @ApiModelProperty(value = "登录类型(1:手机号 2:微信扫码登录 3:客户小程序登录 4：企业小程序登录)")
     private int type;
 
     @ApiModelProperty(value = "微信唯一编号(unionId)")

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