Merge branch 'dev'

docker/auth/dockerfile

@@ -0,0 +1,16 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER intc
+# 设置时区 容器内是UTC时区 改为按照宿主机时区运行
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+# 挂载目录
+VOLUME /home/intc
+# 创建目录
+RUN mkdir -p /home/intc
+# 指定路径
+WORKDIR /home/intc
+# 复制jar文件到路径
+COPY ./jar/intc-auth.jar /home/intc/intc-auth.jar
+# 启动认证服务
+ENTRYPOINT ["java","-jar","intc-auth.jar"]

docker/buildAuth.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+docker rm -f intcauth
+docker rmi intcauth:1.0.0
+
+cd /mnt/data/intc/auth
+docker build -t intcauth:1.0.0 .
+docker run --restart=always -di --name intcauth -p 9200:9200 intcauth:1.0.0

docker/buildFile.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+docker rm -f intcfile
+docker rmi intcfile:1.0.0
+
+cd /mnt/data/intc/file
+docker build -t intcfile:1.0.0 .
+docker run -di --name intcfile -p 9300:9300 intcfile:1.0.0

docker/buildGateway.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+docker rm -f intcgateway
+docker rmi intcgateway:1.0.0
+
+cd /mnt/data/intc/gateway
+docker build -t intcgateway:1.0.0 .
+docker run --restart=always -di --name intcgateway -p 8288:8080 intcgateway:1.0.0

docker/buildHealth.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+docker rm -f intchealth
+docker rmi intchealth:1.0.0
+
+cd /mnt/data/intc/health
+docker build -t intchealth:1.0.0 .
+docker run -di --name intchealth -p 9228:9228 -v /usr/share/fonts:/usr/share/fonts intchealth:1.0.0

docker/buildInvestMaster.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+docker rm -f intcinvest
+docker rmi intcinvest:1.0.0
+
+cd /data/intc/investmaster
+docker build -t intcinvest:1.0.0 .
+docker run --restart=always -di --name intcinvest -p 9218:9218 -v /usr/share/fonts:/usr/share/fonts intcinvest:1.0.0

docker/buildInvestProd.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+docker rm -f intcinvestprod
+docker rmi intcinvestprod:1.0.0
+
+cd /data/intc/investprod
+docker build -t intcinvestprod:1.0.0 .
+docker run --restart=always -di --name intcinvestprod -p 9219:9219 -v /usr/share/fonts:/usr/share/fonts intcinvestprod:1.0.0

docker/buildJob.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+docker rm -f  intcjob
+docker rmi  intcjob:1.0.0
+
+cd /mnt/data/intc/job
+docker build -t intcjob:1.0.0 .
+docker run -di --name intcjob -p 9203:9203 intcjob:1.0.0

docker/buildMonitor.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+docker rm -f intcmonitor
+docker rmi intcmonitor:1.0.0
+
+cd /mnt/data/intc/monitor
+docker build -t intcmonitor:1.0.0 .
+docker run -di --name intcmonitor -p 9100:9100 -v /usr/share/fonts:/usr/share/fonts intcmonitor:1.0.0

docker/buildSystem.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+docker rm -f intcsystem
+docker rmi intcsystem:1.0.0
+
+cd /mnt/data/intc/system
+docker build -t intcsystem:1.0.0 .
+docker run --restart=always -di --name intcsystem -p 9201:9201 intcsystem:1.0.0

docker/buildWxmp.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+docker rm -f intcwxmp
+docker rmi intcwxmp:1.0.0
+
+cd /mnt/data/intc/wxmp
+docker build -t intcwxmp:1.0.0 .
+docker run -di --name intcwxmp -p 9238:9238 -v /usr/share/fonts:/usr/share/fonts intcwxmp:1.0.0

docker/file/dockerfile

@@ -0,0 +1,16 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER intc
+# 设置时区 容器内是UTC时区 改为按照宿主机时区运行
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+# 挂载目录
+VOLUME /home/intc
+# 创建目录
+RUN mkdir -p /home/intc
+# 指定路径
+WORKDIR /home/intc
+# 复制jar文件到路径
+COPY ./jar/intc-modules-file.jar /home/intc/intc-modules-file.jar
+# 启动系统服务
+ENTRYPOINT ["java","-jar","intc-modules-file.jar"]

docker/gateway/dockerfile

@@ -0,0 +1,16 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER intc
+# 设置时区 容器内是UTC时区 改为按照宿主机时区运行
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+# 挂载目录
+VOLUME /home/intc
+# 创建目录
+RUN mkdir -p /home/intc
+# 指定路径
+WORKDIR /home/intc
+# 复制jar文件到路径
+COPY ./jar/intc-gateway.jar /home/intc/intc-gateway.jar
+# 启动网关服务
+ENTRYPOINT ["java","-jar","intc-gateway.jar"]

