Merge branch 'reg' of http://gitlab.scsmile.cn/zxf/smart_gov_platform into reg

base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowBusinessServiceImpl.java

@@ -8,6 +8,7 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.util.HttpUtil;
+import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.module.business.model.BusinessEntity;
 import com.mortals.xhx.module.business.model.BusinessQuery;
@@ -90,6 +91,7 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus
     protected void removeBefore(Long[] ids, Context context) throws AppException {
         Arrays.asList(ids).forEach(id -> {
             WindowBusinessEntity windowBusinessEntity = this.get(id, context);
+            windowBusinessEntity.setSiteBusinessId(null);
             pushChangeMsg(windowBusinessEntity);
         });
         super.removeBefore(ids, context);
@@ -120,11 +122,14 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus
         super.updateAfter(entity, context);
     }
 
+
+
     private void pushChangeMsg(WindowBusinessEntity entity) {
         String phpUrl = GlobalSysInfo.getParamValue(PARAM_SERVER_PHP_HTTP_URL, "http://172.15.28.116:8090");
         phpUrl += "/api/window/winNameChange";
         HashMap<String, Object> paramsMap = new HashMap<>();
         paramsMap.put("windowid", entity.getWindowId());
+        paramsMap.put("bussinessid", entity.getSiteBusinessId());
         paramsMap.put("typeinfo", 1);
         String resp = null;
         try {

deploy.sh

@@ -251,7 +251,7 @@ socket=/tmp/mysql.sock
 port = ${MYSQL_PORT}
 sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES
 symbolic-links=0
-max_connections=400
+max_connections=1000
 innodb_file_per_table=1
 #表名存储在磁盘是小写的，但是比较的时候是不区分大小写
 lower_case_table_names=1