删除 'emis-server/pub'

Dockerfile

@@ -1,4 +1,5 @@
-FROM java:8
+#FROM java:8
+FROM anolis-registry.cn-zhangjiakou.cr.aliyuncs.com/openanolis/anolisos:8.6
 MAINTAINER linfso
 
 ENV TZ="Asia/Shanghai"
@@ -6,12 +7,21 @@ ENV TZ="Asia/Shanghai"
 RUN mkdir -p /opt/logs
 RUN mkdir -p /logs
 
+RUN ulimit -n 65536
+
 ADD config/app.properties /opt/config/app.properties
 ADD config.properties /opt/config.properties
 ADD logback-spring.xml /opt/logback-spring.xml
 
 ADD emis-server.jar /opt/app.jar
 
+
+ADD jdk-8u202-linux-x64.tar.gz /usr/local/java/
+
+ENV JAVA_HOME=/usr/local/java/jdk1.8.0_202
+ENV CLASSPATH=.:$JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/tools.jar
+ENV PATH=$JAVA_HOME/bin:$PATH
+
 WORKDIR /opt
 
 EXPOSE 11088

aliyun_docker.sh

@@ -0,0 +1,24 @@
+
+#docker login --username=hi20190207@aliyun.com crpi-bd9iqe8eha8h86el.cn-shanghai.personal.cr.aliyuncs.com
+# 123456
+
+cp /app/jdk/jdk-8u202-linux-x64.tar.gz ./
+
+docker build -t emis-server .
+
+#docker run -it -d --name emis-server -p 19088:9088  emis-server:latest
+
+# -- docker push to hub.k8s.loc --
+docker tag emis-server:latest crpi-bd9iqe8eha8h86el.cn-shanghai.personal.cr.aliyuncs.com/xdadan/emis-server:latest
+
+docker push crpi-bd9iqe8eha8h86el.cn-shanghai.personal.cr.aliyuncs.com/xdadan/emis-server:latest
+
+# -- k8s --
+# kubectl apply -f k8s.yml
+
+# -- helm --
+# helm
+# helm create logistic-helm
+# helm package logistic-helm
+
+

build.sh

@@ -12,3 +12,4 @@ cp -rf emis-server/pub/* ./pub/
 # docker k8s
 cp Dockerfile ./pub/
 cp docker_build.sh ./pub/
+cp aliyun_docker.sh ./pub/

config/app.properties

@@ -68,8 +68,8 @@ spring.datasource.connection-test-query=select 1 from dual
 
 #redis
 spring.redis.database=0  
-spring.redis.host=192.168.88.32
-#spring.redis.cluster.nodes=192.168.88.32
+spring.redis.host=192.168.88.58
+#spring.redis.cluster.nodes=192.168.88.58
 spring.redis.port=6379  
 spring.redis.password=TNL9910Aksd&5$(((*sd88sdsds99asdsa8
 spring.redis.pool.max-active=8  
@@ -82,7 +82,7 @@ spring.redis.lettuce.pool.max-idle=8
 spring.redis.lettuce.pool.max-active=8
 spring.redis.lettuce.pool.max-wait=-1ms
 
-redisson.address=redis://192.168.88.32:6379
+redisson.address=redis://192.168.88.58:6379
 redisson.password=TNL9910Aksd&5$(((*sd88sdsds99asdsa8
 redisson.timeout=3000
 redisson.database=0
@@ -90,7 +90,7 @@ redisson.connectionPoolSize=10
 redisson.connectionMinimumIdleSize=10
 
 #rabbitmq
-spring.rabbitmq.host=192.168.88.32
+spring.rabbitmq.host=192.168.88.57
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=ccloud
 spring.rabbitmq.password=123#@!
@@ -117,12 +117,12 @@ pay.profile=.
 xdd.enc.key=
 #X20230103080
 
-pay.api-online-url=http://api.pay.xdadan.com/api/gateway/router/online
+pay.api-online-url=https://papi.tanex56.com/router/online
 pay.app-id=26150000179
 pay.app-secret=91be0b54ba41f71f8e0506a7da95a8ff
 
-erp.api.base-url=http://api.erp2.xdadan.com/api/microsvr
-erp.api.pay.notify-url=http://api.erp2.xdadan.com/api/microsvr/common/payNotifyCallback
+erp.api.base-url=https://api-emis.tanex56.com/api/bizsvr
+erp.api.pay.notify-url=https://api-emis.tanex56.com/api/bizsvr/common/payNotifyCallback
 
 system.fontPath=/usr/share/fonts
 

emis-server/emis-server.iml

@@ -36,6 +36,7 @@
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.4.1" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jeffreyning:mybatisplus-plus:1.5.1-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.5.10" level="project" />
     <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.2.Final" level="project" />
     <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
@@ -268,6 +269,7 @@
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-codec:1.14" level="project" />
     <orderEntry type="library" name="Maven: com.aspose:aspose-words:19.1.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.10.0" level="project" />
+    <orderEntry type="library" name="Maven: com.xdadan:emis-ai-web:1.0.2" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-devtools:2.5.10" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.5.10" level="project" />

emis-server/pom.xml

@@ -42,6 +42,13 @@
             <version>1.0.2</version>
         </dependency>
 
+        <!-- AI模块-->
+        <dependency>
+            <groupId>com.xdadan</groupId>
+            <artifactId>emis-ai-web</artifactId>
+            <version>1.0.2</version>
+        </dependency>
+
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>

emis-server/src/main/java/com/xdadan/erp/LaunchApplication.java

@@ -25,7 +25,7 @@ import java.io.File;
 @EnableCaching
 @EnableAsync
 @ServletComponentScan("com.xdadan.erp.framework.security.filter")
-@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+@SpringBootApplication(scanBasePackages = "com.xdadan.erp.*",exclude = { DataSourceAutoConfiguration.class })
 public class LaunchApplication extends SpringBootServletInitializer {
 
     public static void main(String[] args) throws Exception {