docker/health/dockerfile

@@ -0,0 +1,16 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER intc
+# 设置时区 容器内是UTC时区 改为按照宿主机时区运行
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+# 挂载目录
+VOLUME /home/intc
+# 创建目录
+RUN mkdir -p /home/intc
+# 指定路径
+WORKDIR /home/intc
+# 复制jar文件到路径
+COPY ./jar/intc-health.jar /home/intc/intc-health.jar
+# 启动系统服务
+ENTRYPOINT ["java","-jar","intc-health.jar"]

docker/investmaster/dockerfile

@@ -0,0 +1,16 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER intc
+# 设置时区 容器内是UTC时区 改为按照宿主机时区运行
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+# 挂载目录
+VOLUME /home/intc
+# 创建目录
+RUN mkdir -p /home/intc
+# 指定路径
+WORKDIR /home/intc
+# 复制jar文件到路径
+COPY ./jar/intc-invest.jar /home/intc/intc-invest.jar
+# 启动系统服务
+ENTRYPOINT ["java","-jar","intc-invest.jar"]

docker/investprod/dockerfile

@@ -0,0 +1,16 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER intc
+# 设置时区 容器内是UTC时区 改为按照宿主机时区运行
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+# 挂载目录
+VOLUME /home/intc
+# 创建目录
+RUN mkdir -p /home/intc
+# 指定路径
+WORKDIR /home/intc
+# 复制jar文件到路径
+COPY ./jar/intc-invest-prod.jar /home/intc/intc-invest-prod.jar
+# 启动系统服务
+ENTRYPOINT ["java","-jar","intc-invest-prod.jar"]

docker/job/dockerfile

@@ -0,0 +1,16 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER intc
+# 设置时区 容器内是UTC时区 改为按照宿主机时区运行
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+# 挂载目录
+VOLUME /home/intc
+# 创建目录
+RUN mkdir -p /home/intc
+# 指定路径
+WORKDIR /home/intc
+# 复制jar文件到路径
+COPY ./jar/intc-modules-job.jar /home/intc/intc-modules-job.jar
+# 启动系统服务
+ENTRYPOINT ["java","-jar","intc-modules-job.jar"]

docker/monitor/dockerfile

@@ -0,0 +1,16 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER intc
+# 设置时区 容器内是UTC时区 改为按照宿主机时区运行
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+# 挂载目录
+VOLUME /home/intc
+# 创建目录
+RUN mkdir -p /home/intc
+# 指定路径
+WORKDIR /home/intc
+# 复制jar文件到路径
+COPY ./jar/intc-visual-monitor.jar /home/intc/intc-visual-monitor.jar
+# 启动系统服务
+ENTRYPOINT ["java","-jar","intc-visual-monitor.jar"]

docker/system/dockerfile

@@ -0,0 +1,16 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER intc
+# 设置时区 容器内是UTC时区 改为按照宿主机时区运行
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+# 挂载目录
+VOLUME /home/intc
+# 创建目录
+RUN mkdir -p /home/intc
+# 指定路径
+WORKDIR /home/intc
+# 复制jar文件到路径
+COPY ./jar/intc-modules-system.jar /home/intc/intc-modules-system.jar
+# 启动系统服务
+ENTRYPOINT ["java","-jar","intc-modules-system.jar"]

docker/wxmp/dockerfile

@@ -0,0 +1,16 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER intc
+# 设置时区 容器内是UTC时区 改为按照宿主机时区运行
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+# 挂载目录
+VOLUME /home/intc
+# 创建目录
+RUN mkdir -p /home/intc
+# 指定路径
+WORKDIR /home/intc
+# 复制jar文件到路径
+COPY ./jar/intc-weixin.jar /home/intc/intc-weixin.jar
+# 启动系统服务
+ENTRYPOINT ["java","-jar","intc-weixin.jar"]

intc-auth/src/main/resources/bootstrap.yml

@@ -17,17 +17,18 @@ spring:
     nacos:
       discovery:
         namespace: intc
-        # 服务注册地址
-        server-addr: 117.72.197.29:8858
-        group: dev
         username: nacos
         password: ZmNDMacAng
+        # 配置中心地址
+        server-addr: 172.16.0.4:8858
+        group: intc
+#        ip: 117.72.197.29
       config:
         namespace: intc
         username: nacos
         password: ZmNDMacAng
         # 配置中心地址
