配置调整优化

.gitignore

@@ -29,6 +29,8 @@ coverage
 *.iws
 *.iml
 *.ipr
+**/out/artifacts/
+
 
 ### Eclipse ###
 .apt_generated
@@ -62,3 +64,4 @@ build/
 /dist/
 dist
 /UI/**/dist.rar
+

SERVER/VberAdminPlus/script/sql/VberAdminPlus.sql

@@ -255,9 +255,9 @@ insert into sys_menu
 values ('113', '缓存监控', '2', '3', 'cache', 'monitor/cache/index', '', 1, 0, 'C', '0', '0', 'monitor:cache',
         'exclude', '', '', 'admin', sysdate(), '', null, '缓存监控菜单');
 -- springboot-admin监控
-insert into sys_menu
-values ('114', 'Admin监控', '2', '4', 'Admin', 'monitor/admin/index', '', 1, 0, 'C', '0', '0', 'monitor:admin',
-        'list-task', '', '', 'admin', sysdate(), '', null, 'Admin监控菜单');
+# insert into sys_menu
+# values ('114', 'Admin监控', '2', '4', 'Admin', 'monitor/admin/index', '', 1, 0, 'C', '0', '0', 'monitor:admin',
+#         'list-task', '', '', 'admin', sysdate(), '', null, 'Admin监控菜单');
 insert into sys_menu
 values ('120', '任务调度中心', '2', '5', 'XxlJob', 'monitor/xxljob/index', '', 1, 0, 'C', '0', '0',
         'monitor:xxljob', 'list-task', '', '', 'admin', sysdate(), '', null, 'Xxl-Job控制台菜单');

SERVER/VberAdminPlus/vber-admin/src/main/resources/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: com.vber.VberApplication
+

SERVER/VberAdminPlus/vber-admin/src/main/resources/application-dev.yml

@@ -100,25 +100,25 @@ vber:
 spring.boot.admin.client:
   # 增加客户端开关
   enabled: true
-  url: http://localhost:9090/admin
+  url: http://localhost:6067/admin
   instance:
     service-host-type: IP
   username: vber
-  password: 123456
+  password: 123iwb
 
 --- # xxl-job 配置
 xxl.job:
   # 执行器开关
   enabled: false
   # 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。
-  admin-addresses: http://localhost:6100/xxl-job-admin
+  admin-addresses: http://localhost:6068/xxl-job-admin
   # 执行器通讯TOKEN：非空时启用
   access-token: xxl-job
   executor:
     # 执行器AppName：执行器心跳注册分组依据；为空则关闭自动注册
     appname: xxl-job-executor
-    # 执行器端口号 执行器从9101开始往后写
-    port: 6101
+    # 执行器端口号 执行器从6080开始往后写
+    port: 6080
     # 执行器注册：默认IP:PORT
     address:
     # 执行器IP：默认自动获取IP
@@ -205,7 +205,7 @@ spring:
 
 redisson:
   # redis key前缀
-  keyPrefix: vap
+  keyPrefix: VberAdminPlus
   # 线程池数量
   threads: 4
   # Netty线程池数量

SERVER/VberAdminPlus/vber-admin/src/main/resources/application-prod.yml

@@ -1,7 +1,8 @@
 --- # 临时文件存储位置 避免临时文件被系统清理报错
-spring.servlet.multipart.location: /vber/server/temp
+spring.servlet.multipart.location: /VberAdminPlus/server/temp
 
 vber:
+  profile: /VberAdminPlus/UploadPath
   shardingSphere:
     enabled: false
     database-name: vber_logic_db
@@ -26,8 +27,8 @@ vber:
 --- # 监控中心配置
 spring.boot.admin.client:
   # 增加客户端开关
-  enabled: true
-  url: http://localhost:9090/admin
+  enabled: false
+  url: http://47.112.30.247:6067/admin
   instance:
     service-host-type: IP
   username: vber
@@ -38,14 +39,14 @@ xxl.job:
   # 执行器开关
   enabled: true
   # 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。
-  admin-addresses: http://localhost:9100/xxl-job-admin
+  admin-addresses: http://47.112.30.247:6068/xxl-job-admin
   # 执行器通讯TOKEN：非空时启用
   access-token: xxl-job
   executor:
     # 执行器AppName：执行器心跳注册分组依据；为空则关闭自动注册
     appname: xxl-job-executor
-    # 执行器端口号 执行器从9101开始往后写
-    port: 9101
+    # 执行器端口号 执行器从6080开始往后写
+    port: 6080
     # 执行器注册：默认IP:PORT
     address:
     # 执行器IP：默认自动获取IP
@@ -132,7 +133,7 @@ spring:
 
 redisson:
   # redis key前缀
-  keyPrefix: vap
+  keyPrefix: VberAdminPlus
   # 线程池数量
   threads: 16
   # Netty线程池数量

