正式环境部署

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebSocketConfig.java

@@ -8,15 +8,15 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter;
  * @Description: WebSocketConfig
  * @author: jeecg-boot
  */
-@Configuration
-public class WebSocketConfig {
-    /**
-     * 	注入ServerEndpointExporter，
-     * 	这个bean会自动注册使用了@ServerEndpoint注解声明的Websocket endpoint
-     */
-    @Bean
-    public ServerEndpointExporter serverEndpointExporter() {
-        return new ServerEndpointExporter();
-    }
-
-}
+//@Configuration
+//public class WebSocketConfig {
+//    /**
+//     * 	注入ServerEndpointExporter，
+//     * 	这个bean会自动注册使用了@ServerEndpoint注解声明的Websocket endpoint
+//     */
+//    @Bean
+//    public ServerEndpointExporter serverEndpointExporter() {
+//        return new ServerEndpointExporter();
+//    }
+//
+//}

jeecg-boot-module-system/pom.xml

@@ -8,7 +8,8 @@
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>jeecg-boot-module-system</artifactId>
+	<artifactId>jeecg-boot</artifactId>
+	<packaging>war</packaging>
 
 	<repositories>
 		<repository>
@@ -62,19 +63,21 @@
 		</dependency>
 
 	</dependencies>
-
 	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<!--SpringCloud运行环境 ,值改为true跳过SpringBoot启动打包插件 -->
-					<skip>${skip.springboot.maven}</skip>
-				</configuration>
-			</plugin>
-		</plugins>
+		<finalName>jeecg-boot</finalName>
 	</build>
+<!--	<build>-->
+<!--		<plugins>-->
+<!--			<plugin>-->
+<!--				<groupId>org.springframework.boot</groupId>-->
+<!--				<artifactId>spring-boot-maven-plugin</artifactId>-->
+<!--				<configuration>-->
+<!--					&lt;!&ndash;SpringCloud运行环境 ,值改为true跳过SpringBoot启动打包插件 &ndash;&gt;-->
+<!--					<skip>${skip.springboot.maven}</skip>-->
+<!--				</configuration>-->
+<!--			</plugin>-->
+<!--		</plugins>-->
+<!--	</build>-->
 
 	<profiles>
 		<!-- SpringCloud运行环境 -->

jeecg-boot-module-system/src/main/java/org/jeecg/JeecgSystemApplication.java

@@ -23,6 +23,30 @@ import java.net.UnknownHostException;
 @Slf4j
 @SpringBootApplication
 @EnableAutoConfiguration(exclude={MongoAutoConfiguration.class})
