From d3822e70e1c175604407917460afbf54a7787597 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 20 十二月 2025 13:43:16 +0800
Subject: [PATCH] 增加配置
---
fzzy-igdss-web/src/main/resources/logback-spring.xml | 2
fzzy-igdss-web/src/main/resources/application-pro.yml | 119 +++++++++++++++++
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml | 10
fzzy-igdss-web/src/main/resources/application-pro5372.yml | 119 +++++++++++++++++
fzzy-igdss-web/src/main/resources/templates/no-license.html | 110 +++++++++++++++
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml | 10
fzzy-igdss-web/src/main/resources/static/img/web/group/icon_dot4.png | 0
7 files changed, 361 insertions(+), 9 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
index ebdc521..e4c9085 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
+++ b/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>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
index 2048427..3017b4d 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
+++ b/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>
diff --git a/fzzy-igdss-web/src/main/resources/application-pro.yml b/fzzy-igdss-web/src/main/resources/application-pro.yml
new file mode 100644
index 0000000..41e972a
--- /dev/null
+++ b/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
+ # 鎱QL璁板綍
+ 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锛孡inux閰嶇疆 /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鍙锋ゼ
\ No newline at end of file
diff --git a/fzzy-igdss-web/src/main/resources/application-pro5372.yml b/fzzy-igdss-web/src/main/resources/application-pro5372.yml
new file mode 100644
index 0000000..41e972a
--- /dev/null
+++ b/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
+ # 鎱QL璁板綍
+ 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锛孡inux閰嶇疆 /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鍙锋ゼ
\ No newline at end of file
diff --git a/fzzy-igdss-web/src/main/resources/logback-spring.xml b/fzzy-igdss-web/src/main/resources/logback-spring.xml
index 788f590..7350060 100644
--- a/fzzy-igdss-web/src/main/resources/logback-spring.xml
+++ b/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"/>
<!-- 褰╄壊鏃ュ織鎻掍欢 -->
diff --git a/fzzy-igdss-web/src/main/resources/static/img/web/group/icon_dot4.png b/fzzy-igdss-web/src/main/resources/static/img/web/group/icon_dot4.png
new file mode 100644
index 0000000..1599e2f
--- /dev/null
+++ b/fzzy-igdss-web/src/main/resources/static/img/web/group/icon_dot4.png
Binary files differ
diff --git a/fzzy-igdss-web/src/main/resources/templates/no-license.html b/fzzy-igdss-web/src/main/resources/templates/no-license.html
new file mode 100644
index 0000000..8347923
--- /dev/null
+++ b/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>
--
Gitblit v1.9.3