Skip to content

G
gdtel-gztel-school-center
Commit ccb1ce23 by 董有沛
Options

解决冲突

parents 7fab82c0 484ee1e2
Showing with 613 additions and 253 deletions
apply-net/pom.xml
......@@ -15,6 +15,11 @@
<dependencies>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.9.2</version>
</dependency>
<dependency>
<groupId>com.winsun.framework</groupId>
<artifactId>winsun-core-message</artifactId>
<version>${winsun-framework.version}</version>
......
common/src/main/java/com/winsun/bean/Constant.java 0 → 100644
package com.winsun.bean;
/**
* @author ljh
* @Description:常量类
* @Title: Constant
* @date 2018年5月16日下午6:55:54
* @version 1.0
*/
public class Constant {
/* 默认一页显示10条数据 */
public final static Integer PAGENUM = 2;
/* 默认第一页 */
public final static Integer FROMPAGE = 0;
/*用户状态*/
public final static String USERQIDONG = "1";//启用
public final static String USERJINYONG = "0";//禁用
/*支付参数*/
public final static String CLIENTNUMBER = "xyzxyql"; //商户标识，由穗易付平台统一分配
public final static String KEY = "E805F0305C455BA7C5BAE3796C6500BD"; //商户标识，由穗易付平台统一分配
public final static String USERNAME = "apitest"; //智能平台提供测试的账号
public final static String USERNAMEKEY = "46b97294d4dac3f62ee42f3ab2804f68"; //智能平台提供的测试key
public final static String ZHENGSHIAUCCON = "ruany"; //智能平台提供的正式账号
public final static String ZHANGSHIKEY = "3df143292455bfea88bc613c53004d36"; //智能平台提供的正式key
// public final static String ZHENGSHIAUCCON = "xiaoykd"; //智能平台提供的正式账号
// public final static String ZHANGSHIKEY = "d345040accff0421d03f760a03e5cbd9"; //智能平台提供的正式key
public final static String ZHANGSHIURL = "https://ismartbak.mini189.cn/api/"; //智能平台提供的正式key
public final static String PRODUCTCATEGORY = "单宽带"; //只能平台提供的key
// public final static String TOMCATURL = "http://183.57.78.132:8080"; //Linux外网服务器地址
// public final static String INTRANETURL = "http://10.3.1.21:8080"; //Linux内网服务器地址
public final static String TOMCATURL = "http://yrym.winsun-aly.com"; //省windows外网服务器地址
public final static String INTRANETURL = "http://172.51.229.10:8081"; //省windows内网服务器地址
// public final static String TOMCATURL = "http://ue189.com:8529"; //服务器地址
// public final static String INTRANETURL = "http://ue189.com:8529"; //服务器地址
// public final static String TOMCATURL = "http://127.0.0.1:8080"; //服务器地址
// public final static String INTRANETURL = "http://127.0.0.1:8080"; //服务器地址
public final static String PRODUCTSKU481 = "481"; //产品sku:校园宽带300元/年
public final static String PRODUCTSKU479 = "479"; //产品sku:校园宽带30元/月
public final static String PRODUCTSKU479Str = "30元"; //产品sku:校园宽带30元/月
public final static String PRODUCTSKU481Str = "300元"; //产品sku:校园宽带30元/月
public final static String Payment0 = "0"; //支付方式：为翼支付网厅
public final static String Payment1 = "1"; //支付方式：为支付宝
public final static String Payment3 = "3"; //支付方式：为微信支付
public static final String VALIDATECODE_SESSION_KEY = "validatecode"; // 验证码 session key
/*宽带图片*/
public final static String KUANDAIIMAGE = "kuandai";//封面图
public final static String IMGBDURL = "/static/images/temp/";//图片存放位置
public final static String KDIMGBDURL = "/static/images/kuandai/";//图片存放位置
public final static String ORDERSTATUS1 = "1"; // 待提交
public final static String ORDERSTATUS2 = "2"; // 待受理
public final static String ORDERSTATUS3 = "3"; // 受理成功【待收费】
public final static String ORDERSTATUS4 = "4"; // 归档
public final static String ORDERSTATUS5 = "5"; // 作废
public final static String ORDERSTATUS9 = "9"; // 已收费【待竣工】
public final static String ORDERSTATUS10 = "10"; // 受理异常
public final static String ORDERSTATUS100= "100"; // 未支付
public final static String ROLE1 = "1"; // 用户权限：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 ROLE4 = "4"; // 用户权限：1管理员 2测试人员 3工作人员 4学校人员
}
common/src/main/java/com/winsun/bean/NetworkInfo.java 0 → 100644
package com.winsun.bean;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;
import java.io.Serializable;
/**
* 网点信息类
*/
@Data
@TableName("hhr_network_info")
public class NetworkInfo implements Serializable {
private static final long serialVersionUID = 5797224009939724683L;
/**
* 主键id
*/
@TableId(value = "id", type = IdType.AUTO)
private String id;
/**
* 局向，区名
*/
private String areaName;
/**
* 学校名
*/
private String schoolName;
/**
* 网点编码
*/
private String networkCode;
/**
* 网点名称
*/
private String networkName;
}
common/src/main/java/com/winsun/bean/Order.java
package com.winsun.bean;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 订单
*
......@@ -16,6 +15,7 @@ import lombok.Data;
@TableName("hhr_order")
public class Order implements Serializable{
private static final long serialVersionUID = 1052451021982452911L;
/**
* 主键
*/
......@@ -197,7 +197,7 @@ public class Order implements Serializable{
/**
* 提交佣金系统次数
*/
private int yjCount;
private String yjCount;
/**
* 提交佣金系统结果
......@@ -207,12 +207,12 @@ public class Order implements Serializable{
/**
* 新用户提交方式0督导1本人
*/
private int tjType;
private String tjType;
/**
* 小白卡1单移 2融合
*/
private int xbType;
private String xbType;
/**
* 宽带账号
......
common/src/main/java/com/winsun/bean/OrderHistory.java 0 → 100644
package com.winsun.bean;
import com.baomidou.mybatisplus.annotations.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* (OrderHistory)实体类
*
* @author PXL
* @since 2020-02-18 16:56:54
*/
@Data
@TableName("hhr_order_history")
public class OrderHistory implements Serializable {
private static final long serialVersionUID = -40129957672095334L;
/**
* 订单id
*/
private String orderId;
/**
* 订单状态
*/
private String status;
/**
*
*/
private Date createDate;
/**
* 操作人
*/
private String operator;
}
common/src/main/java/com/winsun/bean/OrderView.java
package com.winsun.bean;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;
import java.util.Date;
import java.io.Serializable;
......@@ -13,6 +15,7 @@ import java.io.Serializable;
* @author makejava
* @since 2020-02-18 16:56:54
*/
@Data
@TableName("order_view")
public class OrderView implements Serializable {
private static final long serialVersionUID = -61996751798804758L;
......@@ -24,311 +27,127 @@ public class OrderView implements Serializable {
/**
* 订单号码
*/
private String orderseq;
@TableField(value = "orderSeq")
private String orderSeq;
/**
* 产品名称
*/
private String productname;
@TableField(value = "productName")
private String productName;
/**
* 套餐
*/
@TableField(value = "order_set_meal")
private String orderSetMeal;
/**
* 学校
*/
@TableField(value = "order_university_name")
private String orderUniversityName;
/**
* 姓名
*/
private String ordername;
@TableField(value = "orderName")
private String orderName;
/**
* 提交时间
*/
private Date orderdate;
@TableField(value = "orderDate")
private Date orderDate;
/**
* 订单状态
*/
@TableField(value = "status")
private String status;
/**
* 区域
*/
@TableField(value = "order_region")
private String orderRegion;
/**
* 支付平台：翼支付网厅|支付宝|微信
*/
private String ipay;
@TableField(value = "ipay")
private String iPay;
/**
* 支付方式：电脑支付|手机WAY支付|微信扫码支付|公众号支付|支付宝扫码
*/
private String paytype;
@TableField(value = "payType")
private String payType;
/**
* 产品价格
*/
private String weborderamount;
@TableField(value = "webOrderAmount")
private String webOrderAmount;
/**
* 支付时间
*/
@TableField(value = "order_payment_time")
private Date orderPaymentTime;
/**
* 穗易付订单号
*/
private String orderreqtranseq;
@TableField(value = "orderReqtranSeq")
private String orderReqtranSeq;
/**
* 接入商
*/
private String customerid;
@TableField(value = "customeRid")
private String customerId;
/**
* 联系电话
*/
private String orderphone;
@TableField(value = "orderPhone")
private String orderPhone;
/**
* 身份证号码
*/
private String ordernumber;
@TableField(value = "orderNumber")
private String orderNumber;
/**
* 用户类别
*/
@TableField(value = "order_customer_type")
private String orderCustomerType;
/**
* 学生证号
*/
@TableField(value = "order_customer_student_id")
private String orderCustomerStudentId;
/**
* 备注
*/
@TableField(value = "order_customer_remarks")
private String orderCustomerRemarks;
/**
* 多媒体账号
*/
@TableField(value = "order_customer_account")
private String orderCustomerAccount;
/**
* 多媒体密码
*/
@TableField(value = "order_customer_pwd")
private String orderCustomerPwd;
/**
* 支付平台流水号
*/
@TableField(value = "uptranseq")
private String uptranseq;
/**
* 用户显示的速率
*/
@TableField(value = "expenses")
private String expenses;
/**
* 预留字段2
*/
@TableField(value = "order_rf2")
private String orderRf2;
/**
* 智能平台订单号
*/
private String orderseqthd;
public Integer getOrderId() {
return orderId;
}
public void setOrderId(Integer orderId) {
this.orderId = orderId;
}
public String getOrderseq() {
return orderseq;
}
public void setOrderseq(String orderseq) {
this.orderseq = orderseq;
}
public String getProductname() {
return productname;
}
public void setProductname(String productname) {
this.productname = productname;
}
public String getOrderSetMeal() {
return orderSetMeal;
}
public void setOrderSetMeal(String orderSetMeal) {
this.orderSetMeal = orderSetMeal;
}
public String getOrderUniversityName() {
return orderUniversityName;
}
public void setOrderUniversityName(String orderUniversityName) {
this.orderUniversityName = orderUniversityName;
}
public String getOrdername() {
return ordername;
}
public void setOrdername(String ordername) {
this.ordername = ordername;
}
public Date getOrderdate() {
return orderdate;
}
public void setOrderdate(Date orderdate) {
this.orderdate = orderdate;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getOrderRegion() {
return orderRegion;
}
public void setOrderRegion(String orderRegion) {
this.orderRegion = orderRegion;
}
public String getIpay() {
return ipay;
}
public void setIpay(String ipay) {
this.ipay = ipay;
}
public String getPaytype() {
return paytype;
}
public void setPaytype(String paytype) {
this.paytype = paytype;
}
public String getWeborderamount() {
return weborderamount;
}
public void setWeborderamount(String weborderamount) {
this.weborderamount = weborderamount;
}
public Date getOrderPaymentTime() {
return orderPaymentTime;
}
public void setOrderPaymentTime(Date orderPaymentTime) {
this.orderPaymentTime = orderPaymentTime;
}
public String getOrderreqtranseq() {
return orderreqtranseq;
}
public void setOrderreqtranseq(String orderreqtranseq) {
this.orderreqtranseq = orderreqtranseq;
}
public String getCustomerid() {
return customerid;
}
public void setCustomerid(String customerid) {
this.customerid = customerid;
}
public String getOrderphone() {
return orderphone;
}
public void setOrderphone(String orderphone) {
this.orderphone = orderphone;
}
public String getOrdernumber() {
return ordernumber;
}
public void setOrdernumber(String ordernumber) {
this.ordernumber = ordernumber;
}
public String getOrderCustomerType() {
return orderCustomerType;
}
public void setOrderCustomerType(String orderCustomerType) {
this.orderCustomerType = orderCustomerType;
}
public String getOrderCustomerStudentId() {
return orderCustomerStudentId;
}
public void setOrderCustomerStudentId(String orderCustomerStudentId) {
this.orderCustomerStudentId = orderCustomerStudentId;
}
public String getOrderCustomerRemarks() {
return orderCustomerRemarks;
}
public void setOrderCustomerRemarks(String orderCustomerRemarks) {
this.orderCustomerRemarks = orderCustomerRemarks;
}
public String getOrderCustomerAccount() {
return orderCustomerAccount;
}
public void setOrderCustomerAccount(String orderCustomerAccount) {
this.orderCustomerAccount = orderCustomerAccount;
}
public String getOrderCustomerPwd() {
return orderCustomerPwd;
}
public void setOrderCustomerPwd(String orderCustomerPwd) {
this.orderCustomerPwd = orderCustomerPwd;
}
public String getUptranseq() {
return uptranseq;
}
public void setUptranseq(String uptranseq) {
this.uptranseq = uptranseq;
}
public String getExpenses() {
return expenses;
}
public void setExpenses(String expenses) {
this.expenses = expenses;
}
public String getOrderRf2() {
return orderRf2;
}
public void setOrderRf2(String orderRf2) {
this.orderRf2 = orderRf2;
}
public String getOrderseqthd() {
return orderseqthd;
}
public void setOrderseqthd(String orderseqthd) {
this.orderseqthd = orderseqthd;
}
@TableField(value = "orderSeqTHD")
private String orderseqThd;
}
\ No newline at end of file
common/src/main/java/com/winsun/bean/Package.java
......@@ -14,6 +14,7 @@ import java.io.Serializable;
@TableName("hhr_package")
public class Package implements Serializable {
private static final long serialVersionUID = -3214488372758625311L;
/**
* 主键
*/
......
common/src/main/java/com/winsun/bean/Partner.java
......@@ -15,6 +15,7 @@ import java.io.Serializable;
@TableName("hhr_user_view")
public class Partner implements Serializable {
private static final long serialVersionUID = -2297946603543248406L;
/**
* 主键
*/
......
common/src/main/java/com/winsun/bean/Product.java
......@@ -110,4 +110,6 @@ public class Product implements Serializable {
private String productIntroductionPic4;
private String productIntroductionPic5;
private int universityId;
}
common/src/main/java/com/winsun/bean/School.java
......@@ -15,6 +15,7 @@ import java.io.Serializable;
@TableName("hhr_school")
public class School implements Serializable {
private static final long serialVersionUID = 6881513580528426846L;
/**
* 主键
*/
......@@ -102,8 +103,12 @@ public class School implements Serializable {
* 是否显示融合
*/
private String isShowrh;
/**
* 网点编码
*/
private String networkCode;
/**
* 网点名称
*/
private String networkName;
}
common/src/main/java/com/winsun/bean/Student.java 0 → 100644
package com.winsun.bean;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;
import java.io.Serializable;
/**
* 学生信息
*/
@Data
@TableName("hhr_student")
public class Student implements Serializable {
private static final long serialVersionUID = 3949626453448235989L;
/**
*主键
*/
@TableId(value = "id", type = IdType.AUTO)
private String id;
/**
*学生姓名
*/
private String stuName;
/**
*学生身份证号
*/
private String idCard;
/**
*专业
*/
private String worker;
/**
*班级
*/
private String aClass;
}
common/src/main/java/com/winsun/bean/SysUser.java
......@@ -6,16 +6,17 @@ import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@TableName("sys_user")
@Data
public class SysUser {
public class SysUser implements Serializable {
/**
* 主键
*/
@TableId(type = IdType.AUTO)
@TableId(value = "id",type = IdType.AUTO)
private String id;
/**
......
common/src/main/java/com/winsun/bean/UserSchool.java 0 → 100644
package com.winsun.bean;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import lombok.Data;
import java.io.Serializable;
/**
* 学校信息
*/
@Data
@TableName("hhr_user_school")
public class UserSchool implements Serializable {
private static final long serialVersionUID = 2140472662677454235L;
/**
* 主键
*/
@TableId(value = "user_id")
private String userId;
/**
*
*/
private String schoolId;
}
common/src/main/java/com/winsun/constant/Constant.java 0 → 100644
package com.winsun.constant;
/**
* @author ljh
* @Description:常量类
* @Title: Constant
* @date 2018年5月16日下午6:55:54
* @version 1.0
*/
public class Constant {
/* 默认一页显示10条数据 */
public final static Integer PAGENUM = 2;
/* 默认第一页 */
public final static Integer FROMPAGE = 0;
/*用户状态*/
public final static String USERQIDONG = "1";//启用
public final static String USERJINYONG = "0";//禁用
/*支付参数*/
public final static String CLIENTNUMBER = "xyzxyql"; //商户标识，由穗易付平台统一分配
public final static String KEY = "E805F0305C455BA7C5BAE3796C6500BD"; //商户标识，由穗易付平台统一分配
public final static String USERNAME = "apitest"; //智能平台提供测试的账号
public final static String USERNAMEKEY = "46b97294d4dac3f62ee42f3ab2804f68"; //智能平台提供的测试key
public final static String ZHENGSHIAUCCON = "ruany"; //智能平台提供的正式账号
public final static String ZHANGSHIKEY = "3df143292455bfea88bc613c53004d36"; //智能平台提供的正式key
// public final static String ZHENGSHIAUCCON = "xiaoykd"; //智能平台提供的正式账号
// public final static String ZHANGSHIKEY = "d345040accff0421d03f760a03e5cbd9"; //智能平台提供的正式key
public final static String ZHANGSHIURL = "https://ismartbak.mini189.cn/api/"; //智能平台提供的正式key
public final static String PRODUCTCATEGORY = "单宽带"; //只能平台提供的key
// public final static String TOMCATURL = "http://183.57.78.132:8080"; //Linux外网服务器地址
// public final static String INTRANETURL = "http://10.3.1.21:8080"; //Linux内网服务器地址
public final static String TOMCATURL = "http://yrym.winsun-aly.com"; //省windows外网服务器地址
public final static String INTRANETURL = "http://172.51.229.10:8081"; //省windows内网服务器地址
// public final static String TOMCATURL = "http://ue189.com:8529"; //服务器地址
// public final static String INTRANETURL = "http://ue189.com:8529"; //服务器地址
// public final static String TOMCATURL = "http://127.0.0.1:8080"; //服务器地址
// public final static String INTRANETURL = "http://127.0.0.1:8080"; //服务器地址
public final static String PRODUCTSKU481 = "481"; //产品sku:校园宽带300元/年
public final static String PRODUCTSKU479 = "479"; //产品sku:校园宽带30元/月
public final static String PRODUCTSKU479Str = "30"; //产品sku:校园宽带30元/月
public final static String PRODUCTSKU481Str = "300"; //产品sku:校园宽带30元/月
public final static String Payment0 = "0"; //支付方式：为翼支付网厅
public final static String Payment1 = "1"; //支付方式：为支付宝
public final static String Payment3 = "3"; //支付方式：为微信支付
public static final String VALIDATECODE_SESSION_KEY = "validatecode"; // 验证码 session key
/*宽带图片*/
public final static String KUANDAIIMAGE = "kuandai";//封面图
public final static String IMGBDURL = "/static/images/temp/";//图片存放位置
public final static String KDIMGBDURL = "/static/images/kuandai/";//图片存放位置
public final static String ORDERSTATUS1 = "1"; // 待提交
public final static String ORDERSTATUS2 = "2"; // 待受理
public final static String ORDERSTATUS3 = "3"; // 受理成功【待收费】
public final static String ORDERSTATUS4 = "4"; // 归档
public final static String ORDERSTATUS5 = "5"; // 作废
public final static String ORDERSTATUS9 = "9"; // 已收费【待竣工】
public final static String ORDERSTATUS10 = "10"; // 受理异常
public final static String ORDERSTATUS100= "100"; // 未支付
public final static String ROLE1 = "1"; // 用户权限：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 ROLE4 = "4"; // 用户权限：1管理员 2测试人员 3工作人员 4学校人员
}
common/src/main/java/com/winsun/mapper/NetworkInfoMapper.java 0 → 100644
package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.NetworkInfo;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component;
@Mapper
@Component
public interface NetworkInfoMapper extends BaseMapper<NetworkInfo> {
}
common/src/main/java/com/winsun/mapper/OrderHistoryMapper.java 0 → 100644
package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.OrderHistory;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component;
@Mapper
@Component
public interface OrderHistoryMapper extends BaseMapper<OrderHistory> {
}
common/src/main/java/com/winsun/mapper/SchoolMapper.java
......@@ -2,7 +2,6 @@ package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.School;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
......@@ -20,4 +19,5 @@ public interface SchoolMapper extends BaseMapper<School> {
@Select("select school_id schoolId from `hhr_user_school` where user_id = #{partner}")
String selectSchoolIdByUserId(String partner);
}
common/src/main/java/com/winsun/mapper/StudentMapper.java 0 → 100644
package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.Student;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Component;
import java.util.Map;
@Mapper
@Component
public interface StudentMapper extends BaseMapper<Student> {
@Select("SELECT * FROM hhr_student WHERE stu_name = #{name} AND id_card = #{idCard}")
Map<String,Object> selectStudentByNameAndIdCard(@Param("name") String name, @Param("idCard") String idCard);
@Select("SELECT * FROM hhr_student WHERE id = #{id}")
Map<String,Object> getStuById(@Param("id") String id);
}
common/src/main/java/com/winsun/mapper/UserSchoolMapper.java 0 → 100644
package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.UserSchool;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component;
@Mapper
@Component
public interface UserSchoolMapper extends BaseMapper<UserSchool> {
}
common/src/main/java/com/winsun/smsUtils/GetAccessToken.java
package com.winsun.smsUtils;
import lombok.extern.slf4j.Slf4j;
import java.util.HashMap;
import java.util.Map;
/**
* 令牌获取
*/
@Slf4j
public class GetAccessToken {
public static void main(String[] args) {
......@@ -26,7 +29,7 @@ public class GetAccessToken {
try {
String test = HttpUtil.httpPostMethodNoReTryWithStr(url,requestData);
System.out.println(test);
log.info(test);
} catch (Exception e) {
e.printStackTrace();
}
......@@ -42,14 +45,14 @@ public class GetAccessToken {
String clientType = "10001";
Map<String,String> requestData = new HashMap<>();
requestData.put("timeStamp",String.valueOf(System.currentTimeMillis()));
System.out.println(requestData);
log.info(requestData.toString());
RequestParasUtil.setParas(requestData,appKey,appSecret,version,format,clientType);
try {
System.out.println(requestData);
log.info(requestData.toString());
String accesstoken = HttpUtil.httpPostMethodNoReTryWithStr(url,requestData);
System.out.println(accesstoken);
log.info(accesstoken);
return accesstoken;
} catch (Exception e) {
e.printStackTrace();
......
common/src/main/java/com/winsun/smsUtils/HttpUtil.java
package com.winsun.smsUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpHost;
......@@ -19,6 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@Slf4j
public class HttpUtil {
public static int httpPostMethodNoReTry( String url, Map<String, String> pairs ) throws Exception {
......@@ -82,7 +84,7 @@ public class HttpUtil {
.setProxy(proxy).build();
request.setConfig(requestConfig);
// 发�?�请�?
System.out.println(request);
log.info(request.getMethod());
CloseableHttpResponse response = httpclient.execute(request);
HttpEntity entity = response.getEntity();
ret = EntityUtils.toString(entity);
......
common/src/main/java/com/winsun/smsUtils/RequestParasUtil.java
package com.winsun.smsUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import java.net.URLEncoder;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@Slf4j
public class RequestParasUtil {
public RequestParasUtil() {
......@@ -50,7 +51,7 @@ public class RequestParasUtil {
requestData.put("clientType", clientType);
requestData.put("format", format);
requestData.put("paras", cipherParas);
// System.out.println("appSecret:"+appSecret);
// log.info("appSecret:"+appSecret);
String plainSig = appKey + clientType + format + version + cipherParas;
requestData.put("sign", generateHmacSignature(plainSig, appSecret));
} else {
......
common/src/main/java/com/winsun/smsUtils/SendSmsAndMail.java
package com.winsun.smsUtils;
import lombok.extern.slf4j.Slf4j;
import net.sf.json.JSONObject;
import java.util.*;
@Slf4j
public class SendSmsAndMail {
public static void main(String[] args) {
......@@ -12,17 +14,17 @@ public class SendSmsAndMail {
"13697427771/t1836@sise.cn/660040Abca"
);
obj.addAll(list);
System.out.println(obj.size());
for (String s : obj) {
String[] split = s.split("/");
System.out.println(split[0]+"--"+split[1]+"---"+split[2]);
// System.out.println(sendSms(s,"http://yrym.winsun-aly.com/gdtel-xyzx-hhr/customer/plan.do?orderId=d70f3423a6f","2"));
System.out.println("返回："+sendSms("11111111111","111111","7"));
log.info(split[0]+"--"+split[1]+"---"+split[2]);
// log.info(sendSms(s,"http://yrym.winsun-aly.com/gdtel-xyzx-hhr/customer/plan.do?orderId=d70f3423a6f","2"));
log.info("返回："+sendSms("11111111111","111111","7"));
}
System.out.println("发送完成");
log.info("发送完成");
// String res = BaiduDwz.createShortUrl("http://yrym.winsun-aly.com/gdtel-xyzx-hhr/customer/plan.do?orderId=d70f3423a6f");
// 生成url
// System.out.println(res);
// log.info(res);
}
......
common/src/main/java/com/winsun/smsUtils/XXTea.java
package com.winsun.smsUtils;
import lombok.extern.slf4j.Slf4j;
/**
* XXTea加解密实�?
*/
@Slf4j
public class XXTea {
/**
......@@ -211,12 +215,12 @@ public class XXTea {
long t1 = System.currentTimeMillis();
String cipherText =
XXTea.encrypt(plainText,"UTF-8",ByteFormat.toHex(key));
System.out.println(cipherText);
log.info(cipherText);
String pText = XXTea.decrypt(cipherText,"UTF-8",ByteFormat.toHex(key));
System.out.println(pText);
log.info(pText);
long t2 = System.currentTimeMillis();
System.out.println(t2-t1);
log.info((t2-t1) + "");
}catch(Exception ex){
ex.printStackTrace();
}
......
common/src/main/java/com/winsun/utils/BeanUtil.java 0 → 100644
package com.winsun.utils;
import java.util.List;
import java.util.Map;
/**
* 判断bean，数组，集合是否为空
*
* @author liujianhao
*
*/
public class BeanUtil {
public static boolean isBlank(Object obj) {
if (obj == null) {
return true;
}
return false;
}
public static boolean isBlank(List<?> list) {
if (list == null || list.size() <= 0) {
return true;
}
return false;
}
public static boolean isBlank(Map<?, ?> map) {
if (map == null || map.size() <= 0) {
return true;
}
return false;
}
public static boolean isBlank(Object[] obj) {
if (obj == null || obj.length <= 0) {
return true;
}
return false;
}
public static boolean isNotBlank(Object obj) {
return !isBlank(obj);
}
public static boolean isNotBlank(List<?> list) {
return !isBlank(list);
}
public static boolean isNotBlank(Map<?, ?> map) {
return !isBlank(map);
}
public static boolean isNotBlank(Object[] obj) {
return !isBlank(obj);
}
}
common/src/main/java/com/winsun/utils/ProduceIdUtil.java 0 → 100644
package com.winsun.utils;
/**
* @Author xuede
* @Date 2020/2/5 22:58
* @Version 1.0
*/
public class ProduceIdUtil {
private long workerId;
private long datacenterId;
private long sequence = 0L;
private long twepoch = 1580914838112L; // Thu, 04 Nov 2020-02-05 23:00:00 GMT 标记时间 用来计算偏移量，距离当前时间不同，得到的数据的位数也不同
private long workerIdBits = 5L; // 物理节点ID长度
private long datacenterIdBits = 5L; // 数据中心ID长度
private long maxWorkerId = -1L ^ (-1L << workerIdBits); // 最大支持机器节点数0~31，一共32个
private long maxDatacenterId = -1L ^ (-1L << datacenterIdBits); // 最大支持数据中心节点数0~31，一共32个
private long sequenceBits = 12L; // 序列号12位， 4095，同毫秒内生成不同id的最大个数
private long workerIdShift = sequenceBits; // 机器节点左移12位
private long datacenterIdShift = sequenceBits + workerIdBits; // 数据中心节点左移17位
private long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits; // 时间毫秒数左移22位
private long sequenceMask = -1L ^ (-1L << sequenceBits); // 用于和当前时间戳做比较，以获取最新时间
private long lastTimestamp = -1L;
//成员类，SnowFlakeUtil的实例对象的保存域
private static class IdGenHolder {
private static final ProduceIdUtil instance = new ProduceIdUtil();
}
//外部调用获取SnowFlakeUtil的实例对象，确保不可变
public static ProduceIdUtil get(){
return IdGenHolder.instance;
}
//初始化构造，无参构造有参函数，默认节点都是0
public ProduceIdUtil() {
this(0L, 0L);
}
//设置机器节点和数据中心节点数，都是 0-31
public ProduceIdUtil(long workerId, long datacenterId) {
if (workerId > maxWorkerId || workerId < 0) {
throw new IllegalArgumentException(String.format("worker Id can't be greater than %d or less than 0", maxWorkerId));
}
if (datacenterId > maxDatacenterId || datacenterId < 0) {
throw new IllegalArgumentException(String.format("datacenter Id can't be greater than %d or less than 0", maxDatacenterId));
}
this.workerId = workerId;
this.datacenterId = datacenterId;
}
//线程安全的id生成方法
@SuppressWarnings("all")
public synchronized long nextId() {
//获取当前毫秒数
long timestamp = timeGen();
//如果服务器时间有问题(时钟后退) 报错。
if (timestamp < lastTimestamp) {
throw new RuntimeException(String.format(
"Clock moved backwards. Refusing to generate id for %d milliseconds", lastTimestamp - timestamp));
}
//如果上次生成时间和当前时间相同,在同一毫秒内
if (lastTimestamp == timestamp) {
//sequence自增，因为sequence只有12bit，所以和sequenceMask相与一下，去掉高位
sequence = (sequence + 1) & sequenceMask;
//判断是否溢出,也就是每毫秒内超过4095，当为4096时，与sequenceMask相与，sequence就等于0
if (sequence == 0) {
//自旋等待到下一毫秒
timestamp = tilNextMillis(lastTimestamp);
}
} else {
//如果和上次生成时间不同,重置sequence，就是下一毫秒开始，sequence计数重新从0开始累加，每个毫秒时间内，都是从0开始计数，最大4095
sequence = 0L;
}
lastTimestamp = timestamp;
// 最后按照规则拼出ID 64位
// 000000000000000000000000000000000000000000 00000 00000 000000000000
//1位固定整数 time datacenterId workerId sequence
return ((timestamp - twepoch) << timestampLeftShift) | (datacenterId << datacenterIdShift)
| (workerId << workerIdShift) | sequence;
}
//比较当前时间和过去时间，防止时钟回退（机器问题），保证给的都是最新时间/最大时间
protected long tilNextMillis(long lastTimestamp) {
long timestamp = timeGen();
while (timestamp <= lastTimestamp) {
timestamp = timeGen();
}
return timestamp;
}
//获取当前的时间戳（毫秒）
protected long timeGen() {
return System.currentTimeMillis();
}
/**
* 获取全局唯一编码
*/
public static Long getId(){
Long id = ProduceIdUtil.get().nextId();
return id;
}
}
common/src/main/java/com/winsun/utils/XbkUtil.java
......@@ -17,6 +17,7 @@ import java.util.Map;
@Slf4j
public class XbkUtil {
public static JSONObject xbkCreate(Map<String, Object> map, String type){
Map<String, Object> mapParm = new HashMap<>();
Date now = new Date();
......
core-service/src/main/java/com/winsun/item/modular/system/controller/GetPhoneCodeController.java
......@@ -24,8 +24,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* 日志管理的控制器
......
deploy/prod/pushToDocker.sh 0 → 100755
#!/bin/bash
## 推送到公司的docker私库，暂时是试用的
cp ../../eureka/target/*.jar docker-gdtel-gztel-hhr/eureka/
cp ../../gateway/target/*.jar docker-gdtel-gztel-hhr/gateway/
cp ../../core-service/target/*.jar docker-gdtel-gztel-hhr/core/
cp ../../apply-net/target/*.jar docker-gdtel-gztel-hhr/applynet/
cp ../../service-manager/target/*.jar docker-gdtel-gztel-hhr/manager/
cp ../../new-user/target/*.jar docker-gdtel-gztel-hhr/newuser/
cp ../../old-user/target/*.jar docker-gdtel-gztel-hhr/olduser/
cp ../../task/target/*.jar docker-gdtel-gztel-hhr/task/
cd docker-gdtel-gztel-hhr/
cd eureka
docker build -t 172.18.101.172:5000/eureka . && docker push 172.18.101.172:5000/eureka
cd ../gateway
docker build -t 172.18.101.172:5000/gateway . && docker push 172.18.101.172:5000/gateway
enclosure/export/20200327/订单清单20200327.xls 0 → 100644
++ "b/enclosure/export/20200327/\350\256\242\345\215\225\346\270\205\345\215\22520200327.xls"
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