Skip to content

I
inspect-parent
提交 9a2eb20e authored 作者: 李炎's avatar 李炎
浏览文件
操作

修改

上级 15d58ee8
隐藏空白字符变更
内嵌 并排
正在显示 包含 171 行增加 和 57 行删除
docker-compose-server.yml 0 → 100644
浏览文件 @ 9a2eb20e
#### 镜像上传
# 仓库私服： 81.70.17.111:5000
# 第一步：上传镜像到docker仓库
#docker tag wmsSystem-mysql 81.70.17.111:5000/wmsSystem-mysql:1.1
#docker tag wmsSystem-system 81.70.17.111:5000/wmsSystem-system:1.0
#docker tag nginxhtml:jeecgboot 81.70.17.111:5000/nginxhtml:1.2
#docker push 81.70.17.111:5000/wmsSystem-mysql:1.1
#docker push 81.70.17.111:5000/wmsSystem-system:1.0
#docker push 81.70.17.111:5000/nginxhtml:1.2
# 第二步：将此yml文件上传服务器，执行启动命令 docker-compose -f ./docker-compose-server.yml up
version: '2'
services:
inspectsystem-system:
image: 1ar8696937.iok.la:22594/inspectsystem-system
restart: always
container_name: inspectsystem-system
volumes:
- /data/config:/inspectsystem/config
- /data/storage:/inspectsystem/storage
ports:
- 8080:8090
pom.xml
浏览文件 @ 9a2eb20e
...@@ -14,10 +14,15 @@ ...@@ -14,10 +14,15 @@
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<name>inspectDome</name> <name>inspectDome</name>
<description>Demo project for Spring Boot</description> <description>Demo project for Spring Boot</description>
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<proguard.version>6.2.2</proguard.version>
<proguard.maven.plugin.version>2.1.1</proguard.maven.plugin.version>
<lombok.version>1.18.10</lombok.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -81,9 +86,9 @@ ...@@ -81,9 +86,9 @@
<!--<systemPath>${project.basedir}/src/main/resources/lib/httpmime-4.1.1.jar</systemPath>--> <!--<systemPath>${project.basedir}/src/main/resources/lib/httpmime-4.1.1.jar</systemPath>-->
<!--</dependency>--> <!--</dependency>-->
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId> <artifactId>httpmime</artifactId>
<version>4.1.1</version> <version>4.1.1</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -116,25 +121,120 @@ ...@@ -116,25 +121,120 @@
<artifactId>artemis-http-client</artifactId> <artifactId>artemis-http-client</artifactId>
<version>1.1.3</version> <version>1.1.3</version>
</dependency> </dependency>
<!--<dependency>-->
<!--<groupId>net.sf.proguard</groupId>-->
<!--<artifactId>proguard-base</artifactId>-->
<!--<version>6.2.2</version>-->
<!--</dependency>-->
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<!--代码混淆-->
<!--<plugin>-->
<!--<groupId>com.github.wvengen</groupId>-->
<!--<artifactId>proguard-maven-plugin</artifactId>-->
<!--<version>2.3.1</version>-->
<!--<executions>-->
<!--<execution>-->
<!--<phase>package</phase>-->
<!--<goals>-->
<!--<goal>proguard</goal>-->
<!--</goals>-->
<!--</execution>-->
<!--</executions>-->
<!--<configuration>-->
<!--<proguardVersion>6.1.1</proguardVersion>-->
<!--<injar>${project.build.finalName}.jar</injar>-->
<!--&lt;!&ndash; <injar>classes</injar> &ndash;&gt;-->
<!--<outjar>${project.build.finalName}.jar</outjar>-->
<!--<obfuscate>true</obfuscate>-->
<!--<options>-->
<!--&lt;!&ndash; ##默认是开启的，这里关闭shrink，即不删除没有使用的类/成员&ndash;&gt;-->
<!--<option>-dontshrink</option>-->
<!--&lt;!&ndash; ##默认是开启的，这里关闭字节码级别的优化&ndash;&gt;-->
<!--<option>-dontoptimize</option>-->
<!--&lt;!&ndash;##对于类成员的命名的混淆采取唯一策略&ndash;&gt;-->
<!--<option>-useuniqueclassmembernames</option>-->
<!--&lt;!&ndash;- 混淆类名之后，对使用Class.forName('className')之类的地方进行相应替代&ndash;&gt;-->
<!--<option>-adaptclassstrings</option>-->
<!--<option>-ignorewarnings</option>-->
<!--&lt;!&ndash; 混淆时不生成大小写混合的类名，默认是可以大小写混合&ndash;&gt;-->
<!--<option>-dontusemixedcaseclassnames</option>-->
<!--&lt;!&ndash; This option will replace all strings in reflections method invocations with new class names.-->
<!--For example, invokes Class.forName('className')&ndash;&gt;-->
<!--&lt;!&ndash; <option>-adaptclassstrings</option> &ndash;&gt;-->
<!--&lt;!&ndash; This option will save all original annotations and etc. Otherwise all we be removed from files.&ndash;&gt;-->
<!--&lt;!&ndash; 不混淆所有特殊的类&ndash;&gt;-->
<!--<option>-keepattributes Exceptions,InnerClasses,Signature,Deprecated,-->
<!--SourceFile,LineNumberTable,*Annotation*,EnclosingMethod-->
<!--</option>-->
<!--&lt;!&ndash; This option will save all original names in interfaces (without obfuscate).&ndash;&gt;-->
<!--<option>-keepnames interface **</option>-->
<!--&lt;!&ndash; This option will save all original methods parameters in files defined in -keep sections,-->
<!--otherwise all parameter names will be obfuscate.&ndash;&gt;-->
<!--<option>-keepparameternames</option>-->
<!--&lt;!&ndash; <option>-libraryjars **</option> &ndash;&gt;-->
<!--&lt;!&ndash; This option will save all original class files (without obfuscate) but obfuscate all in domain package.&ndash;&gt;-->
<!--&lt;!&ndash;<option>-keep class !com.slm.proguard.example.spring.boot.domain.** { *; }</option>&ndash;&gt;-->
<!--&lt;!&ndash;<option>-keep class !com.lqkj.demo.** { *; }</option>&ndash;&gt;-->
<!--<option>-keep class com.lqkj.demo.JintaiDomeApplication { *; }</option>-->
<!--&lt;!&ndash;<option>-keep class com.lqkj.demo.config.** { *; }</option>&ndash;&gt;-->
<!--&lt;!&ndash;保留不然Mybatis报错&ndash;&gt;-->
<!--&lt;!&ndash;<option>-keep class com.lqkj.demo.entity.** { *; }</option>&ndash;&gt;-->
<!--&lt;!&ndash;<option>-keep class com.lqkj.demo.utils.PageRes { *; }</option>&ndash;&gt;-->
<!--<option>-keep class com.lqkj.demo.controller.** { *; }</option>-->
<!--&lt;!&ndash;<option>-keep class com.dsys.project.mp.controller.** { *; }</option>&ndash;&gt;-->
<!--&lt;!&ndash;<option>-keep class com.dsys.project.mp.config.** { *; }</option>&ndash;&gt;-->
<!--&lt;!&ndash;<option>-keep class com.lqkj.demo.dto.** { *; }</option>&ndash;&gt;-->
<!--<option>-keep class * implements java.io.Serializable</option>-->
<!--&lt;!&ndash; This option will save all original class files (without obfuscate) in service package&ndash;&gt;-->
<!--&lt;!&ndash;<option>-keep class com.slm.proguard.example.spring.boot.service { *; }</option>&ndash;&gt;-->
<!--&lt;!&ndash; This option will save all original interfaces files (without obfuscate) in all packages.&ndash;&gt;-->
<!--<option>-keep interface * extends * { *; }</option>-->
<!--&lt;!&ndash; <option>-keep @org.springframework.stereotype.Service class *</option> &ndash;&gt;-->
<!--&lt;!&ndash; This option will save all original defined annotations in all class in all packages.&ndash;&gt;-->
<!--<option>-keepclassmembers class * {-->
<!--&lt;!&ndash; @org.springframework.beans.factory.annotation.Autowired *; &ndash;&gt;-->
<!--@org.springframework.beans.factory.annotation.Value *;-->
<!--}-->
<!--</option>-->
<!--</options>-->
<!--<libs>-->
<!--&lt;!&ndash; Include main JAVA library required.&ndash;&gt;-->
<!--<lib>${java.home}/lib/rt.jar</lib>-->
<!--</libs>-->
<!--</configuration>-->
<!--<dependencies>-->
<!--<dependency>-->
<!--<groupId>net.sf.proguard</groupId>-->
<!--<artifactId>proguard-base</artifactId>-->
<!--<version>6.1.1</version>-->
<!--</dependency>-->
<!--</dependencies>-->
<!--</plugin>-->
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>2.0.5.RELEASE</version>
<!--加入下面两项配置后，maven打包时才会把第三方jar包一起打入-->
<executions> <executions>
<execution> <execution>
<!-- <phase>none</phase> -->
<goals> <goals>
<goal>repackage</goal> <goal>repackage</goal>
</goals> </goals>
<!--<configuration>-->
<!--<includeSystemScope>true</includeSystemScope>-->
<!--&lt;!&ndash;<mainClass>com.lqkj.demo.JintaiDomeApplication</mainClass>&ndash;&gt;-->
<!--</configuration>-->
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<includeSystemScope>true</includeSystemScope> <includeSystemScope>true</includeSystemScope>
<!--<mainClass>com.lqkj.demo.JintaiDomeApplication</mainClass>-->
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
src/main/java/com/wang/jintaidome/Constants.java → src/main/java/com/lqkj/demo/Constants.java
浏览文件 @ 9a2eb20e
package com.wang.jintaidome; package com.lqkj.demo;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
......
src/main/java/com/wang/jintaidome/JintaiDomeApplication.java → src/main/java/com/lqkj/demo/JintaiDomeApplication.java
浏览文件 @ 9a2eb20e
package com.wang.jintaidome; package com.lqkj.demo;
import com.wang.jintaidome.utils.oConvertUtils;
import com.lqkj.demo.utils.oConvertUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
//import org.mybatis.spring.annotation.MapperScan; //import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.BeanNameGenerator;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
...@@ -10,27 +14,38 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; ...@@ -10,27 +14,38 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;
@SpringBootApplication @SpringBootApplication
//@MapperScan("com.wang.jintaidome")
@Slf4j @Slf4j
@EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class}) @EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class})
public class JintaiDomeApplication extends SpringBootServletInitializer { public class JintaiDomeApplication extends SpringBootServletInitializer {
@Override // @Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { // protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application.sources(JintaiDomeApplication.class); // return application.sources(JintaiDomeApplication.class);
} // }
// public static class CustomGenerator implements BeanNameGenerator {
//
// @Override
// public String generateBeanName(BeanDefinition definition, BeanDefinitionRegistry registry) {
// return definition.getBeanClassName();
// }
// }
public static void main(String[] args) throws UnknownHostException { public static void main(String[] args) throws UnknownHostException {
ConfigurableApplicationContext application = SpringApplication.run(JintaiDomeApplication.class, args);
// ConfigurableApplicationContext application = new SpringApplicationBuilder(JintaiDomeApplication.class)
// .beanNameGenerator(new CustomGenerator())
// .run(args);
ConfigurableApplicationContext application = SpringApplication.run(JintaiDomeApplication.class, args);
Environment env = application.getEnvironment(); Environment env = application.getEnvironment();
String ip = InetAddress.getLocalHost().getHostAddress(); String ip = InetAddress.getLocalHost().getHostAddress();
String port = env.getProperty("server.port"); String port = env.getProperty("server.port");
String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path")); String path = oConvertUtil.getString(env.getProperty("server.servlet.context-path"));
log.info("\n----------------------------------------------------------\n\t" + log.info("\n----------------------------------------------------------\n\t" +
"Application wmssystem is running! Access URLs:\n\t" + "Application wmssystem is running! Access URLs:\n\t" +
"Local: \t\thttp://localhost:" + port + path + "/\n\t" + "Local: \t\thttp://localhost:" + port + path + "/\n\t" +
......
src/main/java/com/wang/jintaidome/controller/InspectController.java → src/main/java/com/lqkj/demo/controller/InspectController.java
浏览文件 @ 9a2eb20e
package com.wang.jintaidome.controller; package com.lqkj.demo.controller;
import com.wang.jintaidome.Constants; import com.lqkj.demo.Constants;
import com.lqkj.demo.utils.LocalMACUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.HashMap; import java.net.SocketException;
import java.util.Map; import java.util.Map;
@CrossOrigin @CrossOrigin
...@@ -24,4 +25,9 @@ public class InspectController { ...@@ -24,4 +25,9 @@ public class InspectController {
} }
return false; return false;
} }
@PostMapping(value = "/getMac")
public String getMac() throws SocketException {
String localMac = LocalMACUtil.getLocalMac();
return localMac;
}
} }
src/main/java/com/wang/jintaidome/utils/ListUtil.java → src/main/java/com/lqkj/demo/utils/ListUtil.java
浏览文件 @ 9a2eb20e
package com.wang.jintaidome.utils; package com.lqkj.demo.utils;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
......
src/main/java/com/wang/jintaidome/utils/LocalMACUtil.java → src/main/java/com/lqkj/demo/utils/LocalMACUtil.java
浏览文件 @ 9a2eb20e
package com.wang.jintaidome.utils; package com.lqkj.demo.utils;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.NetworkInterface; import java.net.NetworkInterface;
...@@ -21,16 +21,8 @@ public class LocalMACUtil { ...@@ -21,16 +21,8 @@ public class LocalMACUtil {
* @throws UnknownHostException * @throws UnknownHostException
* @throws SocketException * @throws SocketException
*/ */
public static void main(String[] args) throws UnknownHostException, SocketException {
// TODO Auto-generated method stub
//得到IP，输出PC-201309011313/122.206.73.83
InetAddress ia = InetAddress.getLocalHost();
System.out.println(ia);
System.out.println(getLocalMac(ia));
}
private static String getLocalMac(InetAddress ia) throws SocketException { public static String getLocalMac(InetAddress ia) throws SocketException {
// TODO Auto-generated method stub // TODO Auto-generated method stub
//获取网卡，获取地址 //获取网卡，获取地址
byte[] mac = NetworkInterface.getByInetAddress(ia).getHardwareAddress(); byte[] mac = NetworkInterface.getByInetAddress(ia).getHardwareAddress();
...@@ -52,7 +44,7 @@ public class LocalMACUtil { ...@@ -52,7 +44,7 @@ public class LocalMACUtil {
return sb.toString().toUpperCase(); return sb.toString().toUpperCase();
} }
private static String getLocalMac() throws SocketException { public static String getLocalMac() throws SocketException {
// TODO Auto-generated method stub // TODO Auto-generated method stub
//获取网卡，获取地址 //获取网卡，获取地址
byte[] mac = NetworkInterface.getByInetAddress(inetAddress).getHardwareAddress(); byte[] mac = NetworkInterface.getByInetAddress(inetAddress).getHardwareAddress();
......
src/main/java/com/wang/jintaidome/utils/oConvertUtils.java → src/main/java/com/lqkj/demo/utils/oConvertUtil.java
浏览文件 @ 9a2eb20e
package com.wang.jintaidome.utils; package com.lqkj.demo.utils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
...@@ -23,7 +23,7 @@ import java.util.regex.Pattern; ...@@ -23,7 +23,7 @@ import java.util.regex.Pattern;
* *
*/ */
@Slf4j @Slf4j
public class oConvertUtils { public class oConvertUtil {
public static boolean isEmpty(Object object) { public static boolean isEmpty(Object object) {
if (object == null) { if (object == null) {
return (true); return (true);
......
src/test/java/com/wang/jintaidome/JintaiDomeApplicationTests.java deleted 100644 → 0
浏览文件 @ 15d58ee8
package com.wang.jintaidome;
import kingdee.bos.webapi.client.K3CloudApiClient;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import java.util.*;
@SpringBootTest
@Slf4j
class JintaiDomeApplicationTests {
@Test
void contextLoads() throws Exception {
}
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论