huoran
/
dqFinancial
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
chen 4 years ago
parent b7b76a26c4 5e61297902
commit 2e44b7757a
5 changed files with 14 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java
  2. 15
      dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserServiceImpl.java
  3. 2
      dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java
  4. 2
      dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml
  5. 10
      dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java

5
dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java
Unescape View File

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

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

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

2
dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java
Unescape View File

@ -236,7 +236,7 @@ public class EmployeeController implements EmployeeControllerApi {
} }
/** /**
* 查询所有员工姓名和id * 查询所有员工姓名和账户id
*/ */
@GetMapping("/listEmployeeName") @GetMapping("/listEmployeeName")
public ResponseResult listEmployeeName() { public ResponseResult listEmployeeName() {

2
dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml
Unescape View File

@ -243,7 +243,7 @@
<!-- 查询所有的员工姓名和id --> <!-- 查询所有的员工姓名和id -->
<select id="listEmployeeName" resultType="com.daqing.framework.domain.hrms.ext.EmployeeVO"> <select id="listEmployeeName" resultType="com.daqing.framework.domain.hrms.ext.EmployeeVO">
SELECT e.id id,e.name name SELECT u.id id,e.name name
FROM hrms_employee e FROM hrms_employee e
LEFT JOIN hrms_user u LEFT JOIN hrms_user u
ON e.user_id = u.id ON e.user_id = u.id

10
dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java
Unescape View File

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

Write Preview
Loading…
Cancel
Save