Merge branch 'gez-dev' of uskycloud/usky-modules into master

service-backend/service-backend-biz/pom.xml

@@ -19,25 +19,21 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- Pagehelper -->
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
         </dependency>
 
-
         <dependency>
             <groupId>com.usky</groupId>
-            <artifactId>service-backend-api</artifactId>
-            <version>0.0.1</version>
+            <artifactId>ruoyi-common-swagger</artifactId>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>com.usky</groupId>-->
-<!--            <artifactId>usky-module-demo-api</artifactId>-->
-<!--            <version>0.0.1</version>-->
-<!--        </dependency>-->
-
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger.fox.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

service-backend/service-backend-biz/src/main/java/com/usky/backend/BackendApplication.java

@@ -1,11 +1,19 @@
 package com.usky.backend;
 
 
+import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
 import org.mybatis.spring.annotation.MapperScan;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.core.env.Environment;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 
 /**
  * 系统模块
@@ -14,14 +22,26 @@ import org.springframework.context.annotation.ComponentScan;
  */
 
 
+@EnableCustomSwagger2
 @EnableFeignClients(basePackages = "com.usky")
 @MapperScan(value = "com.usky.backend.mapper")
 @ComponentScan("com.usky")
 @SpringBootApplication
 public class BackendApplication
 {
-    public static void main(String[] args)
-    {
-        SpringApplication.run(BackendApplication.class, args);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BackendApplication.class);
+
+    public static void main(String[] args) throws UnknownHostException {
+        ConfigurableApplicationContext application = SpringApplication.run(BackendApplication.class, args);
+        Environment env = application.getEnvironment();
+        String ip = InetAddress.getLocalHost().getHostAddress();
+        String port = env.getProperty("server.port");
+        String path = env.getProperty("server.servlet.context-path");
+        LOGGER.info("\n----------------------------------------------------------\n\t" +
+                "Application is running! Access URLs:\n\t" +
+                "Local: \t\thttp://localhost:" + port + (null==path?"":path) + "/\n\t" +
+                "External: \thttp://" + ip + ":" + port + (null==path?"":path) + "/\n\t" +
+                "Api: \t\thttp://" + ip + ":" + port + (null==path?"":path) + "/swagger-ui/index.html\n\t" +
+                "----------------------------------------------------------");
     }
 }

service-backend/service-backend-biz/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 101.133.214.75:8848
+        server-addr: usky-cloud-nacos:8848
       config:
         # 配置中心地址
-        server-addr: 101.133.214.75:8848
+        server-addr: usky-cloud-nacos:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

service-park/service-park-biz/src/main/java/com/usky/park/controller/web/EventEgController.java

@@ -6,8 +6,6 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.park.domain.EventEg;
 import com.usky.park.service.EventEgService;
 import com.usky.park.service.vo.EventEgStatisticVO;
-import jdk.nashorn.internal.objects.annotations.Getter;
-import org.bouncycastle.util.StringList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;