SERVER/VberAdminPlus/vber-admin/src/main/resources/logback-plus.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <property name="log.path" value="./logs"/>
+    <property name="log.path" value="./logs/VberAdminPlus"/>
     <property name="console.log.pattern"
               value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
     <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/>
@@ -98,32 +98,32 @@
     </appender>
 
     <!-- 整合 skywalking 控制台输出 tid -->
-<!--    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">-->
-<!--        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">-->
-<!--            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">-->
-<!--                <pattern>[%tid] ${console.log.pattern}</pattern>-->
-<!--            </layout>-->
-<!--            <charset>utf-8</charset>-->
-<!--        </encoder>-->
-<!--    </appender>-->
+    <!--    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">-->
+    <!--        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">-->
+    <!--            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">-->
+    <!--                <pattern>[%tid] ${console.log.pattern}</pattern>-->
+    <!--            </layout>-->
+    <!--            <charset>utf-8</charset>-->
+    <!--        </encoder>-->
+    <!--    </appender>-->
 
     <!-- 整合 skywalking 推送采集日志 -->
-<!--    <appender name="sky_log" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">-->
-<!--        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">-->
-<!--            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">-->
-<!--                <pattern>[%tid] ${console.log.pattern}</pattern>-->
-<!--            </layout>-->
-<!--            <charset>utf-8</charset>-->
-<!--        </encoder>-->
-<!--    </appender>-->
+    <!--    <appender name="sky_log" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">-->
+    <!--        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">-->
+    <!--            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">-->
+    <!--                <pattern>[%tid] ${console.log.pattern}</pattern>-->
+    <!--            </layout>-->
+    <!--            <charset>utf-8</charset>-->
+    <!--        </encoder>-->
+    <!--    </appender>-->
 
     <!--系统操作日志-->
     <root level="info">
-        <appender-ref ref="console" />
-        <appender-ref ref="async_info" />
-        <appender-ref ref="async_error" />
-        <appender-ref ref="file_console" />
-<!--        <appender-ref ref="sky_log"/>-->
+        <appender-ref ref="console"/>
+        <appender-ref ref="async_info"/>
+        <appender-ref ref="async_error"/>
+        <appender-ref ref="file_console"/>
+        <!--        <appender-ref ref="sky_log"/>-->
     </root>
 
 </configuration>

SERVER/VberAdminPlus/vber-extend/vber-monitor-admin/src/main/resources/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: com.vber.MonitorAdminApplication
+

SERVER/VberAdminPlus/vber-extend/vber-monitor-admin/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 6090
+  port: 6067
 spring:
   application:
     name: vber-monitor-admin
@@ -14,7 +14,7 @@ spring:
   security:
     user:
       name: vber
-      password: 123456
+      password: 123iwb
   boot:
     admin:
       ui:
@@ -38,8 +38,8 @@ spring.boot.admin.client:
   # 增加客户端开关
   enabled: true
   # 设置 Spring Boot Admin Server 地址
-  url: http://localhost:6090/admin
+  url: http://47.112.30.247:6067/admin
   instance:
     service-host-type: IP
   username: vber
-  password: 123456
+  password: 123iwb

SERVER/VberAdminPlus/vber-extend/vber-xxl-job-admin/src/main/resources/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: com.xxl.job.admin.XxlJobAdminApplication
+

SERVER/VberAdminPlus/vber-extend/vber-xxl-job-admin/src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ spring.boot.admin.client:
   # 增加客户端开关
   enabled: true
   # 设置 Spring Boot Admin Server 地址
-  url: http://localhost:6090/admin
+  url: http://localhost:6067/admin
   instance:
     service-host-type: IP
   username: vber

SERVER/VberAdminPlus/vber-extend/vber-xxl-job-admin/src/main/resources/application-prod.yml

@@ -1,13 +1,13 @@
 --- # 监控配置
 spring.boot.admin.client:
   # 增加客户端开关
-  enabled: true
+  enabled: false
   # 设置 Spring Boot Admin Server 地址
-  url: http://localhost:6090/admin
+  url: http://47.112.30.247:6067/admin
   instance:
     service-host-type: IP
   username: vber
-  password: 123456
+  password: 123iwb
 
 --- # 数据库配置
 spring:

SERVER/VberAdminPlus/vber-extend/vber-xxl-job-admin/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 --- # server 配置
 server:
-  port: 6100
+  port: 6068
   servlet:
     context-path: /xxl-job-admin
 spring:

SERVER/VberAdminPlus/vber-generator/pom.xml

@@ -35,6 +35,11 @@
             <groupId>com.vap</groupId>
             <artifactId>vber-framework</artifactId>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 

SERVER/VberAdminPlus/vber-generator/src/test/java/com/vber/ProjectReactor.java

@@ -1,8 +1,11 @@
 package com.vber;
 
 import com.vber.generator.util.ProjectReactorUtils;
+import org.junit.Test;
+
 
 public class ProjectReactor {
+    @Test
     public static void main(String[] args) {
         // ========== 手动修改配置后运行 ==========
         String groupId = "com.va";