diff --git a/health-consultation/health-consultation-start/Dockerfile b/health-consultation/health-consultation-start/Dockerfile index 16c7866..e313039 100644 --- a/health-consultation/health-consultation-start/Dockerfile +++ b/health-consultation/health-consultation-start/Dockerfile @@ -1,15 +1,12 @@ FROM anapsix/alpine-java:8_server-jre_unlimited -MAINTAINER xxx@163.com - - -ENV PROFILE_NAME dev -ENV SERVER_PORT 7010 -ENV NACOS_SERVER_ADDR nacos250:8848 -ENV NACOS_USERNAME xjuser -ENV NACOS_PASSWORD Aa135790!123 -ENV NACOS_NAMESPACE 3af98a54-4a44-4576-8e28-bf5781c0dccf -ENV NACOS_GROUP dev +ENV PROFILE_NAME=dev \ + SERVER_PORT=7010 \ + NACOS_SERVER_ADDR=nacos250:8848 \ + NACOS_USERNAME=xjuser \ + NACOS_PASSWORD=Aa135790!123 \ + NACOS_NAMESPACE=3af98a54-4a44-4576-8e28-bf5781c0dccf \ + NACOS_GROUP=dev RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime @@ -20,6 +17,6 @@ WORKDIR /health-consultation-start EXPOSE 7010 -ADD ./target/health-consultation-start.jar ./ +COPY ./target/health-consultation-start-xj.jar ./ -CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar health-consultation-start.jar \ No newline at end of file +CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar health-consultation-start-xj.jar \ No newline at end of file diff --git a/health-emergency/health-emergency-start/Dockerfile b/health-emergency/health-emergency-start/Dockerfile index deea2a0..14b327f 100644 --- a/health-emergency/health-emergency-start/Dockerfile +++ b/health-emergency/health-emergency-start/Dockerfile @@ -1,15 +1,12 @@ FROM anapsix/alpine-java:8_server-jre_unlimited -MAINTAINER xxx@163.com - - -ENV PROFILE_NAME dev -ENV SERVER_PORT 7011 -ENV NACOS_SERVER_ADDR nacos250:8848 -ENV NACOS_USERNAME xjuser -ENV NACOS_PASSWORD Aa135790!123 -ENV NACOS_NAMESPACE 3af98a54-4a44-4576-8e28-bf5781c0dccf -ENV NACOS_GROUP dev +ENV PROFILE_NAME=dev \ + SERVER_PORT=7011 \ + NACOS_SERVER_ADDR=nacos250:8848 \ + NACOS_USERNAME=xjuser \ + NACOS_PASSWORD=Aa135790!123 \ + NACOS_NAMESPACE=3af98a54-4a44-4576-8e28-bf5781c0dccf \ + NACOS_GROUP=dev RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime @@ -20,6 +17,6 @@ WORKDIR /health-emergency-start EXPOSE 7011 -ADD ./target/health-emergency-start.jar ./ +COPY ./target/health-emergency-start-xj.jar ./ -CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar health-emergency-start.jar \ No newline at end of file +CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar health-emergency-start-xj.jar \ No newline at end of file diff --git a/health-im/health-im-start/Dockerfile b/health-im/health-im-start/Dockerfile index bfaa0cf..b267ad3 100644 --- a/health-im/health-im-start/Dockerfile +++ b/health-im/health-im-start/Dockerfile @@ -1,15 +1,12 @@ FROM anapsix/alpine-java:8_server-jre_unlimited -MAINTAINER xxx@163.com - - -ENV PROFILE_NAME dev -ENV SERVER_PORT 7012 -ENV NACOS_SERVER_ADDR nacos250:8848 -ENV NACOS_USERNAME xjuser -ENV NACOS_PASSWORD Aa135790!123 -ENV NACOS_NAMESPACE 3af98a54-4a44-4576-8e28-bf5781c0dccf -ENV NACOS_GROUP dev +ENV PROFILE_NAME=dev \ + SERVER_PORT=7012 \ + NACOS_SERVER_ADDR=nacos250:8848 \ + NACOS_USERNAME=xjuser \ + NACOS_PASSWORD=Aa135790!123 \ + NACOS_NAMESPACE=3af98a54-4a44-4576-8e28-bf5781c0dccf \ + NACOS_GROUP=dev RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime @@ -20,6 +17,6 @@ WORKDIR /health-im-start EXPOSE 7012 -ADD ./target/health-im-start.jar ./ +COPY ./target/health-im-start-xj.jar ./ -CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar health-im-start.jar \ No newline at end of file +CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar health-im-start-xj.jar \ No newline at end of file diff --git a/health-watch/health-watch-start/Dockerfile b/health-watch/health-watch-start/Dockerfile index d622c11..24b4fa5 100644 --- a/health-watch/health-watch-start/Dockerfile +++ b/health-watch/health-watch-start/Dockerfile @@ -1,15 +1,12 @@ FROM anapsix/alpine-java:8_server-jre_unlimited -MAINTAINER xxx@163.com - - -ENV PROFILE_NAME dev -ENV SERVER_PORT 7098 -ENV NACOS_SERVER_ADDR nacos250:8848 -ENV NACOS_USERNAME xjuser -ENV NACOS_PASSWORD Aa135790!123 -ENV NACOS_NAMESPACE 3af98a54-4a44-4576-8e28-bf5781c0dccf -ENV NACOS_GROUP dev +ENV PROFILE_NAME=dev \ + SERVER_PORT=7098 \ + NACOS_SERVER_ADDR=nacos250:8848 \ + NACOS_USERNAME=xjuser \ + NACOS_PASSWORD=Aa135790!123 \ + NACOS_NAMESPACE=3af98a54-4a44-4576-8e28-bf5781c0dccf \ + NACOS_GROUP=dev RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime @@ -20,6 +17,6 @@ WORKDIR /health-watch-start EXPOSE 7098 -ADD ./target/health-watch-start.jar ./ +COPY ./target/health-watch-start-xj.jar ./ -CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar health-watch-start.jar \ No newline at end of file +CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar health-watch-start-xj.jar \ No newline at end of file diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/cloud/ImportExportApiFallback.java b/jeecg-boot-base-core/src/main/java/org/jeecg/cloud/ImportExportApiFallback.java index 5724fae..9bd3719 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/cloud/ImportExportApiFallback.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/cloud/ImportExportApiFallback.java @@ -4,6 +4,7 @@ import org.jeecg.modules.exports.entity.CommonExportsInfo; import org.jeecg.modules.imports.entity.CommonImports; import org.jeecg.modules.imports.entity.CommonImportsDetail; import org.jeecg.modules.imports.entity.CommonImportsInfo; +import org.springframework.stereotype.Component; import java.util.Collections; import java.util.List; @@ -11,6 +12,7 @@ import java.util.List; /** * @author Jiang Shunzhi */ +@Component public class ImportExportApiFallback implements ImportExportApi { diff --git a/jeecg-system/jeecg-system-biz/proguard.cfg b/jeecg-system/jeecg-system-biz/proguard.cfg index b9b2f44..6435a20 100644 --- a/jeecg-system/jeecg-system-biz/proguard.cfg +++ b/jeecg-system/jeecg-system-biz/proguard.cfg @@ -1,8 +1,9 @@ -keepattributes *Annotation*, Signature, InnerClasses, EnclosingMethod, Exceptions -keep @org.springframework.stereotype.Service class * -keep @org.springframework.web.bind.annotation.RestController class * --keep @org.springframework.context.annotation.Configuration class * +-keep @org.springframework.context.annotation.Configuration class * { *; } -keep @org.springframework.stereotype.Component class * +-keep class lombok.** { *; } -keepclassmembers enum * { # 保留枚举结构 public static **[] values(); public static ** valueOf(java.lang.String); @@ -14,15 +15,16 @@ -keepclassmembers class * { private static synthetic java.lang.Object $deserializeLambda$(java.lang.invoke.SerializedLambda); } --keep class lombok.** { *; } -keepclassmembers class * { @lombok.Getter *; @lombok.Setter *; } # MyBatis 专用保留规则 -keep interface org.jeecg.**.mapper.** { *; } --keepclassmembers class org.jeecg.**.entity.** { *; } --dontwarn org.jeecg.**.entity.** +-keep class org.jeecg.**.entity.** { *; } +-keep class org.jeecg.**.bean.** { *; } +-keep class org.jeecg.**.model.** { *; } +-keep class org.jeecg.**.vo.** { *; } # 关闭优化和压缩（避免框架兼容性问题） -dontshrink # 不删除未使用代码 diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/weixin/config/WxConfig.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/weixin/config/WxConfig.java index 66f872a..22cd3ec 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/weixin/config/WxConfig.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/weixin/config/WxConfig.java @@ -30,12 +30,14 @@ public class WxConfig { configImpl.setSecret(config.getSecret()); configMap.put(miniAppName, configImpl); }); - String defaultAppName = miniAppProperties.getDefaultAppName(); - if (StrUtil.isBlank(defaultAppName) || !configMap.containsKey(defaultAppName)) { - defaultAppName = configMap.keySet().iterator().next(); - } WxMaService wxMaService = new WxMaServiceImpl(); - wxMaService.setMultiConfigs(configMap, defaultAppName); + if (!configMap.isEmpty()) { + String defaultAppName = miniAppProperties.getDefaultAppName(); + if (StrUtil.isBlank(defaultAppName) || !configMap.containsKey(defaultAppName)) { + defaultAppName = configMap.keySet().iterator().next(); + } + wxMaService.setMultiConfigs(configMap, defaultAppName); + } return wxMaService; } } diff --git a/jeecg-system/jeecg-system-start/Dockerfile b/jeecg-system/jeecg-system-start/Dockerfile index 502a845..021c3fc 100644 --- a/jeecg-system/jeecg-system-start/Dockerfile +++ b/jeecg-system/jeecg-system-start/Dockerfile @@ -1,15 +1,12 @@ FROM anapsix/alpine-java:8_server-jre_unlimited -MAINTAINER xxx@163.com - - -ENV PROFILE_NAME dev -ENV SERVER_PORT 7001 -ENV NACOS_SERVER_ADDR nacos250:8848 -ENV NACOS_USERNAME xjuser -ENV NACOS_PASSWORD Aa135790!123 -ENV NACOS_NAMESPACE 3af98a54-4a44-4576-8e28-bf5781c0dccf -ENV NACOS_GROUP dev +ENV PROFILE_NAME=dev \ + SERVER_PORT=7001 \ + NACOS_SERVER_ADDR=nacos250:8848 \ + NACOS_USERNAME=xjuser \ + NACOS_PASSWORD=Aa135790!123 \ + NACOS_NAMESPACE=3af98a54-4a44-4576-8e28-bf5781c0dccf \ + NACOS_GROUP=dev RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime @@ -19,6 +16,6 @@ WORKDIR /jeecg-system-start EXPOSE 7001 -ADD ./target/jeecg-system-start.jar ./ +COPY ./target/jeecg-system-start-xj.jar ./ -CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-start.jar \ No newline at end of file +CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-start-xj.jar \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3a4009a..aaeccc6 100644 --- a/pom.xml +++ b/pom.xml @@ -780,7 +780,7 @@ ${project.build.finalName}-obf.jar true - C:/Program Files/Eclipse Adoptium/jdk-8.0.452.9-hotspot/jre/lib/rt.jar + D:/Program Files/Eclipse Adoptium/jdk-8/jre/lib/rt.jar proguard.cfg