政府端和居民端党建声音模块修改

epmet-module/gov-voice/gov-voice-server/Dockerfile

@@ -0,0 +1,11 @@
+FROM java:8
+
+RUN export LANG="zh_CN.UTF-8"
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+RUN echo 'Asia/Shanghai' > /etc/timezone
+
+COPY ./target/*.jar ./app.jar
+
+EXPOSE 8102
+
+ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]

epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml

@@ -0,0 +1,17 @@
+version: "3.7"
+services:
+  gov-project-server:
+    container_name: gov-voice-server-dev
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.1
+    ports:
+      - "8105:8105"
+    network_mode: host # 使用现有网络
+    volumes:
+      - "/opt/epmet-cloud-logs/dev:/logs"
+    environment:
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    deploy:
+      resources:
+        limits:
+          cpus: '0.1'
+          memory: 250M

epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml

@@ -0,0 +1,17 @@
+version: "3.7"
+services:
+  gov-project-server:
+    container_name: gov-voice-server-test
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.1
+    ports:
+      - "8105:8105"
+    network_mode: host # 使用现有网络
+    volumes:
+      - "/opt/epmet-cloud-logs/test:/logs"
+    environment:
+      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
+    deploy:
+      resources:
+        limits:
+          cpus: '0.1'
+          memory: 400M

epmet-module/gov-voice/gov-voice-server/pom.xml

@@ -24,6 +24,11 @@
             <artifactId>epmet-commons-tools</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-mybatis</artifactId>
+            <version>2.0.0</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -87,6 +92,12 @@
                 <server.port>8105</server.port>
                 <spring.profiles.active>dev</spring.profiles.active>
 
+                <!-- 数据库配置-->
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epmet_voice_user</spring.datasource.druid.username>
+                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.130</spring.redis.host>

epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml

@@ -20,6 +20,13 @@ spring:
     port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+  datasource:
+    druid:
+      #MySQL
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: @spring.datasource.druid.url@
+      username: @spring.datasource.druid.username@
+      password: @spring.datasource.druid.password@
   cloud:
     nacos:
       discovery:
@@ -44,6 +51,27 @@ management:
     health:
       show-details: ALWAYS
 
+mybatis-plus:
+  mapper-locations: classpath:/mapper/**/*.xml
+  #实体扫描，多个package用逗号或者分号分隔
+  typeAliasesPackage: com.epmet.entity
+  global-config:
+    #数据库相关配置
+    db-config:
+      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
+      id-type: ID_WORKER
+      #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
+      field-strategy: NOT_NULL
+      #驼峰下划线转换
+      column-underline: true
+    banner: false
+  #原生配置
+  configuration:
+    map-underscore-to-camel-case: true
+    cache-enabled: false
+    call-setters-on-nulls: true
+    jdbc-type-for-null: 'null'
+
 feign:
   hystrix:
     enabled: true

epmet-module/resi-voice/resi-voice-server/Dockerfile

@@ -0,0 +1,11 @@
+FROM java:8
+
+RUN export LANG="zh_CN.UTF-8"
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+RUN echo 'Asia/Shanghai' > /etc/timezone
+
+COPY ./target/*.jar ./app.jar
+
+EXPOSE 8102
+
+ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]

epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml

@@ -0,0 +1,17 @@
+version: "3.7"
+services:
+  gov-project-server:
+    container_name: resi-voice-server-dev
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-voice-server:0.3.1
+    ports:
+      - "8106:8106"
+    network_mode: host # 使用现有网络
+    volumes:
+      - "/opt/epmet-cloud-logs/dev:/logs"
+    environment:
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    deploy:
+      resources:
+        limits:
+          cpus: '0.1'
+          memory: 250M

epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-test.yml

@@ -0,0 +1,17 @@
+version: "3.7"
+services:
+  gov-project-server:
+    container_name: resi-voice-server-test
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-voice-server:0.3.1
+    ports:
+      - "8106:8106"
+    network_mode: host # 使用现有网络
+    volumes:
+      - "/opt/epmet-cloud-logs/test:/logs"
+    environment:
+      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
+    deploy:
+      resources:
+        limits:
+          cpus: '0.1'
+          memory: 400M