he2802 2 năm trước cách đây
mục cha
commit
9789daa31c

+ 2 - 1
zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -466,7 +466,8 @@ public class CommonController extends BaseController {
         if (!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(), bo.getSign())) {
             return AjaxResult.error("签名错误");
         }
-        return AjaxResult.success("成功", iTopSysTenantRegisterService.insertByAddBo(bo) ? 1 : 0);
+        iTopSysTenantRegisterService.insertByAddBo(bo);
+        return AjaxResult.success("成功", webService.restartWebService() ? 1 : 0);
     }
 
     @ApiOperation("重启服务restart")

+ 8 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysWebServiceImpl.java

@@ -432,6 +432,11 @@ public class SysWebServiceImpl implements ISysWebService {
         else if(plat==3){
             filePath = "/www/public/live";
         }
+        String[] split = host.split("\\.");
+        String rootHost = "gdzzkj.net";
+        if(split.length==3){
+            rootHost = split[1]+'.'+split[2];
+        }
         String configParam = " server {\n" +
                 "    listen       80; # 同时支持HTTP\n" +
                 "    listen       443 ssl; # 添加HTTPS支持\n" +
@@ -442,8 +447,8 @@ public class SysWebServiceImpl implements ISysWebService {
                 "    }\n" +
                 "\n" +
                 "    #SSL配置\n" +
-                "    ssl_certificate      /mydata/nginx/ssl/gdzzkj.net.pem; # 配置证书\n" +
-                "    ssl_certificate_key  /mydata/nginx/ssl/gdzzkj.net.key; # 配置证书私钥\n" +
+                "    ssl_certificate      /mydata/nginx/ssl/%s.pem; # 配置证书\n" +
+                "    ssl_certificate_key  /mydata/nginx/ssl/%s.key; # 配置证书私钥\n" +
                 "    ssl_protocols        TLSv1 TLSv1.1 TLSv1.2; # 配置SSL协议版本 # 配置SSL加密算法\n" +
                 "    ssl_ciphers          ECDHE-RSA-AES128-GCM-SHA256:HIGH:!aNULL:!MD5:!RC4:!DHE;\n" +
                 "    ssl_prefer_server_ciphers  on; # 优先采取服务器算法\n" +
@@ -462,7 +467,7 @@ public class SysWebServiceImpl implements ISysWebService {
                     "        }\n" ;
         }
         configParam+="}\n";
-        String param = String.format(configParam, host, filePath);
+        String param = String.format(configParam, host, filePath,rootHost,rootHost);
         return param;
     }
 }