Skip to content

G
gdtel-gztel-school-center
Commit d22369c5 by 陈浩建
Options

分销员-字段

parent 7e5a766b
Showing with 36 additions and 27 deletions
common/src/main/java/com/winsun/bean/HhrUser.java
...@@ -72,18 +72,23 @@ public class HhrUser implements Serializable{ ...@@ -72,18 +72,23 @@ public class HhrUser implements Serializable{
* 证件信息上传状态 * 证件信息上传状态
*/ */
private int uploadState; private int uploadState;
/** /**
* 活跃状态 1：活跃 0：不活跃 * 活跃状态 1：活跃 0：不活跃
*/ */
private int isActive; private int isActive;
/** /**
* 微信名 * 微信名
*/ */
private String wxNickName; private String wxNickName;
/**
* 分销员
*/
private String fxs;
// 非数据库字段 // 非数据库字段
/** /**
......
common/src/main/java/com/winsun/constant/Constant.java
...@@ -16,22 +16,22 @@ public class Constant { ...@@ -16,22 +16,22 @@ public class Constant {
/* 默认一页显示10条数据 */ /* 默认一页显示10条数据 */
public final static Integer PAGENUM = 2; public final static Integer PAGENUM = 2;
/* 默认第一页 */ /* 默认第一页 */
public final static Integer FROMPAGE = 0; public final static Integer FROMPAGE = 0;
/*用户状态*/ /*用户状态*/
public final static String USERQIDONG = "1";//启用 public final static String USERQIDONG = "1";//启用
public final static String USERJINYONG = "0";//禁用 public final static String USERJINYONG = "0";//禁用
/*支付参数*/ /*支付参数*/
public final static String CLIENTNUMBER = "xyzxyql"; //商户标识，由穗易付平台统一分配 public final static String CLIENTNUMBER = "xyzxyql"; //商户标识，由穗易付平台统一分配
public final static String APPK = "E805F0305C455BA7C5BAE3796C6500BD"; //KEY 商户标识，由穗易付平台统一分配 public final static String APPK = "E805F0305C455BA7C5BAE3796C6500BD"; //KEY 商户标识，由穗易付平台统一分配
public final static String KEY = "E805F0305C455BA7C5BAE3796C6500BD"; //商户标识，由穗易付平台统一分配 public final static String key_VALUE = "E805F0305C455BA7C5BAE3796C6500BD"; //商户标识，由穗易付平台统一分配
public final static String USERNAME = "apitest"; //智能平台提供测试的账号 public final static String USERNAME = "apitest"; //智能平台提供测试的账号
public final static String USERNAMEKEY = "46b97294d4dac3f62ee42f3ab2804f68"; //智能平台提供的测试key public final static String USERNAMEKEY = "46b97294d4dac3f62ee42f3ab2804f68"; //智能平台提供的测试key
public final static String ZHENGSHIAUCCON = "ruany"; //智能平台提供的正式账号 public final static String ZHENGSHIAUCCON = "ruany"; //智能平台提供的正式账号
public final static String ZHANGSHIKEY = "3df143292455bfea88bc613c53004d36"; //智能平台提供的正式key public final static String ZHANGSHIKEY = "3df143292455bfea88bc613c53004d36"; //智能平台提供的正式key
// public final static String ZHENGSHIAUCCON = "xiaoykd"; //智能平台提供的正式账号 // public final static String ZHENGSHIAUCCON = "xiaoykd"; //智能平台提供的正式账号
// public final static String ZHANGSHIKEY = "d345040accff0421d03f760a03e5cbd9"; //智能平台提供的正式key // public final static String ZHANGSHIKEY = "d345040accff0421d03f760a03e5cbd9"; //智能平台提供的正式key
...@@ -58,7 +58,7 @@ public class Constant { ...@@ -58,7 +58,7 @@ public class Constant {
public final static String IMGBDURL = "/static/images/temp/";//图片存放位置 public final static String IMGBDURL = "/static/images/temp/";//图片存放位置
public final static String KDIMGBDURL = "/static/images/kuandai/";//图片存放位置 public final static String KDIMGBDURL = "/static/images/kuandai/";//图片存放位置
public final static String ORDERSTATUS1 = "1"; // 待提交 public final static String ORDERSTATUS1 = "1"; // 待提交
public final static String ORDERSTATUS2 = "2"; // 待受理 public final static String ORDERSTATUS2 = "2"; // 待受理
public final static String ORDERSTATUS3 = "3"; // 受理成功【待收费】 public final static String ORDERSTATUS3 = "3"; // 受理成功【待收费】
...@@ -67,7 +67,7 @@ public class Constant { ...@@ -67,7 +67,7 @@ public class Constant {
public final static String ORDERSTATUS9 = "9"; // 已收费【待竣工】 public final static String ORDERSTATUS9 = "9"; // 已收费【待竣工】
public final static String ORDERSTATUS10 = "10"; // 受理异常 public final static String ORDERSTATUS10 = "10"; // 受理异常
public final static String ORDERSTATUS100= "100"; // 未支付 public final static String ORDERSTATUS100= "100"; // 未支付
public final static String ROLE1 = "1"; // 用户权限：1管理员 2测试人员 3工作人员 4学校人员 public final static String ROLE1 = "1"; // 用户权限：1管理员 2测试人员 3工作人员 4学校人员
public final static String ROLE2 = "2"; // 用户权限：1管理员 2测试人员 3工作人员 4学校人员 public final static String ROLE2 = "2"; // 用户权限：1管理员 2测试人员 3工作人员 4学校人员
public final static String ROLE3 = "3"; // 用户权限：1管理员 2测试人员 3工作人员 4学校人员 public final static String ROLE3 = "3"; // 用户权限：1管理员 2测试人员 3工作人员 4学校人员
......
common/src/main/java/com/winsun/utils/EThreeDES.java
...@@ -147,11 +147,11 @@ public class EThreeDES { ...@@ -147,11 +147,11 @@ public class EThreeDES {
public static void main(String[] args) throws IOException public static void main(String[] args) throws IOException
{ {
EThreeDES eThreeDES = new EThreeDES(); EThreeDES eThreeDES = new EThreeDES();
String KEY = "C314BONC3C85E86KK996WSWS"; //密匙 String key_VALUE = "C314BONC3C85E86KK996WSWS"; //密匙
//加密 //加密
String original = "{termNo:\"yxsst_ht191106\", orderTime:\"2021-01-27 11:30:00\", prodName:\"套餐名称\", reqCode:\"GZ202101261234567\", subsCode: [\"611234\", \"612345\", \"611226\"], custName:\"张*三\", certNo: \"4401**********1234\", accNbr:\"13888888888\", orderState: \"S0K\", orderStateName:\"已完成/已取卡\", payState: \"1\", crmStateName:\"完工\", crmStateReason:\"000\", recNo:\"0200202101251030423400027500\"}"; String original = "{termNo:\"yxsst_ht191106\", orderTime:\"2021-01-27 11:30:00\", prodName:\"套餐名称\", reqCode:\"GZ202101261234567\", subsCode: [\"611234\", \"612345\", \"611226\"], custName:\"张*三\", certNo: \"4401**********1234\", accNbr:\"13888888888\", orderState: \"S0K\", orderStateName:\"已完成/已取卡\", payState: \"1\", crmStateName:\"完工\", crmStateReason:\"000\", recNo:\"0200202101251030423400027500\"}";
byte[] eBy = EThreeDES.encryptMode(KEY.getBytes(),original.getBytes()); byte[] eBy = EThreeDES.encryptMode(key_VALUE.getBytes(),original.getBytes());
String eBase64 = eThreeDES.enBase64(eBy); String eBase64 = eThreeDES.enBase64(eBy);
System.out.println("3DES加密后的字符串:" + eBase64); System.out.println("3DES加密后的字符串:" + eBase64);
......
core-service/src/test/java/com/winsun/user/UserTestHelper.java
...@@ -5,6 +5,7 @@ import com.winsun.auth.model.user.User; ...@@ -5,6 +5,7 @@ import com.winsun.auth.model.user.User;
import com.winsun.base.AppApplicationBaseIT; import com.winsun.base.AppApplicationBaseIT;
import com.winsun.item.modular.system.dao.UserMapper; import com.winsun.item.modular.system.dao.UserMapper;
import com.winsun.item.util.LoginUtils; import com.winsun.item.util.LoginUtils;
import com.winsun.utils.RandomUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -22,14 +23,17 @@ public class UserTestHelper extends AppApplicationBaseIT { ...@@ -22,14 +23,17 @@ public class UserTestHelper extends AppApplicationBaseIT {
@Test @Test
public void decryptPwd() { public void decryptPwd() {
final String account = "18028801118"; // final String account = "18028801118";
User user = mapper.getByAccount(account); // User user = mapper.getByAccount(account);
if(user == null) { // if(user == null) {
throw new NullPointerException("解密用户信息失败，用户不存在"); // throw new NullPointerException("解密用户信息失败，用户不存在");
} // }
log.info(user.getPassword()); // log.info(user.getPassword());
// 证明MD5无法解密 // // 证明MD5无法解密
ResponseData<String> pwdDecrypt = LoginUtils.pwdDecrypt(user.getPassword()); // ResponseData<String> pwdDecrypt = LoginUtils.pwdDecrypt(user.getPassword());
log.info("{}", pwdDecrypt.getData()); // log.info("{}", pwdDecrypt.getData());
String orderSeq = RandomUtil.RandomNumber(32);
System.out.println(orderSeq);
} }
} }
service-manager/src/main/java/com/winsun/utils/Constant.java
...@@ -16,21 +16,21 @@ public class Constant { ...@@ -16,21 +16,21 @@ public class Constant {
/* 默认一页显示10条数据 */ /* 默认一页显示10条数据 */
public final static Integer PAGENUM = 2; public final static Integer PAGENUM = 2;
/* 默认第一页 */ /* 默认第一页 */
public final static Integer FROMPAGE = 0; public final static Integer FROMPAGE = 0;
/*用户状态*/ /*用户状态*/
public final static String USERQIDONG = "1";//启用 public final static String USERQIDONG = "1";//启用
public final static String USERJINYONG = "0";//禁用 public final static String USERJINYONG = "0";//禁用
/*支付参数*/ /*支付参数*/
public final static String CLIENTNUMBER = "xyzxyql"; //商户标识，由穗易付平台统一分配 public final static String CLIENTNUMBER = "xyzxyql"; //商户标识，由穗易付平台统一分配
public final static String KEY = "E805F0305C455BA7C5BAE3796C6500BD"; //商户标识，由穗易付平台统一分配 public final static String key_VALUE = "E805F0305C455BA7C5BAE3796C6500BD"; //商户标识，由穗易付平台统一分配
public final static String USERNAME = "apitest"; //智能平台提供测试的账号 public final static String USERNAME = "apitest"; //智能平台提供测试的账号
public final static String USERNAMEKEY = "46b97294d4dac3f62ee42f3ab2804f68"; //智能平台提供的测试key public final static String USERNAMEKEY = "46b97294d4dac3f62ee42f3ab2804f68"; //智能平台提供的测试key
public final static String ZHENGSHIAUCCON = "ruany"; //智能平台提供的正式账号 public final static String ZHENGSHIAUCCON = "ruany"; //智能平台提供的正式账号
public final static String ZHANGSHIKEY = "3df143292455bfea88bc613c53004d36"; //智能平台提供的正式key public final static String ZHANGSHIKEY = "3df143292455bfea88bc613c53004d36"; //智能平台提供的正式key
// public final static String ZHENGSHIAUCCON = "xiaoykd"; //智能平台提供的正式账号 // public final static String ZHENGSHIAUCCON = "xiaoykd"; //智能平台提供的正式账号
// public final static String ZHANGSHIKEY = "d345040accff0421d03f760a03e5cbd9"; //智能平台提供的正式key // public final static String ZHANGSHIKEY = "d345040accff0421d03f760a03e5cbd9"; //智能平台提供的正式key
public final static String ZHANGSHIURL = "https://icloud.mini189.cn/api/"; //智能平台提供的正式key public final static String ZHANGSHIURL = "https://icloud.mini189.cn/api/"; //智能平台提供的正式key
...@@ -56,7 +56,7 @@ public class Constant { ...@@ -56,7 +56,7 @@ public class Constant {
public final static String IMGBDURL = "/static/images/temp/";//图片存放位置 public final static String IMGBDURL = "/static/images/temp/";//图片存放位置
public final static String KDIMGBDURL = "/static/images/kuandai/";//图片存放位置 public final static String KDIMGBDURL = "/static/images/kuandai/";//图片存放位置
public final static String ORDERSTATUS1 = "1"; // 待提交 public final static String ORDERSTATUS1 = "1"; // 待提交
public final static String ORDERSTATUS2 = "2"; // 待受理 public final static String ORDERSTATUS2 = "2"; // 待受理
public final static String ORDERSTATUS3 = "3"; // 受理成功【待收费】 public final static String ORDERSTATUS3 = "3"; // 受理成功【待收费】
...@@ -65,7 +65,7 @@ public class Constant { ...@@ -65,7 +65,7 @@ public class Constant {
public final static String ORDERSTATUS9 = "9"; // 已收费【待竣工】 public final static String ORDERSTATUS9 = "9"; // 已收费【待竣工】
public final static String ORDERSTATUS10 = "10"; // 受理异常 public final static String ORDERSTATUS10 = "10"; // 受理异常
public final static String ORDERSTATUS100= "100"; // 未支付 public final static String ORDERSTATUS100= "100"; // 未支付
public final static String ROLE1 = "1"; // 用户权限：1管理员 2测试人员 3工作人员 4学校人员 public final static String ROLE1 = "1"; // 用户权限：1管理员 2测试人员 3工作人员 4学校人员
public final static String ROLE2 = "2"; // 用户权限：1管理员 2测试人员 3工作人员 4学校人员 public final static String ROLE2 = "2"; // 用户权限：1管理员 2测试人员 3工作人员 4学校人员
public final static String ROLE3 = "3"; // 用户权限：1管理员 2测试人员 3工作人员 4学校人员 public final static String ROLE3 = "3"; // 用户权限：1管理员 2测试人员 3工作人员 4学校人员
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment