增加配置

czt

5 小时以前 d3822e70e1c175604407917460afbf54a7787597

增加配置

 fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml

@@ -429,7 +429,7 @@
    <Container>
      <Property name="className">c-param</Property>
      <AutoForm id="form1">
        <Property name="cols">*,*,*,*,90,90,110</Property>
        <Property name="cols">*,*,*,*,90,90,140</Property>
        <Property name="dataSet">dsQuery</Property>
        <Property name="labelSeparator">：</Property>
        <Property name="labelAlign">right</Property>
@@ -472,12 +472,13 @@
        </Button>
        <Button layoutConstraint="left">
          <Property name="caption">导出EXCEL</Property>
          <Property name="exClassName">btn4</Property>
          <Property name="exClassName">btn-q2</Property>
          <Property name="width">140</Property>
          <Property name="iconClass">fa fa-file-excel-o</Property>
        </Button>
      </AutoForm>
      <AutoForm id="form2">
        <Property name="cols">*,*,*,*,90,90,110</Property>
        <Property name="cols">*,*,*,*,90,90,140</Property>
        <Property name="dataSet">dsQuery</Property>
        <Property name="labelSeparator">：</Property>
        <Property name="labelAlign">right</Property>
@@ -523,7 +524,8 @@
        </Button>
        <Button layoutConstraint="left">
          <Property name="caption">导出EXCEL</Property>
          <Property name="exClassName">btn4</Property>
          <Property name="exClassName">btn-q2</Property>
          <Property name="width">140</Property>
          <Property name="iconClass">fa fa-file-excel-o</Property>
        </Button>
      </AutoForm>

 fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml

@@ -428,7 +428,7 @@
    <Container>
      <Property name="className">c-param</Property>
      <AutoForm id="form1" layoutConstraint="top">
        <Property name="cols">*,*,*,*,90,90,110</Property>
        <Property name="cols">*,*,*,*,90,90,140</Property>
        <Property name="dataSet">dsQuery</Property>
        <Property name="exClassName">bg-color</Property>
        <Property name="labelWidth">110</Property>
@@ -470,12 +470,13 @@
        </Button>
        <Button layoutConstraint="left">
          <Property name="caption">导出EXCEL</Property>
          <Property name="exClassName">btn4</Property>
          <Property name="exClassName">btn-q2</Property>
          <Property name="width">140</Property>
          <Property name="iconClass">fa fa-file-excel-o</Property>
        </Button>
      </AutoForm>
      <AutoForm id="form2" layoutConstraint="top">
        <Property name="cols">*,*,*,*,90,90,110</Property>
        <Property name="cols">*,*,*,*,90,90,140</Property>
        <Property name="dataSet">dsQuery</Property>
        <Property name="exClassName">bg-color</Property>
        <Property name="labelWidth">110</Property>
@@ -520,7 +521,8 @@
        </Button>
        <Button layoutConstraint="left">
          <Property name="caption">导出EXCEL</Property>
          <Property name="exClassName">btn4</Property>
          <Property name="exClassName">btn-q2</Property>
          <Property name="width">140</Property>
          <Property name="iconClass">fa fa-file-excel-o</Property>
        </Button>
      </AutoForm>

 fzzy-igdss-web/src/main/resources/application-pro.yml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,119 @@
# -----------------新疆伊犁--------------windows生产环境
server:
  port: 8888
  servlet:
    context-path:
    encoding:
      charset: UTF-8
      enabled: true
      force: true
