Skip to content

G
gdtel-gztel-school-center
Commit d7bb5f61 by 彭祥礼
Options

Merge remote-tracking branch 'origin/master'

parents 86b643f6 fad81c9b
Showing with 416 additions and 131 deletions
apply-net/src/main/java/com/winsun/controller/DankuanController.java
package com.winsun.controller; package com.winsun.controller;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.winsun.auth.core.common.model.ResponseData; import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.bean.OrderView;
import com.winsun.bean.Product; import com.winsun.bean.Product;
import com.winsun.bean.School; import com.winsun.bean.School;
import com.winsun.bean.UniversityInfo; import com.winsun.bean.UniversityInfo;
import com.winsun.constant.Constant;
import com.winsun.constant.OrderStatus;
import com.winsun.mapper.*; import com.winsun.mapper.*;
import com.winsun.utils.IDCardUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -13,11 +19,17 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -13,11 +19,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* 单宽办理接口 * 单宽办理接口
*
* @Author xuede * @Author xuede
* @Date 2020/3/9 16:52 * @Date 2020/3/9 16:52
* @Version 1.0 * @Version 1.0
...@@ -35,51 +47,196 @@ public class DankuanController { ...@@ -35,51 +47,196 @@ public class DankuanController {
private static UniversityInfoMapper universityInfoMapper; private static UniversityInfoMapper universityInfoMapper;
private static OrderViewMapper orderViewMapper;
@Autowired @Autowired
public DankuanController(ProductMapper productMapper,SchoolMapper schoolMapper,AppMapper appMapper,UniversityInfoMapper universityInfoMapper ){ public DankuanController(ProductMapper productMapper, SchoolMapper schoolMapper, AppMapper appMapper,
DankuanController.productMapper=productMapper; UniversityInfoMapper universityInfoMapper, OrderViewMapper orderViewMapper) {
DankuanController.schoolMapper=schoolMapper; DankuanController.productMapper = productMapper;
DankuanController.appMapper=appMapper; DankuanController.schoolMapper = schoolMapper;
DankuanController.universityInfoMapper=universityInfoMapper; DankuanController.appMapper = appMapper;
DankuanController.universityInfoMapper = universityInfoMapper;
DankuanController.orderViewMapper = orderViewMapper;
} }
/** /**
* 查询单宽办理接口 * 查询单宽办理接口
*
* @return * @return
*/ */
@RequestMapping("/data") @RequestMapping("/data")
public ResponseData<Product> getdankuanData(@RequestParam("id") Integer id){ public ResponseData<Product> getdankuanData(@RequestParam("id") Integer id) {
//空，直接返回 //空，直接返回
if (id==null){ if (id == null) {
return ResponseData.error("请输入合伙人id"); return ResponseData.error("请输入合伙人id");
} }
String schoolId = appMapper.selectSchoolId(id.toString()); String schoolId = appMapper.selectSchoolId(id.toString());
School school = schoolMapper.selectById(schoolId); School school = schoolMapper.selectById(schoolId);
String bandproductId = school.getBandproductId(); String bandproductId = school.getBandproductId();
if (StringUtils.isBlank(bandproductId)){ if (StringUtils.isBlank(bandproductId)) {
return ResponseData.error("敬请期待"); return ResponseData.error("敬请期待");
} }
Product product = productMapper.selectById(bandproductId); Product product = productMapper.selectById(bandproductId);
return ResponseData.success(product); return ResponseData.success(product);
} }
@RequestMapping("/DomainName") @RequestMapping("/selectUniversity")
public ResponseData<String> getDomainName(@RequestParam("schoolName") String schoolName){ public ResponseData<UniversityInfo> selectUniversity(@RequestParam("universityId") String universityId) {
//空，直接返回 UniversityInfo universityInfo = universityInfoMapper.selectById(universityId);
if (StringUtils.isBlank(schoolName)){ return ResponseData.success(universityInfo);
return ResponseData.error("请输入学校名称"); }
@RequestMapping("/createProductOrder")
public ResponseData<OrderView> createProductOrder(@RequestParam("orderName") String orderName, @RequestParam("orderPhone") String orderPhone,
@RequestParam("orderNumber") String orderNumber, @RequestParam("orderCustomerStudentId") String orderCustomerStudentId,
@RequestParam("orderCustomerAccount") String orderCustomerAccount, @RequestParam("orderCustomerPwd") String orderCustomerPwd,
@RequestParam("orderSetMeal") String orderSetMeal, @RequestParam("productId") String productId,
@RequestParam("webOrderAmount") String webOrderAmount) {
if(!IDCardUtil.IDCardValidate(orderNumber)){
return ResponseData.error("您的身份证输入有误，请重新输入！");
}
if (orderPhone.length() != 11) {
return ResponseData.error("联系号码有误，请重新输入");
}
Wrapper<OrderView> wrapper = new EntityWrapper<>();
wrapper.eq(StringUtils.isNotBlank(orderNumber), "orderNumber", orderNumber);
wrapper.ne( "status", OrderStatus.INVALID.getId());
List<OrderView> orderViews = orderViewMapper.selectList(wrapper);
OrderView orderV = new OrderView();
if(orderViews.size()!= 0){
orderV.setOrderId(orderViews.get(0).getOrderId());
orderV.setOrderseq(orderViews.get(0).getOrderseq());
return ResponseData.error(orderV,"当前身份证号已有订单存在！");
}
SimpleDateFormat yyyyMMdd = new SimpleDateFormat("yyyyMMdd");
Date date = new Date();
String format = yyyyMMdd.format(date);
String s = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
String orderSeq = "YRYM" + format + s;
Product product = productMapper.selectById(productId);
OrderView orderView = new OrderView();
orderView.setOrdername(orderName);
orderView.setOrderphone(orderPhone);
orderView.setOrdernumber(orderNumber);
orderView.setOrderCustomerStudentId(orderCustomerStudentId);
orderView.setOrderCustomerAccount(orderCustomerAccount);
orderView.setOrderCustomerPwd(orderCustomerPwd);
orderView.setOrderSetMeal(orderSetMeal);
orderView.setOrderseq(orderSeq);
orderView.setProductname(product.getProductTitle());
orderView.setOrderdate(new Date());
orderView.setOrderUniversityName(product.getProductUniversity());
orderView.setStatus(OrderStatus.NOTPAID.getId());
orderView.setOrderRegion(product.getProductRegion());
orderView.setPaytype("1");
orderView.setWeborderamount(webOrderAmount);
if(webOrderAmount.equals("0")){
orderView.setIpay("0");
}else {
orderView.setIpay("1");
}
orderView.setOrderreqtranseq("xyzxyql");
orderView.setOrderCustomerType("学生");
Integer insert = orderViewMapper.insert(orderView);
if(insert == 1){
orderV.setOrderId(orderView.getOrderId());
orderV.setOrderseq(orderView.getOrderseq());
return ResponseData.success(orderV,"订单提交完成！");
}
return ResponseData.error("提交失败！");
}
/* *//**
* @author ljh
* @Description:支付请求
*//*
private void JsoupMethodZhifu(HttpServletRequest request, HttpServletResponse response) throws Exception {
// TODO Auto-generated method stub
log.info("----------首先发送支付请求接口----------");
Map<String, String> map = new HashMap<String, String>();
//查询订单信息
//给MAP数组添加数据
map.put("CLIENTNUMBER", Constant.CLIENTNUMBER);
map.put("ORDERSEQ", orderMap.get("orderSeq"));
log.info("----------宽带价格prices：" + prices);
if (Constant.PRODUCTSKU479Str.indexOf(prices) != -1) {
map.put("PRODUCTSKU", Constant.PRODUCTSKU479);
} else {
map.put("PRODUCTSKU", Constant.PRODUCTSKU481);
}
map.put("ORDERDATE", orderMap.get("orderDate"));
String pricesStr = orderMap.get("prices").replace("元", "");
// pricesStr = "0.01";
map.put("ORDERAMOUNT", pricesStr);
map.put("ORDERNAME", orderMap.get("orderName"));
map.put("ORDERPHONE", orderMap.get("orderPhone"));
map.put("ORDERNUMBER", orderMap.get("orderNumber"));
if (Constant.Payment1.equals(radioValue)) {
String MERCHANTURL = Constant.TOMCATURL + "/gdtel-xyzx-hhr/vPageJump/toPaymentSuccessPage.do?orderSeq=" + orderMap.get("orderSeq");
map.put("MERCHANTURL", MERCHANTURL);
} }
EntityWrapper<UniversityInfo> universityInfowrapper = new EntityWrapper<>(); if (orderMap.get("upStatus") != null && orderMap.get("upStatus").equals("1")) {
universityInfowrapper.setSqlSelect("university_domain_name as domainName",schoolName); //支付成功后融合回调
universityInfowrapper.eq("university_name",schoolName); map.put("BACKDROPURL", Constant.TOMCATURL + "/gdtel-xyzx-hhr/paymentCon/toSubmisOrderPreserRH.do");
List<Map<String,Object>> universityInfos = universityInfoMapper.selectMaps(universityInfowrapper); } else {
if (CollectionUtils.isEmpty(universityInfos)){ //单宽回调地址
return ResponseData.error("查找不到学校相应数据"); map.put("BACKDROPURL", Constant.TOMCATURL + "/gdtel-xyzx-hhr/paymentCon/toSubmisOrderPreser.do");
} }
if ( universityInfos.get(0).get("domainName")==null){ String str = "ORDERSEQ=" + orderMap.get("orderSeq") + "&ORDERDATE=" + orderMap.get("orderDate") + "&ORDERAMOUNT=" + pricesStr + "&KEY=" + Constant.KEY;
return ResponseData.error("查找不到学校相应数据"); *//* 将值转换为大写 *//*
map.put("MAC", SignUtil.exChange(SignUtil.md5EncodeSignature(str)));
int PAYTYPE = 1; // 支付类型
int IPAY = 1; // 支付平台
log.info("----------支付渠道（0翼支付网厅，1支付宝，3微信）：" + radioValue);
if (Constant.Payment3.equals(radioValue)) {
PAYTYPE = 5;
IPAY = 3;
} }
return ResponseData.success(universityInfos.get(0).get("domainName").toString()); map.put("PAYTYPE", String.valueOf(PAYTYPE));
map.put("IPAY", String.valueOf(IPAY));
log.info("----------支付请求参数：" + map);
//定义Document对象
Document doc = null;
String result = "";
String qrcode = "";
//Jsoup用post提交,超时6秒钟，
doc = Jsoup.connect("https://gzdxpay.mini189.cn/web/order-pay.action").data(map).timeout(20000).ignoreContentType(true).post();
//获取回调信息
String i = doc.text().trim();
System.out.println(i);
//解析json格式
JSONObject json = JSONObject.fromObject(i);
//获取jsonp格式中的result（短链接，返回到前端）
log.info("----------调用穗易付接口返回的结果：" + json);
result = (String) json.get("result");
qrcode = (String) json.get("qrcode");
String ORDERSEQ = (String) json.get("ORDERSEQ");
String msg = (String) json.get("msg");
if (StringUtils.isNotBlank(msg) && msg.equals("success")) {
//获取的短链接地址，使用redirect方式返回前端。（流程图中的步骤8,301跳转）
orderMap.put("payType", PAYTYPE + "");
log.info("====默认受理未付费，之后可通过提交订单到智能平台后再更新状态====");
orderMap.put("Status", "100");
log.info("====保存到本地数据库 ====");
if (StringUtils.isNotBlank(ORDERSEQ)) {
Map<String, Object> queOrderMaps = orderService.queryorderSeq(ORDERSEQ); // 保存前查询订单号是否存在，存在即为更新
if (BeanUtil.isNotBlank(queOrderMaps)) {
saveOrderInfo(request, orderMap, ORDERSEQ);
} else {
saveOrderInfo(request, orderMap, "");
}
}
response.sendRedirect(result);
} }
}*/
} }
apply-net/src/main/resources/application-prod.yml
...@@ -95,7 +95,7 @@ spring: ...@@ -95,7 +95,7 @@ spring:
# republish failures to the DLQ with diagnostic headers # republish failures to the DLQ with diagnostic headers
republish-to-dlq: true republish-to-dlq: true
rabbitmq: rabbitmq:
host: rabbitmq host: 172.18.101.171
port: 5672 port: 5672
username: guest username: guest
password: guest password: guest
...@@ -104,9 +104,9 @@ spring: ...@@ -104,9 +104,9 @@ spring:
cluster: cluster:
max-redirects: 3 max-redirects: 3
nodes: nodes:
- redis:6379 - ${spring.redis.host}:${spring.redis.port}
database: 0 database: 0
host: redis host: 172.18.101.171
port: 6379 port: 6379
password: password:
lettuce: lettuce:
......
common/src/main/java/com/winsun/bean/Product.java
...@@ -110,4 +110,6 @@ public class Product implements Serializable { ...@@ -110,4 +110,6 @@ public class Product implements Serializable {
private String productIntroductionPic4; private String productIntroductionPic4;
private String productIntroductionPic5; private String productIntroductionPic5;
private int universityId;
} }
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://ismart.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/smsUtils/GetAccessToken.java
package com.winsun.smsUtils; package com.winsun.smsUtils;
import lombok.extern.slf4j.Slf4j;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** /**
* 令牌获取 * 令牌获取
*/ */
@Slf4j
public class GetAccessToken { public class GetAccessToken {
public static void main(String[] args) { public static void main(String[] args) {
...@@ -26,7 +29,7 @@ public class GetAccessToken { ...@@ -26,7 +29,7 @@ public class GetAccessToken {
try { try {
String test = HttpUtil.httpPostMethodNoReTryWithStr(url,requestData); String test = HttpUtil.httpPostMethodNoReTryWithStr(url,requestData);
System.out.println(test); log.info(test);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
...@@ -42,14 +45,14 @@ public class GetAccessToken { ...@@ -42,14 +45,14 @@ public class GetAccessToken {
String clientType = "10001"; String clientType = "10001";
Map<String,String> requestData = new HashMap<>(); Map<String,String> requestData = new HashMap<>();
requestData.put("timeStamp",String.valueOf(System.currentTimeMillis())); requestData.put("timeStamp",String.valueOf(System.currentTimeMillis()));
System.out.println(requestData); log.info(requestData.toString());
RequestParasUtil.setParas(requestData,appKey,appSecret,version,format,clientType); RequestParasUtil.setParas(requestData,appKey,appSecret,version,format,clientType);
try { try {
System.out.println(requestData); log.info(requestData.toString());
String accesstoken = HttpUtil.httpPostMethodNoReTryWithStr(url,requestData); String accesstoken = HttpUtil.httpPostMethodNoReTryWithStr(url,requestData);
System.out.println(accesstoken); log.info(accesstoken);
return accesstoken; return accesstoken;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
......
common/src/main/java/com/winsun/smsUtils/HttpUtil.java
package com.winsun.smsUtils; package com.winsun.smsUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpEntity; import org.apache.http.HttpEntity;
import org.apache.http.HttpHost; import org.apache.http.HttpHost;
...@@ -19,6 +20,7 @@ import java.util.ArrayList; ...@@ -19,6 +20,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@Slf4j
public class HttpUtil { public class HttpUtil {
public static int httpPostMethodNoReTry( String url, Map<String, String> pairs ) throws Exception { public static int httpPostMethodNoReTry( String url, Map<String, String> pairs ) throws Exception {
...@@ -82,7 +84,7 @@ public class HttpUtil { ...@@ -82,7 +84,7 @@ public class HttpUtil {
.setProxy(proxy).build(); .setProxy(proxy).build();
request.setConfig(requestConfig); request.setConfig(requestConfig);
// 发�?�请�? // 发�?�请�?
System.out.println(request); log.info(request.getMethod());
CloseableHttpResponse response = httpclient.execute(request); CloseableHttpResponse response = httpclient.execute(request);
HttpEntity entity = response.getEntity(); HttpEntity entity = response.getEntity();
ret = EntityUtils.toString(entity); ret = EntityUtils.toString(entity);
......
common/src/main/java/com/winsun/smsUtils/RequestParasUtil.java
package com.winsun.smsUtils; package com.winsun.smsUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
@Slf4j
public class RequestParasUtil { public class RequestParasUtil {
public RequestParasUtil() { public RequestParasUtil() {
...@@ -50,7 +51,7 @@ public class RequestParasUtil { ...@@ -50,7 +51,7 @@ public class RequestParasUtil {
requestData.put("clientType", clientType); requestData.put("clientType", clientType);
requestData.put("format", format); requestData.put("format", format);
requestData.put("paras", cipherParas); requestData.put("paras", cipherParas);
// System.out.println("appSecret:"+appSecret); // log.info("appSecret:"+appSecret);
String plainSig = appKey + clientType + format + version + cipherParas; String plainSig = appKey + clientType + format + version + cipherParas;
requestData.put("sign", generateHmacSignature(plainSig, appSecret)); requestData.put("sign", generateHmacSignature(plainSig, appSecret));
} else { } else {
......
common/src/main/java/com/winsun/smsUtils/SendSmsAndMail.java
package com.winsun.smsUtils; package com.winsun.smsUtils;
import lombok.extern.slf4j.Slf4j;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import java.util.*; import java.util.*;
@Slf4j
public class SendSmsAndMail { public class SendSmsAndMail {
public static void main(String[] args) { public static void main(String[] args) {
...@@ -12,17 +14,17 @@ public class SendSmsAndMail { ...@@ -12,17 +14,17 @@ public class SendSmsAndMail {
"13697427771/t1836@sise.cn/660040Abca" "13697427771/t1836@sise.cn/660040Abca"
); );
obj.addAll(list); obj.addAll(list);
System.out.println(obj.size());
for (String s : obj) { for (String s : obj) {
String[] split = s.split("/"); String[] split = s.split("/");
System.out.println(split[0]+"--"+split[1]+"---"+split[2]); log.info(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")); // log.info(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("返回："+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"); // String res = BaiduDwz.createShortUrl("http://yrym.winsun-aly.com/gdtel-xyzx-hhr/customer/plan.do?orderId=d70f3423a6f");
// 生成url // 生成url
// System.out.println(res); // log.info(res);
} }
......
common/src/main/java/com/winsun/smsUtils/XXTea.java
package com.winsun.smsUtils; package com.winsun.smsUtils;
import lombok.extern.slf4j.Slf4j;
/** /**
* XXTea加解密实�? * XXTea加解密实�?
*/ */
@Slf4j
public class XXTea { public class XXTea {
/** /**
...@@ -211,12 +215,12 @@ public class XXTea { ...@@ -211,12 +215,12 @@ public class XXTea {
long t1 = System.currentTimeMillis(); long t1 = System.currentTimeMillis();
String cipherText = String cipherText =
XXTea.encrypt(plainText,"UTF-8",ByteFormat.toHex(key)); 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)); String pText = XXTea.decrypt(cipherText,"UTF-8",ByteFormat.toHex(key));
System.out.println(pText); log.info(pText);
long t2 = System.currentTimeMillis(); long t2 = System.currentTimeMillis();
System.out.println(t2-t1); log.info((t2-t1) + "");
}catch(Exception ex){ }catch(Exception ex){
ex.printStackTrace(); ex.printStackTrace();
} }
......
core-service/src/main/resources/application-prod.yml
...@@ -70,7 +70,7 @@ spring: ...@@ -70,7 +70,7 @@ spring:
# republish failures to the DLQ with diagnostic headers # republish failures to the DLQ with diagnostic headers
republish-to-dlq: true republish-to-dlq: true
rabbitmq: rabbitmq:
host: rabbitmq host: 172.18.101.171
port: 5672 port: 5672
username: guest username: guest
password: guest password: guest
...@@ -79,9 +79,9 @@ spring: ...@@ -79,9 +79,9 @@ spring:
cluster: cluster:
max-redirects: 3 max-redirects: 3
nodes: nodes:
- redis:6379 - ${spring.redis.host}:${spring.redis.port}
database: 0 database: 0
host: redis host: 172.18.101.171
port: 6379 port: 6379
password: password:
lettuce: lettuce:
......
deploy/prod/docker-gdtel-gztel-hhr/core/Dockerfile
FROM openjdk:8-jre-alpine FROM openjdk:8-jre-alpine
LABEL maintainer="Liph <liph@gzwinsun.com>" app="gdtelgztelschoolcentercore" LABEL maintainer="Liph <liph@gzwinsun.com>" app="gdtelgztelschoolcentercore"
ENV JAR_NAME=applynet \ ENV JAR_NAME=core \
TZ=Asia/Shanghai TZ=Asia/Shanghai
COPY $JAR_NAME.jar $JAR_NAME.jar COPY $JAR_NAME.jar $JAR_NAME.jar
EXPOSE 11002 EXPOSE 11002
......
deploy/prod/docker-gdtel-gztel-hhr/docker-compose.yml
...@@ -5,8 +5,6 @@ services: ...@@ -5,8 +5,6 @@ services:
container_name: eureka container_name: eureka
ports: ports:
- "20000:20000" - "20000:20000"
depends_on:
- rabbitmq
deploy: deploy:
resources: resources:
limits: limits:
...@@ -19,7 +17,6 @@ services: ...@@ -19,7 +17,6 @@ services:
ports: ports:
- "10001:10001" - "10001:10001"
depends_on: depends_on:
- rabbitmq
- eureka - eureka
deploy: deploy:
resources: resources:
...@@ -33,7 +30,6 @@ services: ...@@ -33,7 +30,6 @@ services:
ports: ports:
- "10002:10002" - "10002:10002"
depends_on: depends_on:
- rabbitmq
- eureka - eureka
deploy: deploy:
resources: resources:
...@@ -47,12 +43,10 @@ services: ...@@ -47,12 +43,10 @@ services:
ports: ports:
- "11091:11091" - "11091:11091"
volumes: volumes:
- "./gdtel-gztel-school-center/manager/enclosure:/enclosure" - "./enclosure:/enclosure"
depends_on: depends_on:
- rabbitmq
- eureka - eureka
- redis - gdtelgztelschoolcentercore
- core
deploy: deploy:
resources: resources:
limits: limits:
...@@ -65,10 +59,8 @@ services: ...@@ -65,10 +59,8 @@ services:
ports: ports:
- "11191:11191" - "11191:11191"
depends_on: depends_on:
- rabbitmq
- eureka - eureka
- redis - gdtelgztelschoolcentercore
- core
deploy: deploy:
resources: resources:
limits: limits:
...@@ -81,10 +73,8 @@ services: ...@@ -81,10 +73,8 @@ services:
ports: ports:
- "11092:11092" - "11092:11092"
depends_on: depends_on:
- rabbitmq
- eureka - eureka
- redis - gdtelgztelschoolcentercore
- core
deploy: deploy:
resources: resources:
limits: limits:
...@@ -97,10 +87,8 @@ services: ...@@ -97,10 +87,8 @@ services:
ports: ports:
- "11093:11093" - "11093:11093"
depends_on: depends_on:
- rabbitmq
- eureka - eureka
- redis - gdtelgztelschoolcentercore
- core
deploy: deploy:
resources: resources:
limits: limits:
...@@ -113,10 +101,8 @@ services: ...@@ -113,10 +101,8 @@ services:
ports: ports:
- "11094:11094" - "11094:11094"
depends_on: depends_on:
- rabbitmq
- eureka - eureka
- redis - gdtelgztelschoolcentercore
- core
deploy: deploy:
resources: resources:
limits: limits:
...@@ -129,50 +115,15 @@ services: ...@@ -129,50 +115,15 @@ services:
ports: ports:
- "11090:11090" - "11090:11090"
depends_on: depends_on:
- rabbitmq
- redis
- eureka
- gateway
- core
deploy:
resources:
limits:
memory: 100M
reservations:
memory: 100M
winsunoaui:
image: winsunoaui
container_name: winsunoaui
ports:
- "11080:11080"
depends_on:
- rabbitmq
- redis
- eureka - eureka
- gateway - gateway
- core - gdtelgztelschoolcentercore
deploy: deploy:
resources: resources:
limits: limits:
memory: 100M memory: 100M
reservations: reservations:
memory: 100M memory: 100M
winsunoareport:
image: winsunoareport
container_name: winsunoareport
ports:
- "10003:10003"
depends_on:
- rabbitmq
- redis
- eureka
- core
deploy:
resources:
limits:
memory: 500M
reservations:
memory: 100M
gdtelgztelschoolcentermobileui: gdtelgztelschoolcentermobileui:
image: gdtelgztelschoolcentermobileui image: gdtelgztelschoolcentermobileui
container_name: gdtelgztelschoolcentermobileui container_name: gdtelgztelschoolcentermobileui
...@@ -180,7 +131,7 @@ services: ...@@ -180,7 +131,7 @@ services:
- "11089:11089" - "11089:11089"
depends_on: depends_on:
- eureka - eureka
- core - gdtelgztelschoolcentercore
deploy: deploy:
resources: resources:
limits: limits:
......
deploy/prod/upload.sh
#!/bin/bash #!/bin/bash
cp ../eureka/target/*.jar docker-gdtel-gztel-hhr/eureka/ cp ../../eureka/target/*.jar docker-gdtel-gztel-hhr/eureka/
cp ../gateway/target/*.jar docker-gdtel-gztel-hhr/gateway/ cp ../../gateway/target/*.jar docker-gdtel-gztel-hhr/gateway/
cp ../core-service/target/*.jar docker-gdtel-gztel-hhr/core/ cp ../../core-service/target/*.jar docker-gdtel-gztel-hhr/core/
cp ../apply-net/target/*.jar docker-gdtel-gztel-hhr/applynet/ cp ../../apply-net/target/*.jar docker-gdtel-gztel-hhr/applynet/
cp ../service-manager/target/*.jar docker-gdtel-gztel-hhr/manager/ cp ../../service-manager/target/*.jar docker-gdtel-gztel-hhr/manager/
cp ../new-user/target/*.jar docker-gdtel-gztel-hhr/newuser/ cp ../../new-user/target/*.jar docker-gdtel-gztel-hhr/newuser/
cp ../old-user/target/*.jar docker-gdtel-gztel-hhr/olduser/ cp ../../old-user/target/*.jar docker-gdtel-gztel-hhr/olduser/
cp ../task/target/*.jar docker-gdtel-gztel-hhr/task/ cp ../../task/target/*.jar docker-gdtel-gztel-hhr/task/
scp -r docker-gdtel-gztel-hhr/* liph@172.18.101.171:/datas/apps/web/docker-gdtel-gztel-hhr/
scp -r docker-gdtel-gztel-hhr/* root@172.18.101.171:/datas/apps/web/docker-gdtel-gztel-hhr/
\ No newline at end of file
enclosure/export/20200327/订单清单20200327.xls 0 → 100644
++ "b/enclosure/export/20200327/\350\256\242\345\215\225\346\270\205\345\215\22520200327.xls"
new-user/src/main/resources/application-prod.yml
...@@ -97,7 +97,7 @@ spring: ...@@ -97,7 +97,7 @@ spring:
# republish failures to the DLQ with diagnostic headers # republish failures to the DLQ with diagnostic headers
republish-to-dlq: true republish-to-dlq: true
rabbitmq: rabbitmq:
host: rabbitmq host: 172.18.101.171
port: 5672 port: 5672
username: guest username: guest
password: guest password: guest
...@@ -106,9 +106,9 @@ spring: ...@@ -106,9 +106,9 @@ spring:
cluster: cluster:
max-redirects: 3 max-redirects: 3
nodes: nodes:
- redis:6379 - ${spring.redis.host}:${spring.redis.port}
database: 0 database: 0
host: redis host: 172.18.101.171
port: 6379 port: 6379
password: password:
lettuce: lettuce:
......
old-user/src/main/resources/application-prod.yml
...@@ -95,7 +95,7 @@ spring: ...@@ -95,7 +95,7 @@ spring:
# republish failures to the DLQ with diagnostic headers # republish failures to the DLQ with diagnostic headers
republish-to-dlq: true republish-to-dlq: true
rabbitmq: rabbitmq:
host: rabbitmq host: 172.18.101.171
port: 5672 port: 5672
username: guest username: guest
password: guest password: guest
...@@ -104,9 +104,9 @@ spring: ...@@ -104,9 +104,9 @@ spring:
cluster: cluster:
max-redirects: 3 max-redirects: 3
nodes: nodes:
- redis:6379 - ${spring.redis.host}:${spring.redis.port}
database: 0 database: 0
host: redis host: 172.18.101.171
port: 6379 port: 6379
password: password:
lettuce: lettuce:
......
order/src/main/java/com/winsun/bean/Step.java 0 → 100644
package com.winsun.bean;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import lombok.Data;
import java.util.Date;
/**
* 流程步骤
* @author Liph
* @datetime 2020-04-20/4/1 10:58
*/
@Data
@TableName("sys_step")
public class Step {
@TableId
private String id;
/**
* 流程路径（主要用于队列执行的时候用）
*/
private String path;
/**
* 步骤名称
*/
private String name;
/**
* 步骤描述
*/
private String desc;
/**
* 步骤所关联的表单
*/
private String formId;
/**
* 创建时间
*/
private Date createTime;
/**
* 流程步骤对应到的接口ID标识（例如全包类名）
*/
private String interfaceId;
/**
* 下一步骤的流程ID主键
* 主要描述情况 A，不归属完成
*/
private String selectA;
/**
* 选择情况A的时候，更新工单的状态值
*/
private String selectAval;
/**
* 下一步骤的流程ID主键
* 主要描述情况 B，不归属完成
*/
private String selectB;
/**
* 选择情况B的时候，更新工单的状态值
*/
private String slectBval;
/**
* 下一步骤的流程ID主键
* 主要描述当前流程完成
*/
private String selectNext;
/**
* 选择当前步骤完成，工单更新的状态值
*/
private String selectNextVal;
}
renewal-user/src/main/resources/application-prod.yml
...@@ -95,7 +95,7 @@ spring: ...@@ -95,7 +95,7 @@ spring:
# republish failures to the DLQ with diagnostic headers # republish failures to the DLQ with diagnostic headers
republish-to-dlq: true republish-to-dlq: true
rabbitmq: rabbitmq:
host: rabbitmq host: 172.18.101.171
port: 5672 port: 5672
username: guest username: guest
password: guest password: guest
...@@ -104,9 +104,9 @@ spring: ...@@ -104,9 +104,9 @@ spring:
cluster: cluster:
max-redirects: 3 max-redirects: 3
nodes: nodes:
- redis:6379 - ${spring.redis.host}:${spring.redis.port}
database: 0 database: 0
host: redis host: 172.18.101.171
port: 6379 port: 6379
password: password:
lettuce: lettuce:
......
service-manager/src/main/java/com/winsun/controller/ProductController.java
...@@ -106,6 +106,7 @@ public class ProductController extends BaseController { ...@@ -106,6 +106,7 @@ public class ProductController extends BaseController {
dataMapping.put("product_meal", pro.getProductMeal()); dataMapping.put("product_meal", pro.getProductMeal());
dataMapping.put("product_title", pro.getProductTitle()); dataMapping.put("product_title", pro.getProductTitle());
dataMapping.put("product_university", pro.getProductUniversity()); dataMapping.put("product_university", pro.getProductUniversity());
dataMapping.put("university_id", pro.getUniversityId());
dataMapping.put("product_price", pro.getProductPrice()); dataMapping.put("product_price", pro.getProductPrice());
dataMapping.put("product_region", pro.getProductRegion()); dataMapping.put("product_region", pro.getProductRegion());
dataMapping.put("product_rate", pro.getProductRate()); dataMapping.put("product_rate", pro.getProductRate());
......
service-manager/src/main/java/com/winsun/controller/UniversityInfoController.java
...@@ -18,10 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -18,10 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.Date; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* 大学宽带管理 * 大学宽带管理
...@@ -133,4 +130,16 @@ public class UniversityInfoController extends BaseController { ...@@ -133,4 +130,16 @@ public class UniversityInfoController extends BaseController {
page.setRecords(universitys); page.setRecords(universitys);
return ResponseData.success(page, "查询成功！"); return ResponseData.success(page, "查询成功！");
} }
/**
* 宽带适用学校
* @return
*/
@Permission(menuname = "单宽学校名称", value = "universitySchool", method = RequestMethod.POST)
public ResponseData< List<UniversityInfo>> universitySchool(){
Wrapper<UniversityInfo> wrapper = new EntityWrapper();
List<UniversityInfo> universityInfos = universityInfoMapper.selectList(wrapper);
return ResponseData.success(universityInfos);
}
} }
service-manager/src/main/resources/application-prod.yml
...@@ -95,7 +95,7 @@ spring: ...@@ -95,7 +95,7 @@ spring:
# republish failures to the DLQ with diagnostic headers # republish failures to the DLQ with diagnostic headers
republish-to-dlq: true republish-to-dlq: true
rabbitmq: rabbitmq:
host: rabbitmq host: 172.18.101.171
port: 5672 port: 5672
username: guest username: guest
password: guest password: guest
...@@ -104,9 +104,9 @@ spring: ...@@ -104,9 +104,9 @@ spring:
cluster: cluster:
max-redirects: 3 max-redirects: 3
nodes: nodes:
- redis:6379 - ${spring.redis.host}:${spring.redis.port}
database: 0 database: 0
host: redis host: 172.18.101.171
port: 6379 port: 6379
password: password:
lettuce: lettuce:
......
service-manager/src/main/resources/application.yml
...@@ -17,6 +17,8 @@ server: ...@@ -17,6 +17,8 @@ server:
uri-encoding: UTF-8 uri-encoding: UTF-8
max-threads: 200 max-threads: 200
max-connections: 2000 max-connections: 2000
jetty:
max-http-post-size: 1000000
winsun: winsun:
app: app:
version: @project.version@ version: @project.version@
......
task/src/main/resources/application-prod.yml
...@@ -96,7 +96,7 @@ spring: ...@@ -96,7 +96,7 @@ spring:
# republish failures to the DLQ with diagnostic headers # republish failures to the DLQ with diagnostic headers
republish-to-dlq: true republish-to-dlq: true
rabbitmq: rabbitmq:
host: rabbitmq host: 172.18.101.171
port: 5672 port: 5672
username: guest username: guest
password: guest password: guest
...@@ -105,9 +105,9 @@ spring: ...@@ -105,9 +105,9 @@ spring:
cluster: cluster:
max-redirects: 3 max-redirects: 3
nodes: nodes:
- redis:6379 - ${spring.redis.host}:${spring.redis.port}
database: 0 database: 0
host: redis host: 172.18.101.171
port: 6379 port: 6379
password: password:
lettuce: lettuce:
......
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