-        server-addr: 117.72.197.29:8858
+        server-addr: 172.16.0.4:8858
         # 配置文件格式
         file-extension: yml
         # 共享配置

intc-gateway/src/main/resources/bootstrap.yml

@@ -19,14 +19,15 @@ spring:
         username: nacos
         password: ZmNDMacAng
         # 配置中心地址
-        server-addr: 117.72.197.29:8858
-        group: dev
+        server-addr: 172.16.0.4:8858
+        group: intc
+#        ip: 117.72.197.29
       config:
         namespace: intc
         username: nacos
         password: ZmNDMacAng
         # 配置中心地址
-        server-addr: 117.72.197.29:8858
+        server-addr: 172.16.0.4:8858
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -42,7 +43,7 @@ spring:
       datasource:
         ds1:
           nacos:
-            server-addr: 117.72.197.29:8858
+            server-addr: 172.16.0.4:8858
             dataId: sentinel-intc-gateway
             groupId: DEFAULT_GROUP
             data-type: json

intc-modules/intc-collect/src/main/resources/bootstrap.yml

@@ -29,7 +29,7 @@ spring:
         password: ZmNDMacAng
         # 配置中心地址
         server-addr: 117.72.197.29:8858
-        group: dev
+        group: intc
 #        ip: 8.140.22.151
       config:
         namespace: intc

intc-modules/intc-file/src/main/resources/bootstrap.yml

@@ -28,14 +28,15 @@ spring:
         username: nacos
         password: ZmNDMacAng
         # 配置中心地址
-        server-addr: 117.72.197.29:8858
-        group: dev
+        server-addr: 172.16.0.4:8858
+        group: intc
+#        ip: 117.72.197.29
       config:
         namespace: intc
         username: nacos
         password: ZmNDMacAng
         # 配置中心地址
-        server-addr: 117.72.197.29:8858
+        server-addr: 172.16.0.4:8858
         # 配置文件格式
         file-extension: yml
         # 共享配置

intc-modules/intc-gen/src/main/resources/bootstrap.yml

@@ -20,14 +20,15 @@ spring:
         username: nacos
         password: ZmNDMacAng
         # 配置中心地址
-        server-addr: 117.72.197.29:8858
-        group: dev
+        server-addr: 172.16.0.4:8858
+        group: intc
+#        ip: 117.72.197.29
       config:
         namespace: intc
         username: nacos
         password: ZmNDMacAng
         # 配置中心地址
-        server-addr: 117.72.197.29:8858
+        server-addr: 172.16.0.4:8858
         # 配置文件格式
         file-extension: yml
         # 共享配置

intc-modules/intc-gen/src/main/resources/vm/java/serviceImpl.java.vm

@@ -8,7 +8,6 @@ import com.intc.common.core.utils.DateUtils;
 #end
 #end
 import com.intc.common.security.utils.SecurityUtils;
