wuxw7
2018-11-25 32a0be25858797b3be4c5991c89ffe61d5930706
api userId 不能为空 信息修复
1个文件已修改
4个文件已添加
30 ■■■■■ 已修改文件
Api/docker/docker-compose.yml 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/UserRegisterServiceListener.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
reBuildAll.sh 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
restartAll.sh 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
stopAll.sh 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/docker/docker-compose.yml
New file
@@ -0,0 +1,20 @@
version: '2'
services:
   api-1:
       container_name: api-1
       image: 'registry.cn-beijing.aliyuncs.com/sxd/ubuntu-java8:1.0'
       user: tomcat
       restart: always
       ports:
       - "8008:8008"
       volumes:
       - ./prop:/home/tomcat/prop
       - ./webapps/portal-web.war:/home/tomcat/webapps/portal-web.war
       - ./conf/catalina.sh:/home/tomcat/bin/catalina.sh
       - ./dump:/home/tomcat/dump
       - ../hlog:/home/tomcat/hlog
       - ../pinpoint:/home/tomcat/pinpoint
       - ../ojdbc/ojdbc7.jar:/home/tomcat/lib/ojdbc7.jar
       dns:
       - 135.192.40.121
       network_mode: "bridge"
Api/src/main/java/com/java110/api/listener/UserRegisterServiceListener.java
@@ -72,8 +72,10 @@
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_SERVICE_CODE,ServiceCodeConstant.SERVICE_CODE_SAVE_USER_INFO);
        business.put(CommonConstant.HTTP_BUSINESS_SERVICE_NAME,"用户注册");
        business.put(CommonConstant.HTTP_USER_ID,"-1");
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessUser",JSONObject.parseObject(paramIn));
        HttpHeaders header = new HttpHeaders();
        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_USER_ID,"-1");
        String paramInObj = super.restToCenterProtocol(business,dataFlowContext.getRequestCurrentHeaders()).toJSONString();
        HttpEntity<String> httpEntity = new HttpEntity<String>(paramInObj, header);
reBuildAll.sh
New file
@@ -0,0 +1,4 @@
#!/usr/bin/env bash
mvn clean install;
mvn clean package;
docker-compose -f /data/qhcrm/app-assist/docker-compose.yml       up -d --force-recreate;
restartAll.sh
New file
@@ -0,0 +1,2 @@
#!/usr/bin/env bash
docker-compose -f /data/qhcrm/app-assist/docker-compose.yml       restart;
stopAll.sh
New file
@@ -0,0 +1,2 @@
#!/usr/bin/env bash
docker-compose -f /data/qhcrm-assist/docker-compose.yml       down;