Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 86b643f6 fad81c9b
Showing with 156 additions and 122 deletions
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,132 +43,87 @@ services: ...@@ -47,132 +43,87 @@ 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:
memory: 500M memory: 500M
reservations: reservations:
memory: 100M memory: 100M
gdtelgztelschoolcentertask: gdtelgztelschoolcentertask:
image: gdtelgztelschoolcentertask image: gdtelgztelschoolcentertask
container_name: gdtelgztelschoolcentertask container_name: gdtelgztelschoolcentertask
ports:
- "11191:11191"
depends_on:
- rabbitmq
- eureka
- redis
- core
deploy:
resources:
limits:
memory: 500M
reservations:
memory: 100M
gdtelgztelschoolcenterapplynet:
image: gdtelgztelschoolcenterapplynet
container_name: gdtelgztelschoolcenterapplynet
ports:
- "11092:11092"
depends_on:
- rabbitmq
- eureka
- redis
- core
deploy:
resources:
limits:
memory: 500M
reservations:
memory: 100M
gdtelgztelschoolcenternewuser:
image: gdtelgztelschoolcenternewuser
container_name: gdtelgztelschoolcenternewuser
ports:
- "11093:11093"
depends_on:
- rabbitmq
- eureka
- redis
- core
deploy:
resources:
limits:
memory: 500M
reservations:
memory: 100M
gdtelgztelschoolcenterolduser:
image: gdtelgztelschoolcenterolduser
container_name: gdtelgztelschoolcenterolduser
ports: ports:
- "11094:11094" - "11191:11191"
depends_on: depends_on:
- rabbitmq
- eureka - eureka
- redis - gdtelgztelschoolcentercore
- core
deploy: deploy:
resources: resources:
limits: limits:
memory: 500M memory: 500M
reservations: reservations:
memory: 100M memory: 100M
gdtelgztelschoolcenterui: gdtelgztelschoolcenterapplynet:
image: gdtelgztelschoolcenterui image: gdtelgztelschoolcenterapplynet
container_name: gdtelgztelschoolcenterui container_name: gdtelgztelschoolcenterapplynet
ports: ports:
- "11090:11090" - "11092:11092"
depends_on: depends_on:
- rabbitmq
- redis
- eureka - eureka
- gateway - gdtelgztelschoolcentercore
- core
deploy: deploy:
resources: resources:
limits: limits:
memory: 100M memory: 500M
reservations: reservations:
memory: 100M memory: 100M
winsunoaui: gdtelgztelschoolcenternewuser:
image: winsunoaui image: gdtelgztelschoolcenternewuser
container_name: winsunoaui container_name: gdtelgztelschoolcenternewuser
ports: ports:
- "11080:11080" - "11093:11093"
depends_on: depends_on:
- rabbitmq
- redis
- eureka - eureka
- gateway - gdtelgztelschoolcentercore
- core
deploy: deploy:
resources: resources:
limits: limits:
memory: 100M memory: 500M
reservations: reservations:
memory: 100M memory: 100M
winsunoareport: gdtelgztelschoolcenterolduser:
image: winsunoareport image: gdtelgztelschoolcenterolduser
container_name: winsunoareport container_name: gdtelgztelschoolcenterolduser
ports: ports:
- "10003:10003" - "11094:11094"
depends_on: depends_on:
- rabbitmq
- redis
- eureka - eureka
- core - gdtelgztelschoolcentercore
deploy: deploy:
resources: resources:
limits: limits:
memory: 500M memory: 500M
reservations: reservations:
memory: 100M memory: 100M
gdtelgztelschoolcenterui:
image: gdtelgztelschoolcenterui
container_name: gdtelgztelschoolcenterui
ports:
- "11090:11090"
depends_on:
- eureka
- gateway
- gdtelgztelschoolcentercore
deploy:
resources:
limits:
memory: 100M
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"
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