+//public class JeecgSystemApplication extends SpringBootServletInitializer {
+//
+//    @Override
+//    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+//        return application.sources(JeecgSystemApplication.class);
+//    }
+//
+//    public static void main(String[] args) throws UnknownHostException {
+//        ConfigurableApplicationContext application = SpringApplication.run(JeecgSystemApplication.class, args);
+//        Environment env = application.getEnvironment();
+//        String ip = InetAddress.getLocalHost().getHostAddress();
+//        String port = env.getProperty("server.port");
+//        String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
+//        log.info("\n----------------------------------------------------------\n\t" +
+//                "Application Jeecg-Boot is running! Access URLs:\n\t" +
+//                "Local: \t\thttp://localhost:" + port + path + "/\n\t" +
+//                "External: \thttp://" + ip + ":" + port + path + "/\n\t" +
+//                "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
+//                "----------------------------------------------------------");
+//
+//    }
+//
+//}
+
 public class JeecgSystemApplication extends SpringBootServletInitializer {
 
     @Override
@@ -30,19 +54,8 @@ public class JeecgSystemApplication extends SpringBootServletInitializer {
         return application.sources(JeecgSystemApplication.class);
     }
 
-    public static void main(String[] args) throws UnknownHostException {
-        ConfigurableApplicationContext application = SpringApplication.run(JeecgSystemApplication.class, args);
-        Environment env = application.getEnvironment();
-        String ip = InetAddress.getLocalHost().getHostAddress();
-        String port = env.getProperty("server.port");
-        String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
-        log.info("\n----------------------------------------------------------\n\t" +
-                "Application Jeecg-Boot is running! Access URLs:\n\t" +
-                "Local: \t\thttp://localhost:" + port + path + "/\n\t" +
-                "External: \thttp://" + ip + ":" + port + path + "/\n\t" +
-                "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
-                "----------------------------------------------------------");
 
+    public static void main(String[] args) {
+        SpringApplication.run(JeecgSystemApplication.class, args);
     }
-
 }

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -39,10 +39,10 @@ spring:
   quartz:
     job-store-type: jdbc
     initialize-schema: embedded
-    #延迟1秒启动定时任务
-    startup-delay: 1s
     #定时任务启动开关，true-开  false-关
     auto-startup: true
+    #延迟1秒启动定时任务
+    startup-delay: 1s
     #启动时更新己存在的Job
     overwrite-existing-jobs: true
     properties:
@@ -116,14 +116,14 @@ spring:
         # 初始化大小，最小，最大
         initial-size: 5
         min-idle: 5
-        maxActive: 1000
+        maxActive: 20
         # 配置获取连接等待超时的时间
         maxWait: 60000
         # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
         timeBetweenEvictionRunsMillis: 60000
         # 配置一个连接在池中最小生存的时间，单位是毫秒
         minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
+        validationQuery: SELECT 1
         testWhileIdle: true
         testOnBorrow: false
         testOnReturn: false
@@ -184,26 +184,25 @@ jeecg:
   # 签名密钥串(前后端要一致，正式发布请自行修改)
   signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
   # 本地：local\Minio：minio\阿里云：alioss
-  uploadType: alioss
+  uploadType: local
   path:
     #文件上传根目录 设置
-    upload: /opt/jeecg-boot/upload
+    upload: /opt/upFiles
     #webapp文件路径
-    webapp: /opt/jeecg-boot/webapp
+    webapp: /opt/webapp
   shiro:
-    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/api/getUserInfo
+    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
   #阿里云oss存储和大鱼短信秘钥配置
   oss:
     accessKey: ??
     secretKey: ??
     endpoint: oss-cn-beijing.aliyuncs.com
     bucketName: jeecgdev
-    staticDomain: https://static.jeecg.com
-  # ElasticSearch 设置
+  # ElasticSearch 6设置
   elasticsearch:
     cluster-name: jeecg-ES
     cluster-nodes: 127.0.0.1:9200
-    check-enabled: true
+    check-enabled: false
   # 表单设计器配置
   desform:
     # 主题颜色（仅支持 16进制颜色代码）
@@ -214,7 +213,7 @@ jeecg:
       # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
       baidu: ??
   # 在线预览文件服务器地址配置
-  file-view-domain: http://fileview.jeecg.com
+  file-view-domain: 127.0.0.1:8012
   # minio文件上传
   minio:
     minio_url: http://minio.jeecg.com
@@ -223,13 +222,20 @@ jeecg:
     bucketName: otatest
   #大屏报表参数设置
   jmreport:
-    mode: prod
+    mode: dev
     #数据字典是否进行saas数据隔离，自己看自己的字典
     saas: false
     #是否需要校验token
     is_verify_token: true
     #必须校验方法
     verify_methods: remove,delete,save,add,update
+    #自定义项目前缀
+    customPrePath:
+    pageSize:
+      - 10
+      - 20
+      - 30
+      - 40
   #Wps在线文档
   wps:
     domain: https://wwo.wps.cn/office/
@@ -272,7 +278,7 @@ knife4j:
   #开启生产环境屏蔽
   production: false
   basic:
-    enable: true
+    enable: false
     username: jeecg
     password: jeecg1314
 #第三方登录

jeecg-boot-module-system/src/main/resources/application-prod.yml

@@ -149,7 +149,7 @@ spring:
   #redis 配置
   redis:
     database: 0
-    host: 115.29.148.71
+    host: 127.0.0.1
     lettuce:
       pool:
         max-active: 8   #最大连接数据库连接数,设 -1 为没有限制
@@ -203,7 +203,7 @@ jeecg:
   elasticsearch:
     cluster-name: jeecg-ES
     cluster-nodes: 127.0.0.1:9200
-    check-enabled: true
+    check-enabled: false
   # 表单设计器配置
   desform:
     # 主题颜色（仅支持 16进制颜色代码）
@@ -214,7 +214,7 @@ jeecg:
       # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
       baidu: ??
   # 在线预览文件服务器地址配置
-  file-view-domain: http://fileview.jeecg.com
+  file-view-domain: http://115.29.148.71：8866
   # minio文件上传
   minio:
     minio_url: http://minio.jeecg.com

jeecg-boot-module-system/target/classes/application-dev.yml

@@ -39,10 +39,10 @@ spring:
   quartz:
     job-store-type: jdbc
     initialize-schema: embedded
-    #延迟1秒启动定时任务
-    startup-delay: 1s
     #定时任务启动开关，true-开  false-关
     auto-startup: true
+    #延迟1秒启动定时任务
+    startup-delay: 1s
     #启动时更新己存在的Job
     overwrite-existing-jobs: true
     properties:
@@ -116,14 +116,14 @@ spring:
         # 初始化大小，最小，最大
         initial-size: 5
         min-idle: 5
-        maxActive: 1000
+        maxActive: 20
         # 配置获取连接等待超时的时间
         maxWait: 60000
         # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
         timeBetweenEvictionRunsMillis: 60000
         # 配置一个连接在池中最小生存的时间，单位是毫秒
         minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
+        validationQuery: SELECT 1
         testWhileIdle: true
         testOnBorrow: false
         testOnReturn: false
@@ -184,26 +184,25 @@ jeecg:
   # 签名密钥串(前后端要一致，正式发布请自行修改)
   signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
   # 本地：local\Minio：minio\阿里云：alioss
-  uploadType: alioss
+  uploadType: local
   path:
     #文件上传根目录 设置
-    upload: /opt/jeecg-boot/upload
+    upload: /opt/upFiles
     #webapp文件路径
-    webapp: /opt/jeecg-boot/webapp
+    webapp: /opt/webapp
   shiro:
-    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/api/getUserInfo
+    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
   #阿里云oss存储和大鱼短信秘钥配置
   oss:
     accessKey: ??
     secretKey: ??
     endpoint: oss-cn-beijing.aliyuncs.com
     bucketName: jeecgdev
-    staticDomain: https://static.jeecg.com
-  # ElasticSearch 设置
+  # ElasticSearch 6设置
   elasticsearch:
     cluster-name: jeecg-ES
     cluster-nodes: 127.0.0.1:9200
-    check-enabled: true
+    check-enabled: false
   # 表单设计器配置
   desform:
     # 主题颜色（仅支持 16进制颜色代码）
@@ -214,7 +213,7 @@ jeecg:
       # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
       baidu: ??
   # 在线预览文件服务器地址配置
-  file-view-domain: http://fileview.jeecg.com
+  file-view-domain: 127.0.0.1:8012
   # minio文件上传
   minio:
     minio_url: http://minio.jeecg.com
@@ -223,13 +222,20 @@ jeecg:
     bucketName: otatest
   #大屏报表参数设置
   jmreport:
-    mode: prod
+    mode: dev
     #数据字典是否进行saas数据隔离，自己看自己的字典
     saas: false
     #是否需要校验token
     is_verify_token: true
     #必须校验方法
     verify_methods: remove,delete,save,add,update
+    #自定义项目前缀
+    customPrePath:
+    pageSize:
+      - 10
+      - 20
+      - 30
+      - 40
   #Wps在线文档
   wps:
     domain: https://wwo.wps.cn/office/
@@ -272,7 +278,7 @@ knife4j:
   #开启生产环境屏蔽
   production: false
   basic:
-    enable: true
+    enable: false
     username: jeecg
     password: jeecg1314
 #第三方登录

jeecg-boot-module-system/target/classes/application-prod.yml

@@ -149,7 +149,7 @@ spring:
   #redis 配置
   redis:
     database: 0
-    host: 115.29.148.71
+    host: 127.0.0.1
     lettuce:
       pool:
         max-active: 8   #最大连接数据库连接数,设 -1 为没有限制
@@ -203,7 +203,7 @@ jeecg:
   elasticsearch:
     cluster-name: jeecg-ES
     cluster-nodes: 127.0.0.1:9200
-    check-enabled: true
+    check-enabled: false
   # 表单设计器配置
   desform:
     # 主题颜色（仅支持 16进制颜色代码）
@@ -214,7 +214,7 @@ jeecg:
       # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
       baidu: ??
   # 在线预览文件服务器地址配置
-  file-view-domain: http://fileview.jeecg.com
+  file-view-domain: http://115.29.148.71：8866
   # minio文件上传
   minio:
     minio_url: http://minio.jeecg.com