Merge branch 'master' of http://47.107.53.207:3000/traineeCoder001/Bailian-Al

# Conflicts:
#	benyun-core/src/main/resources/application-prod.yaml
#	ruoyi-admin/src/main/resources/application-prod.yml

.run/bailian-admin.run.xml

@@ -0,0 +1,37 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="bailian-admin" type="docker-deploy" factoryName="dockerfile" server-name="192.168.0.14">
+    <deployment type="dockerfile">
+      <settings>
+        <option name="imageTag" value="bailian-admin:4.8.0" />
+        <option name="containerName" value="bailian-admin" />
+        <option name="envVars">
+          <list>
+            <DockerEnvVarImpl>
+              <option name="name" value="TZ" />
+              <option name="value" value="Shanghai" />
+            </DockerEnvVarImpl>
+          </list>
+        </option>
+        <option name="commandLineOptions" value="--network host" />
+        <option name="sourceFilePath" value="ruoyi-admin/Dockerfile" />
+        <option name="volumeBindings">
+          <list>
+            <DockerVolumeBindingImpl>
+              <option name="containerPath" value="/data/bailian-admin/logs" />
+              <option name="hostPath" value="/data/bailian-admin/logs" />
+            </DockerVolumeBindingImpl>
+            <DockerVolumeBindingImpl>
+              <option name="containerPath" value="/data/bailian-admin/temp" />
+              <option name="hostPath" value="/data/bailian-admin/temp" />
+            </DockerVolumeBindingImpl>
+            <DockerVolumeBindingImpl>
+              <option name="containerPath" value="/data/bailian-admin/agent" />
+              <option name="hostPath" value="/data/bailian-admin/agent" />
+            </DockerVolumeBindingImpl>
+          </list>
+        </option>
+      </settings>
+    </deployment>
+    <method v="2" />
+  </configuration>
+</component>

.run/ruoyi-server.run.xml

@@ -1,29 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ruoyi-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-    <deployment type="dockerfile">
-      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-server:4.8.0" />
-        <option name="containerName" value="ruoyi-server" />
-        <option name="envVars">
-          <list>
-            <DockerEnvVarImpl>
-              <option name="name" value="TZ" />
-              <option name="value" value="Shanghai" />
-            </DockerEnvVarImpl>
-          </list>
-        </option>
-        <option name="commandLineOptions" value="--network host" />
-        <option name="sourceFilePath" value="ruoyi-admin/Dockerfile" />
-        <option name="volumeBindings">
-          <list>
-            <DockerVolumeBindingImpl>
-              <option name="containerPath" value="/rouyi/server/logs" />
-              <option name="hostPath" value="/rouyi/server/logs" />
-            </DockerVolumeBindingImpl>
-          </list>
-        </option>
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>

benyun-core/Dockerfile

@@ -2,11 +2,11 @@ FROM anapsix/alpine-java:8_server-jre_unlimited
 
 MAINTAINER dzk
 
-RUN mkdir -p /saas/modules/integral/logs  \
-    /saas/modules/integral/temp  \
-    /saas/skywalking/agent
+RUN mkdir -p /data/bailian-biz/logs  \
+    /data/bailian-biz/temp  \
+    /data/bailian-biz/agent
 
-WORKDIR /saas/modules/integral
+WORKDIR /data/bailian-biz
 
 #ENV SERVER_PORT=9210
 #

benyun-core/src/main/java/com/benyun/core/service/impl/ChannelAnalyseServiceImpl.java

@@ -60,7 +60,6 @@ public class ChannelAnalyseServiceImpl implements ChannelAnalyseService {
         }
 
         List<WdInfo> wdInfos = wdInfoDao.selectList(queryWrapper);
-        System.out.println(wdInfos.size());
         for (WdInfo wdInfo : wdInfos) {
             String addrCode = wdInfo.getAddrCode();
             if (cityTierMap.containsKey(addrCode)) {

benyun-core/src/main/java/com/benyun/core/service/impl/ChannelMapServiceImpl.java

@@ -55,7 +55,6 @@ public class ChannelMapServiceImpl implements ChannelMapService {
 
     @Override
     public WdCount area(List<String> channel, String rankType, String searchText, String[] addrCode) {
-        long start = System.currentTimeMillis();
         List<String> addrCodeList = new ArrayList<>();
 
         //1.根据不同级别得到地区码
@@ -157,9 +156,6 @@ public class ChannelMapServiceImpl implements ChannelMapService {
             else
                 wdCountBody.setRadio(0.0f);
         }
-        long end = System.currentTimeMillis();
-        System.out.println("运行时间：" + (end - start));
-
         WdCount wdCount = new WdCount();
         wdCount.setWdCountBodyList(result);
         wdCount.setTotal(total);

pom.xml

@@ -337,7 +337,7 @@
     </dependencyManagement>
 
     <modules>
-<!--        <module>ruoyi-admin</module>-->
+        <module>ruoyi-admin</module>
         <module>ruoyi-framework</module>
         <module>ruoyi-system</module>
         <module>ruoyi-job</module>

ruoyi-admin/Dockerfile

@@ -2,11 +2,11 @@ FROM anapsix/alpine-java:8_server-jre_unlimited
 
 MAINTAINER hst
 
-RUN mkdir -p /ruoyi/server/logs \
-    /ruoyi/server/temp \
-    /ruoyi/skywalking/agent
+RUN mkdir -p /data/bailian-admin/logs \
+    /data/bailian-admin/temp \
+    /data/bailian-admin/agent
 
-WORKDIR /ruoyi/server
+WORKDIR /data/bailian-admin
 
 #ENV SERVER_PORT=8080
 

ruoyi-admin/src/main/resources/application-prod.yml

@@ -4,7 +4,7 @@ spring.servlet.multipart.location: /ruoyi/server/temp
 --- # 监控中心配置
 spring.boot.admin.client:
   # 增加客户端开关
-  enabled: true
+  enabled: false
   url: http://localhost:9090/admin
   instance:
     service-host-type: IP

ruoyi-admin/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 # 项目相关配置
 ruoyi:
   # 名称
-  name: RuoYi-Vue-Plus
+  name: benyun-bailian
   # 版本
   version: ${ruoyi-vue-plus.version}
   # 版权年份