-import com.intc.common.core.utils.IdWorker;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 #if($table.sub)
@@ -72,7 +71,6 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     @Override
     public int insert${ClassName}(${ClassName} ${className})
     {
-        ${className}.setId(IdWorker.getId());
 #foreach ($column in $columns)
 #if($column.javaField == 'createTime')
         ${className}.setCreateTime(DateUtils.getNowDate());

intc-modules/intc-gen/src/main/resources/vm/vue/v3/index.vue.vm

@@ -1,617 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="search-con">
-      <div class="title">查询条件</div>
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
-          #foreach($column in $columns)
-              #if($column.query)
-                  #set($dictType=$column.dictType)
-                  #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-                  #set($parentheseIndex=$column.columnComment.indexOf("（"))
-                  #if($parentheseIndex != -1)
-                      #set($comment=$column.columnComment.substring(0, $parentheseIndex))
-                  #else
-                      #set($comment=$column.columnComment)
-                  #end
-                  #if($column.htmlType == "input")
-                    <el-form-item label="${comment}" prop="${column.javaField}">
-                      <el-input
-                          v-model="queryParams.${column.javaField}"
-                          placeholder="请输入${comment}"
-                          clearable
-                          @keyup.enter="handleQuery"
-                      />
-                    </el-form-item>
-                  #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
-                    <el-form-item label="${comment}" prop="${column.javaField}">
-                      <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
-                        <el-option
-                            v-for="dict in ${dictType}"
-                            :key="dict.value"
-                            :label="dict.label"
-                            :value="dict.value"
-                        />
-                      </el-select>
-                    </el-form-item>
-                  #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
-                    <el-form-item label="${comment}" prop="${column.javaField}">
-                      <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
-                        <el-option label="请选择字典生成" value="" />
-                      </el-select>
-                    </el-form-item>
-                  #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
-                    <el-form-item label="${comment}" prop="${column.javaField}">
-                      <el-date-picker clearable
-                                      v-model="queryParams.${column.javaField}"
-                                      type="date"
-                                      value-format="YYYY-MM-DD"
-                                      placeholder="请选择${comment}">
-                      </el-date-picker>
-                    </el-form-item>
-                  #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-                    <el-form-item label="${comment}" style="width: 308px">
-                      <el-date-picker
-                          v-model="daterange${AttrName}"
-                          value-format="YYYY-MM-DD"
-                          type="daterange"
-                          range-separator="-"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"
-                      ></el-date-picker>
-                    </el-form-item>
-                  #end
-              #end
-          #end
-      </el-form>
-      <div class="search-btn-con">
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button type="info" icon="Refresh" @click="resetQuery">重置</el-button>
-      </div>
-    </div>
-    <div class="main-con">
-      <div class="title-con">
-        <div class="title">基本信息</div>
-        <div class="operate-btn-con">
-          <el-button
-              @click="handleAdd"
-              icon="Plus"
-              v-hasPermi="['${moduleName}:${businessName}:add']"
-          >新增</el-button>
-          <el-button
-              :disabled="multiple"
-              icon="Delete"
-              @click="handleDelete"
-              v-hasPermi="['${moduleName}:${businessName}:remove']"
-          >删除</el-button>
-          <el-button
-              @click="handleExport"
-              icon="Download"
-              v-hasPermi="['${moduleName}:${businessName}:export']"
-          >导出</el-button>
-        </div>
-      </div>
-      <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" align="center" />
-            #foreach($column in $columns)
-                #set($javaField=$column.javaField)
-                #set($parentheseIndex=$column.columnComment.indexOf("（"))
-                #if($parentheseIndex != -1)
-                    #set($comment=$column.columnComment.substring(0, $parentheseIndex))
-                #else
-                    #set($comment=$column.columnComment)
-                #end
-                #if($column.pk)
-                  <el-table-column label="${comment}" align="center" prop="${javaField}" />
-                #elseif($column.list && $column.htmlType == "datetime")
-                  <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
-                    <template #default="scope">
-                      <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
-                    </template>
-                  </el-table-column>
-                #elseif($column.list && $column.htmlType == "imageUpload")
-                  <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
-                    <template #default="scope">
-                      <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
-                    </template>
-                  </el-table-column>
-                #elseif($column.list && "" != $column.dictType)
-                  <el-table-column label="${comment}" align="center" prop="${javaField}">
-                    <template #default="scope">
-                        #if($column.htmlType == "checkbox")
-                          <dict-tag :options="${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
-                        #else
-                          <dict-tag :options="${column.dictType}" :value="scope.row.${javaField}"/>
-                        #end
-                    </template>
-                  </el-table-column>
-                #elseif($column.list && "" != $javaField)
-                  <el-table-column label="${comment}" align="center" prop="${javaField}" />
-                #end
-            #end
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            <template v-slot="scope">
-              <div class="ctrl-btn d-flex">
-                <el-tooltip v-for="item in operateList" :key="item.id" class="item" effect="dark" :content="item.title" placement="top">
-                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id,scope.row)"></el-button>
-                </el-tooltip>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-pagination
-            small
-            background
-            layout="total,sizes, prev, pager, next"
-            :total="total"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-        />
-      </div>
-    </div>
-    <!-- 添加或修改${functionName}对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="120px">
-          #foreach($column in $columns)
-              #set($field=$column.javaField)
-              #if($column.insert && !$column.pk)
-                  #if(($column.usableColumn) || (!$column.superColumn))
-                      #set($parentheseIndex=$column.columnComment.indexOf("（"))
-                      #if($parentheseIndex != -1)
-                          #set($comment=$column.columnComment.substring(0, $parentheseIndex))
-                      #else
-                          #set($comment=$column.columnComment)
-                      #end
-                      #set($dictType=$column.dictType)
-                      #if($column.htmlType == "input")
-                        <el-form-item label="${comment}" prop="${field}">
-                          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-                        </el-form-item>
-                      #elseif($column.htmlType == "imageUpload")
-                        <el-form-item label="${comment}" prop="${field}">
-                          <image-upload v-model="form.${field}"/>
-                        </el-form-item>
-                      #elseif($column.htmlType == "fileUpload")
-                        <el-form-item label="${comment}" prop="${field}">
-                          <file-upload v-model="form.${field}"/>
-                        </el-form-item>
-                      #elseif($column.htmlType == "editor")
-                        <el-form-item label="${comment}">
-                          <editor v-model="form.${field}" :min-height="192"/>
-                        </el-form-item>
-                      #elseif($column.htmlType == "select" && "" != $dictType)
-                        <el-form-item label="${comment}" prop="${field}">
-                          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-                            <el-option
-                                v-for="dict in ${dictType}"
-                                :key="dict.value"
-                                :label="dict.label"
-                                #if($column.javaType == "Integer" || $column.javaType == "Long")
-                                :value="parseInt(dict.value)"
-                                #else
-                                :value="dict.value"
-                                #end
-                            ></el-option>
-                          </el-select>
-                        </el-form-item>
-                      #elseif($column.htmlType == "select" && $dictType)
-                        <el-form-item label="${comment}" prop="${field}">
-                          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-                            <el-option label="请选择字典生成" value="" />
-                          </el-select>
-                        </el-form-item>
-                      #elseif($column.htmlType == "checkbox" && "" != $dictType)
-                        <el-form-item label="${comment}" prop="${field}">
-                          <el-checkbox-group v-model="form.${field}">
-                            <el-checkbox
-                                v-for="dict in ${dictType}"
-                                :key="dict.value"
-                                :label="dict.value">
-                              {{dict.label}}
-                            </el-checkbox>
-                          </el-checkbox-group>
-                        </el-form-item>
-                      #elseif($column.htmlType == "checkbox" && $dictType)
-                        <el-form-item label="${comment}" prop="${field}">
-                          <el-checkbox-group v-model="form.${field}">
-                            <el-checkbox>请选择字典生成</el-checkbox>
-                          </el-checkbox-group>
-                        </el-form-item>
-                      #elseif($column.htmlType == "radio" && "" != $dictType)
-                        <el-form-item label="${comment}" prop="${field}">
-                          <el-radio-group v-model="form.${field}">
-                            <el-radio
-                                v-for="dict in ${dictType}"
-                                :key="dict.value"
-                                #if($column.javaType == "Integer" || $column.javaType == "Long")
-                                :label="parseInt(dict.value)"
-                                #else
-                                :label="dict.value"
-                                #end
-                            >{{dict.label}}</el-radio>
-                          </el-radio-group>
-                        </el-form-item>
-                      #elseif($column.htmlType == "radio" && $dictType)
-                        <el-form-item label="${comment}" prop="${field}">
-                          <el-radio-group v-model="form.${field}">
-                            <el-radio label="1">请选择字典生成</el-radio>
-                          </el-radio-group>
-                        </el-form-item>
-                      #elseif($column.htmlType == "datetime")
-                        <el-form-item label="${comment}" prop="${field}">
-                          <el-date-picker clearable
-                                          v-model="form.${field}"
-                                          type="date"
-                                          value-format="YYYY-MM-DD"
-                                          placeholder="请选择${comment}">
-                          </el-date-picker>
-                        </el-form-item>
-                      #elseif($column.htmlType == "textarea")
-                        <el-form-item label="${comment}" prop="${field}">
-                          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-                        </el-form-item>
-                      #end
-                  #end
-              #end
-          #end
-          #if($table.sub)
-            <el-divider content-position="center">${subTable.functionName}信息</el-divider>
-            <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
-                <el-button type="primary" icon="Plus" @click="handleAdd${subClassName}">添加</el-button>
-              </el-col>
-              <el-col :span="1.5">
-                <el-button type="danger" icon="Delete" @click="handleDelete${subClassName}">删除</el-button>
-              </el-col>
-            </el-row>
-            <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
-              <el-table-column type="selection" width="50" align="center" />
-              <el-table-column label="序号" align="center" prop="index" width="50"/>
-                #foreach($column in $subTable.columns)
-                    #set($javaField=$column.javaField)
-                    #set($parentheseIndex=$column.columnComment.indexOf("（"))
-                    #if($parentheseIndex != -1)
-                        #set($comment=$column.columnComment.substring(0, $parentheseIndex))
-                    #else
-                        #set($comment=$column.columnComment)
-                    #end
-                    #if($column.pk || $javaField == ${subTableFkclassName})
-                    #elseif($column.list && $column.htmlType == "input")
-                      <el-table-column label="$comment" prop="${javaField}" width="150">
-                        <template #default="scope">
-                          <el-input v-model="scope.row.$javaField" placeholder="请输入$comment" />
-                        </template>
-                      </el-table-column>
-                    #elseif($column.list && $column.htmlType == "datetime")
-                      <el-table-column label="$comment" prop="${javaField}" width="240">
-                        <template #default="scope">
-                          <el-date-picker clearable
-                                          v-model="scope.row.$javaField"
-                                          type="date"
-                                          value-format="YYYY-MM-DD"
-                                          placeholder="请选择$comment">
-                          </el-date-picker>
-                        </template>
-                      </el-table-column>
-                    #elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" != $column.dictType)
-                      <el-table-column label="$comment" prop="${javaField}" width="150">
-                        <template #default="scope">
-                          <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">
-                            <el-option
-                                v-for="dict in $column.dictType"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                            ></el-option>
-                          </el-select>
-                        </template>
-                      </el-table-column>
-                    #elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" == $column.dictType)
-                      <el-table-column label="$comment" prop="${javaField}" width="150">
-                        <template #default="scope">
-                          <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">
-                            <el-option label="请选择字典生成" value="" />
-                          </el-select>
-                        </template>
-                      </el-table-column>
-                    #end
-                #end
-            </el-table>
-          #end
-      </el-form>
-      <template v-if="title !== '查看${functionName}'" #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup name="${BusinessName}">
-  import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from '@/api/${moduleName}/${businessName}'
-  // eslint-disable-next-line no-unused-vars
-  import { require } from '@/utils/require'
-  const { proxy } = getCurrentInstance()
-      #if(${dicts} != '')
-          #set($dictsNoSymbol=$dicts.replace("'", ""))
-      const { ${dictsNoSymbol} } = proxy.useDict(${dicts})
-      #end
-
-  const ${businessName}List = ref([])
-      #if($table.sub)
-      const ${subclassName}List = ref([])
-      #end
-  const open = ref(false)
-  const loading = ref(true)
-  const showSearch = ref(true)
-  const ids = ref([])
-      #if($table.sub)
-      const checked${subClassName} = ref([])
-      #end
-  const single = ref(true)
-  const multiple = ref(true)
-  const total = ref(0)
-  const title = ref('')
-      #foreach ($column in $columns)
-          #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-              #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-          const daterange${AttrName} = ref([])
-          #end
-      #end
-  const operateList = ref([
-    { id: 'view', icon: 'View', title: '查看', hasPermi: ['${moduleName}:${businessName}:query'] },
-    { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['${moduleName}:${businessName}:edit'] },
-    { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['${moduleName}:${businessName}:remove'] }
-  ])
-  const data = reactive({
-    form: {},
-    queryParams: {
-      pageNum: 1,
-      pageSize: 10,
-        #foreach ($column in $columns)
-            #if($column.query)
-                    $column.javaField: null#if($foreach.count != $columns.size()),#end
-            #end
-        #end
-    },
-    rules: {
-        #foreach ($column in $columns)
-            #if($column.required)
-                #set($parentheseIndex=$column.columnComment.indexOf("（"))
-                #if($parentheseIndex != -1)
-                    #set($comment=$column.columnComment.substring(0, $parentheseIndex))
-                #else
-                    #set($comment=$column.columnComment)
-                #end
-                    $column.javaField: [
-                { required: true, message: '$comment不能为空', trigger: #if($column.htmlType == 'select' || $column.htmlType == 'radio')'change'#else'blur'#end }
-              ]#if($foreach.count != $columns.size()),#end
-            #end
-        #end
-    }
-  })
-
-  const handleOperate = (operate, row) => {
-    switch (operate) {
-      case 'view':
-        handleView(row)
-        break
-      case 'edit':
-        handleUpdate(row)
-        break
-      case 'delete':
-        handleDelete(row)
-        break
-      default:
-        break
-    }
-  }
-
-  const { queryParams, form, rules } = toRefs(data)
-
-  /** 查询${functionName}列表 */
-  function getList () {
-    loading.value = true
-      #foreach ($column in $columns)
-          #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-            queryParams.value.params = {}
-              #break
-          #end
-      #end
-      #foreach ($column in $columns)
-          #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-              #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-            if (null != daterange${AttrName} && '' != daterange${AttrName}) {
-              queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0]
-              queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1]
-            }
-          #end
-      #end
-    list${BusinessName}(queryParams.value).then(response => {
-            ${businessName}List.value = response.rows
-      total.value = response.total
-      loading.value = false
-    })
-  }
-
-  // 取消按钮
-  function cancel() {
-    open.value = false
-    reset()
-  }
-
-  // 表单重置
-  function reset () {
-    form.value = {
-        #foreach ($column in $columns)
-            #if($column.htmlType == "checkbox")
-                    $column.javaField: []#if($foreach.count != $columns.size()),#end
-            #else
-                    $column.javaField: null#if($foreach.count != $columns.size()),#end
-            #end
-        #end
-    }
-      #if($table.sub)
-              ${subclassName}List.value = []
-      #end
-    proxy.resetForm('${businessName}Ref')
-  }
-
-  /** 搜索按钮操作 */
-  function handleQuery () {
-    queryParams.value.pageNum = 1
-    getList()
-  }
-
-  /** 重置按钮操作 */
-  function resetQuery () {
-      #foreach ($column in $columns)
-          #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-              #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-            daterange${AttrName}.value = []
-          #end
-      #end
-    proxy.resetForm('queryRef')
-    handleQuery()
-  }
-
-  // 分页
-  const handleCurrentChange = (val) => {
-    queryParams.value.pageNum = val
-    getList()
-  }
-
-  //每页显示条数改变
-  const handleSizeChange = (val) => {
-    queryParams.value.pageSize = val
-    getList()
-  }
-
-  // 多选框选中数据
-  function handleSelectionChange (selection) {
-    ids.value = selection.map(item => item.${pkColumn.javaField})
-    single.value = selection.length !== 1
-    multiple.value = !selection.length
-  }
-
-  // 查看
-  const handleView = (row) => {
-    title.value = '查看${functionName}'
-    form.value = row
-    open.value = true
-  }
-
-  /** 新增按钮操作 */
-  function handleAdd () {
-    reset()
-    open.value = true
-    title.value = '添加${functionName}'
-  }
-
-  /** 修改按钮操作 */
-  function handleUpdate (row) {
-    reset()
-    const _${pkColumn.javaField} = row.${pkColumn.javaField} || ids.value
-    get${BusinessName}(_${pkColumn.javaField}).then(response => {
-      form.value = response.data
-        #foreach ($column in $columns)
-            #if($column.htmlType == "checkbox")
-              form.value.$column.javaField = form.value.${column.javaField}.split(",")
-            #end
-        #end
-        #if($table.sub)
-                ${subclassName}List.value = response.data.${subclassName}List
-        #end
-      open.value = true
-      title.value = '修改${functionName}'
-    })
-  }
-
-  /** 提交按钮 */
-  function submitForm () {
-    proxy.#[[$]]#refs.${businessName}Ref.validate(valid => {
-      if (valid) {
-        #foreach ($column in $columns)
-        #if($column.htmlType == "checkbox")
-        form.value.$column.javaField = form.value.${column.javaField}.join(",")
-        #end
-        #end
-        #if($table.sub)
-        form.value.${subclassName}List = ${subclassName}List.value
-        #end
-        if (form.value.${pkColumn.javaField} != null) {
-          update${BusinessName}(form.value).then(response => {
-            proxy.#[[$modal]]#.msgSuccess('修改成功')
-            open.value = false
-            getList()
-          })
-        } else {
-          add${BusinessName}(form.value).then(response => {
-            proxy.#[[$modal]]#.msgSuccess('新增成功')
-            open.value = false
-            getList()
-          })
-        }
-      }
-    })
-  }
-
-  /** 删除按钮操作 */
-  function handleDelete (row) {
-    const _${pkColumn.javaField}s = row.${pkColumn.javaField} || ids.value
-    proxy.#[[$modal]]#.confirm('是否确认删除选中的数据项？').then(function() {
-      return del${BusinessName}(_${pkColumn.javaField}s)
-    }).then(() => {
-      getList()
-      proxy.#[[$modal]]#.msgSuccess('删除成功')
-    }).catch(() => {})
-  }
-
-  #if($table.sub)
-  /** ${subTable.functionName}序号 */
-  function row${subClassName}Index ({ row, rowIndex }) {
-    row.index = rowIndex + 1
-  }
-
-  /** ${subTable.functionName}添加按钮操作 */
-  function handleAdd${subClassName} () {
-    const obj = {}
-    #foreach($column in $subTable.columns)
-    #if($column.pk || $column.javaField == ${subTableFkclassName})
-    #elseif($column.list && '' != $javaField)
-    obj.$column.javaField = ''
-    #end
-    #end
-    ${subclassName}List.value.push(obj)
-  }
-
-  /** ${subTable.functionName}删除按钮操作 */
-  function handleDelete${subClassName} () {
-    if (checked${subClassName}.value.length === 0) {
-      proxy.#[[$modal]]#.msgError('请先选择要删除的${subTable.functionName}数据')
-    } else {
-      const ${subclassName}s = ${subclassName}List.value
-      const checked${subClassName}s = checked${subClassName}.value
-      ${subclassName}List.value = ${subclassName}s.filter(function(item) {
-        return checked${subClassName}s.indexOf(item.index) === -1
-      })
-    }
-  }
-
-  /** 复选框选中数据 */
-  function handle${subClassName}SelectionChange (selection) {
-    checked${subClassName}.value = selection.map(item => item.index)
-  }
-
-  #end
-  /** 导出按钮操作 */
-  function handleExport () {
-    proxy.download('${moduleName}/${businessName}/export', {
-      ...queryParams.value
-    }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
-  }
-
-  getList()
-</script>

intc-modules/intc-health/src/main/resources/bootstrap.yml

@@ -28,15 +28,15 @@ spring:
         username: nacos
         password: ZmNDMacAng
         # 配置中心地址
-        server-addr: 117.72.197.29:8858
-        group: dev
-#        ip: 8.140.22.151
+        server-addr: 172.16.0.4:8858
+        group: intc
+#        ip: 117.72.197.29
       config:
         namespace: intc
         username: nacos
         password: ZmNDMacAng
         # 配置中心地址
-        server-addr: 117.72.197.29:8858
+        server-addr: 172.16.0.4:8858
         # 配置文件格式
         file-extension: yml
         # 共享配置

intc-modules/intc-invest/src/main/resources/bootstrap.yml

@@ -28,14 +28,15 @@ spring:
         username: nacos
         password: ZmNDMacAng
         # 配置中心地址
-        server-addr: 117.72.197.29:8858
-        group: dev
+        server-addr: 172.16.0.4:8858
+        group: intc
+#        ip: 117.72.197.29
       config:
         namespace: intc
         username: nacos
         password: ZmNDMacAng
         # 配置中心地址
-        server-addr: 117.72.197.29:8858
+        server-addr: 172.16.0.4:8858
         # 配置文件格式
         file-extension: yml
         # 共享配置

intc-modules/intc-job/src/main/resources/bootstrap.yml

@@ -20,14 +20,15 @@ spring:
         username: nacos
         password: ZmNDMacAng
         # 配置中心地址
-        server-addr: 117.72.197.29:8858
-        group: dev
+        server-addr: 172.16.0.4:8858
+        group: intc
+#        ip: 117.72.197.29
       config:
         namespace: intc
         username: nacos
         password: ZmNDMacAng
         # 配置中心地址
-        server-addr: 117.72.197.29:8858
+        server-addr: 172.16.0.4:8858
         # 配置文件格式
         file-extension: yml
         # 共享配置

intc-modules/intc-system/src/main/resources/bootstrap.yml

@@ -1,6 +1,9 @@
 # Tomcat
 server:
+  max-http-header-size: 4048576
   port: 9201
+  tomcat:
+    max-http-form-post-size: -1
 
 # Spring
 spring:
@@ -13,6 +16,11 @@ spring:
   banner:
     charset: UTF-8
     location: classpath:banner.txt
+  servlet:
+    multipart:
+      enabled: true
+      max-file-size: -1
+      max-request-size: -1
   cloud:
     nacos:
       discovery:
@@ -20,14 +28,15 @@ spring:
         username: nacos
         password: ZmNDMacAng
         # 配置中心地址
-        server-addr: 117.72.197.29:8858
-        group: dev
+        server-addr: 172.16.0.4:8858
+        group: intc
+#        ip: 117.72.197.29
       config:
         namespace: intc
         username: nacos
         password: ZmNDMacAng
         # 配置中心地址
-        server-addr: 117.72.197.29:8858
+        server-addr: 172.16.0.4:8858
         # 配置文件格式
         file-extension: yml
         # 共享配置

intc-modules/intc-weixin/src/main/resources/bootstrap.yml

@@ -28,15 +28,15 @@ spring:
         username: nacos
         password: ZmNDMacAng
         # 配置中心地址
-        server-addr: 117.72.197.29:8858
-        group: dev
-#        ip: 8.140.22.151
+        server-addr: 172.16.0.4:8858
+        group: intc
+#        ip: 117.72.197.29
       config:
         namespace: intc
         username: nacos
         password: ZmNDMacAng
         # 配置中心地址
-        server-addr: 117.72.197.29:8858
+        server-addr: 172.16.0.4:8858
         # 配置文件格式
         file-extension: yml
         # 共享配置

intc-visual/intc-monitor/src/main/resources/bootstrap.yml

@@ -20,14 +20,15 @@ spring:
         username: nacos
         password: ZmNDMacAng
         # 配置中心地址
-        server-addr: 117.72.197.29:8858
-        group: dev
+        server-addr: 172.16.0.4:8858
+        group: intc
+#        ip: 117.72.197.29
       config:
         namespace: intc
         username: nacos
         password: ZmNDMacAng
         # 配置中心地址
-        server-addr: 117.72.197.29:8858
+        server-addr: 172.16.0.4:8858
         # 配置文件格式
         file-extension: yml
         # 共享配置