# æ•°æ®æºé…ç½®
spring:
  datasource:
    type: com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    druid:
      # ä¸»åº“数据源
      master:
        url: jdbc:mysql://127.0.0.1:3306/igdss_master?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: root
        password: Fzzy@#$%5432..K
      # ä»Žåº“数据源
      slave:
        # ä»Žæ•°æ®æºå¼€å…³/默认关闭
        enabled: false
        url:
        username:
        password:
      # åˆå§‹è¿žæŽ¥æ•°
      initialSize: 5
      # æœ€å°è¿žæŽ¥æ± æ•°é‡
      minIdle: 10
      # æœ€å¤§è¿žæŽ¥æ± æ•°é‡
      maxActive: 20
      # é…ç½®èŽ·å–连接等待超时的时间
      maxWait: 60000
      # é…ç½®è¿žæŽ¥è¶…时时间
      connectTimeout: 30000
      # é…ç½®ç½‘络超时时间
      socketTimeout: 60000
      # é…ç½®é—´éš”多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
      timeBetweenEvictionRunsMillis: 60000
      # é…ç½®ä¸€ä¸ªè¿žæŽ¥åœ¨æ± ä¸­æœ€å°ç”Ÿå­˜çš„时间，单位是毫秒
      minEvictableIdleTimeMillis: 300000
      # é…ç½®ä¸€ä¸ªè¿žæŽ¥åœ¨æ± ä¸­æœ€å¤§ç”Ÿå­˜çš„时间，单位是毫秒
      maxEvictableIdleTimeMillis: 900000
      # é…ç½®æ£€æµ‹è¿žæŽ¥æ˜¯å¦æœ‰æ•ˆ
      validationQuery: SELECT 1 FROM DUAL
      testWhileIdle: true
      testOnBorrow: false
      testOnReturn: false
      webStatFilter:
        enabled: true
      statViewServlet:
        enabled: true
        # è®¾ç½®ç™½åå•ï¼Œä¸å¡«åˆ™å…è®¸æ‰€æœ‰è®¿é—®
        allow:
        url-pattern: /druid/*
        # æŽ§åˆ¶å°ç®¡ç†ç”¨æˆ·åå’Œå¯†ç 
        login-username: admin
        login-password: fzzy123456
      filter:
        stat:
          enabled: true
          # æ…¢SQL记录
          log-slow-sql: true
          slow-sql-millis: 1000
          merge-sql: true
        wall:
          config:
            multi-statement-allow: true

  # Redis相关配置
  redis:
    database: 0
    host: 127.0.0.1
    port: 6379
    password: Redispwd..
    timeout: 1000
    pool:
      max-active: 200
      max-wait: -1
      max-idle: 10
      min-idle: 0

  #JPA配置
  jpa:
    database: mysql
    show-sql: true
    generate-ddl: false
    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
    hibernate:
      ddl-auto: update
    properties:
      hibernate:
        jdbc:
          batch_size: 500
          batch_versioned_data: true

#系统架构配置
framework:
  companyId: "5372"
  doradoMode: debug
  # åç§°
  name: æ™ºæ…§ç²®åº“监管系统
  # ç‰ˆæœ¬
  version: 2.0.0
  # ç‰ˆæƒå¹´ä»½
  copyrightYear: 2026
  # å®žä¾‹æ¼”示开关
  demoEnabled: false
  # æ–‡ä»¶è·¯å¾„ ç¤ºä¾‹ï¼ˆ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
  profile: E:/IGDSS/FILE/
  # èŽ·å–ip地址开关
  addressEnabled: false
  support: é£Žæ­£è‡´è¿œä¿¡æ¯æŠ€æœ¯è‚¡ä»½æœ‰é™å…¬å¸
  email: business@fzzygf.com
  phone: 400-627-1116
  website: http://www.fzzygf.com
  address: éƒ‘州市高新区长椿路11号河南省国家大学科技园孵化1号楼

 fzzy-igdss-web/src/main/resources/application-pro5372.yml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,119 @@
# -----------------新疆伊犁--------------windows生产环境
server:
  port: 8888
  servlet:
    context-path:
    encoding:
      charset: UTF-8
      enabled: true
      force: true
# æ•°æ®æºé…ç½®
spring:
  datasource:
    type: com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    druid:
      # ä¸»åº“数据源
      master:
        url: jdbc:mysql://127.0.0.1:3306/igdss_master?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: root
        password: Fzzy@#$%5432..K
      # ä»Žåº“数据源
      slave:
        # ä»Žæ•°æ®æºå¼€å…³/默认关闭
        enabled: false
        url:
        username:
        password:
      # åˆå§‹è¿žæŽ¥æ•°
      initialSize: 5
      # æœ€å°è¿žæŽ¥æ± æ•°é‡
      minIdle: 10
      # æœ€å¤§è¿žæŽ¥æ± æ•°é‡
      maxActive: 20
      # é…ç½®èŽ·å–连接等待超时的时间
      maxWait: 60000
      # é…ç½®è¿žæŽ¥è¶…时时间
      connectTimeout: 30000
      # é…ç½®ç½‘络超时时间
      socketTimeout: 60000
      # é…ç½®é—´éš”多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
      timeBetweenEvictionRunsMillis: 60000
      # é…ç½®ä¸€ä¸ªè¿žæŽ¥åœ¨æ± ä¸­æœ€å°ç”Ÿå­˜çš„时间，单位是毫秒
      minEvictableIdleTimeMillis: 300000
      # é…ç½®ä¸€ä¸ªè¿žæŽ¥åœ¨æ± ä¸­æœ€å¤§ç”Ÿå­˜çš„时间，单位是毫秒
      maxEvictableIdleTimeMillis: 900000
      # é…ç½®æ£€æµ‹è¿žæŽ¥æ˜¯å¦æœ‰æ•ˆ
      validationQuery: SELECT 1 FROM DUAL
      testWhileIdle: true
      testOnBorrow: false
      testOnReturn: false
      webStatFilter:
        enabled: true
      statViewServlet:
        enabled: true
        # è®¾ç½®ç™½åå•ï¼Œä¸å¡«åˆ™å…è®¸æ‰€æœ‰è®¿é—®
        allow:
        url-pattern: /druid/*
        # æŽ§åˆ¶å°ç®¡ç†ç”¨æˆ·åå’Œå¯†ç 
        login-username: admin
        login-password: fzzy123456
      filter:
        stat:
          enabled: true
          # æ…¢SQL记录
          log-slow-sql: true
          slow-sql-millis: 1000
          merge-sql: true
        wall:
          config:
            multi-statement-allow: true

  # Redis相关配置
  redis:
    database: 0
    host: 127.0.0.1
    port: 6379
    password: Redispwd..
    timeout: 1000
    pool:
      max-active: 200
      max-wait: -1
      max-idle: 10
      min-idle: 0

  #JPA配置
  jpa:
    database: mysql
    show-sql: true
    generate-ddl: false
    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
    hibernate:
      ddl-auto: update
    properties:
      hibernate:
        jdbc:
          batch_size: 500
          batch_versioned_data: true

#系统架构配置
framework:
  companyId: "5372"
  doradoMode: debug
  # åç§°
  name: æ™ºæ…§ç²®åº“监管系统
  # ç‰ˆæœ¬
  version: 2.0.0
  # ç‰ˆæƒå¹´ä»½
  copyrightYear: 2026
  # å®žä¾‹æ¼”示开关
  demoEnabled: false
  # æ–‡ä»¶è·¯å¾„ ç¤ºä¾‹ï¼ˆ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
  profile: E:/IGDSS/FILE/
  # èŽ·å–ip地址开关
  addressEnabled: false
  support: é£Žæ­£è‡´è¿œä¿¡æ¯æŠ€æœ¯è‚¡ä»½æœ‰é™å…¬å¸
  email: business@fzzygf.com
  phone: 400-627-1116
  website: http://www.fzzygf.com
  address: éƒ‘州市高新区长椿路11号河南省国家大学科技园孵化1号楼

 fzzy-igdss-web/src/main/resources/logback-spring.xml

@@ -4,7 +4,7 @@
    <!-- é¡¹ç›®é¡¹ç›® -->
    <property name="app.name" value="igdss"/>
    <!-- æ–‡ä»¶è·¯å¾„ -->
    <property name="log.path" value="D:/app/igdss/logs"/>
    <property name="log.path" value="C:/app/igdss/logs"/>


    <!-- å½©è‰²æ—¥å¿—插件 -->

 fzzy-igdss-web/src/main/resources/static/img/web/group/icon_dot4.png

 fzzy-igdss-web/src/main/resources/templates/no-license.html

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,110 @@
<!DOCTYPE html>
<html lang="zh-cn" xmlns:th=http://www.thymeleaf.org>
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    <title>智能粮库管理系统-异常说明</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <link rel="stylesheet"  th:href="@{/ajax/libs/layui-ruoyi/css/layui.css}"/>
</head>
<body>

<div style="margin: 20px; text-align: center;">

    <img th:src="${qrCodeString}" src="../static/images/big-icon-sys.png" />

    <h1 style="margin-top: -10px">抱歉，系统未授权或者授权到期，请联系管理员重新授权</h1>
    <h5 style="margin-top: 50px; font-weight:700">授权KEY：<b th:text="${checkLicInfo}"></b></h5>
    <div  style="width: 100%;text-align: center;">
        <center>
            <div style="width: 800px;padding-top:20px;align-self: center; ">
                <form class="layui-form" lay-filter="form1" action="">
                    <div class="layui-form-item layui-form-text" style="margin-left: -100px">
                        <label class="layui-form-label">授权码:</label>
                        <div class="layui-input-block">
                            <textarea name="authStr" placeholder="请输入授权码，点击立即提交，授权成功后会返回上一页面" class="layui-textarea"></textarea>
                        </div>
                    </div>
                </form>
                <div class="layui-form-item">
                    <div class="layui-input-block" style="width: 50%; float: left; margin-left: unset">
                        <button class="layui-btn layui-btn-normal" style="float: right; margin-right: 50px" onclick="getLicense()">获取授权</button>
                    </div>
                    <div class="layui-input-block" style="width: 50%; float: right; margin-left: unset">
                        <button class="layui-btn" style="float: left; margin-left: 50px" onclick="submitLicense()">立即提交</button>
                    </div>
                </div>
            </div>
        </center>
    </div>
</div>

</body>
<script th:src="@{/js/jquery.min.js}"></script>
<script th:src="@{/ajax/libs/layui-ruoyi/layui.js}"></script>
<script th:inline="javascript">
    //系统登陆人
    var loginUser = [[${loginUser}]];
    var companyId = [[${loginUser.companyId}]];
</script>
<script>
    var layer;
    var form;
    $(function () {
        layui.use(['layer','form'], function () {
            layer = layui.layer;
            form = layui.form;
        });
    });

    //获取授权码
    function getLicense() {
        var ii = layer.load(0, {shade: false})
        $.ajax({
            type: 'POST',
            url: "getLicense",
            dataType: 'JSON',
            contentType: "application/json;charset=UTF-8",
            data: JSON.stringify({"companyId":companyId}),
            success: function (result) {
                layer.close(ii);
                layer.alert(result.msg);
                if(result.code == "0000"){
                    window.history.back()
                }
            },
            error: function (result) {
                layer.close(ii);
                layer.alert(result.msg);
            }
        });
    };

    //提交授权码
    function submitLicense() {
        var data1 = form.val("form1");
        if(!data1.authStr){
            layer.alert("请输入授权码！");
            return;
        }
        var d = {"key":data1.authStr,"companyId":companyId};
        $.ajax({
            type: 'POST',
            url: "authorize",
            dataType: 'JSON',
            contentType: "application/json;charset=UTF-8",
            data: JSON.stringify(d),
            success: function (result) {
                layer.alert(result.msg);
                if(result.code == "0000"){
                    window.history.back()
                }
            },
            error: function (result) {
                layer.alert(result.msg);
            }
        });
    };

</script>
</html>