igds-base/src/main/java/com/ld/igds/conf/MyBatisPlusConf.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
igds-web/pom.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
igds-web/src/main/resources/application-pro.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
igds-web/src/main/resources/application-pro5333.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
igds-web/src/main/resources/templates/index/index-5329.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
igds-base/src/main/java/com/ld/igds/conf/MyBatisPlusConf.java
@@ -196,7 +196,7 @@ */ public static void main(String[] args) { try { String password = ""; String password = "Fzzy@#$%5432..K"; System.out.println("ææå¯ç : " + password); //ç§é¥ String privateKey = DEFAULT_PRIVATE_KEY_STRING; igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java
@@ -26,6 +26,7 @@ private BhznGrainV1ServerEngine bhznGrainServerEngine1; @Autowired private BhznVerbServerEngine bhznVerbServerEngine; @Override public void run(String... strings) throws Exception { @@ -36,12 +37,12 @@ if (configData.getActive().indexOf("pro") >= 0) { //å¾é»æå¡å¨ä½¿ç¨ bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT); // bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT); //æ±è¥¿èµ£å·ã广ä¸é«å·ä½¿ç¨ // bhznGrainServerEngine2.start(BhznGrainV2ServerEngine.PORT); bhznGrainServerEngine2.start(BhznGrainV2ServerEngine.PORT); //广ä¸é«å·ä½¿ç¨ // bhznVerbServerEngine.start(BhznVerbServerEngine.PORT); bhznVerbServerEngine.start(BhznVerbServerEngine.PORT); return; } if (configData.getActive().indexOf("dev") >= 0) { igds-web/pom.xml
@@ -152,7 +152,7 @@ </dependency>--> <!-- ç§æåè®®-飿£è´è¿--> <!-- ç§æåè®®-飿£è´è¿ <dependency> <groupId>com.ld.igds</groupId> <artifactId>igds-protocol-fzzy3</artifactId> @@ -167,7 +167,7 @@ <groupId>log4j</groupId> </exclusion> </exclusions> </dependency> </dependency>--> <!-- MODBUS-TCP <dependency> @@ -187,7 +187,7 @@ </dependency>--> <!-- ç§æåè®®-飿£è´è¿IOTãå¶æ°®æº--> <!-- ç§æåè®®-飿£è´è¿IOTãå¶æ°®æº <dependency> <groupId>com.ld.igds</groupId> <artifactId>igds-protocol-iot</artifactId> @@ -202,9 +202,9 @@ <groupId>log4j</groupId> </exclusion> </exclusions> </dependency> </dependency>--> <!-- ç§æåè®®-è´åç²®æ --> <!-- ç§æåè®®-è´åç²®æ <dependency> <groupId>com.ld.igds</groupId> <artifactId>igds-protocol-beibo</artifactId> @@ -219,9 +219,9 @@ <groupId>log4j</groupId> </exclusion> </exclusions> </dependency> </dependency>--> <!-- ç§æåè®®-DLT645çµè¡¨åè®®--> <!-- ç§æåè®®-DLT645çµè¡¨åè®® <dependency> <groupId>com.ld.igds</groupId> <artifactId>igds-protocol-es</artifactId> @@ -236,7 +236,7 @@ <groupId>log4j</groupId> </exclusion> </exclusions> </dependency> </dependency>--> <!-- ç§æåè®®-馿µ·æºè½--> <dependency> @@ -255,7 +255,7 @@ </exclusions> </dependency> <!-- ç§æåè®®-æ£æ¥çµå--> <!-- ç§æåè®®-æ£æ¥çµå <dependency> <groupId>com.ld.igds</groupId> <artifactId>igds-protocol-zldz</artifactId> @@ -270,7 +270,7 @@ <groupId>log4j</groupId> </exclusion> </exclusions> </dependency> </dependency>--> <!-- 海康车çè¯å«-SDK--> <dependency> igds-web/src/main/resources/application-pro.yml
@@ -1,4 +1,4 @@ ########################## 广ä¸å¾é»é¡¹ç® ########################## ########################## 西èå±±åç²®åºé¡¹ç® ########################## server: port: 8888 context-path: / @@ -15,12 +15,12 @@ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8 driver-class-name: com.mysql.jdbc.Driver username: root password: ukJp12Qf+elyBvGHkJ5MQMa95pfVm0oFBHefdEgDFKoFSjbgYa9PYfv5vlem5nvoXjQsP9tIIo53DvSbsl160Q== password: VoN6mGy94W/8BcVVpTsa+J2sjO4oBTDU25XkwdI2tJW4wj7ZOjuOHFonNaFcFoG3KfotN1M5p7mhxim8PkLcnw== public-key: config-decrypt: true initial-size: 5 min-idle: 5 max-active: 50 initial-size: 5 min-idle: 5 max-active: 50 max-wait: 60000 time-between-eviction-runs-millis: 60000 min-evictable-idle-time-millis: 300000 @@ -51,7 +51,7 @@ database: 0 host: 127.0.0.1 port: 6379 password: Abc123.. password: Redispwd.. # è¿æ¥æ± æå¤§è¿æ¥æ°ï¼ä½¿ç¨è´å¼è¡¨ç¤ºæ²¡æéå¶ï¼ pool: max-active: 200 @@ -71,10 +71,10 @@ ## ç³»ç»æ¥å£è·¯ç±é ç½® æ³¨ææ°å妿以0å¼å¤´çè¯ï¼åå°ä¼åºç°è½¬ä¹ï¼è¯·æ·»å "" igds: default: companyId: 5322 companyId: 5333 sys-name: æºæ §ç²®åºç®¡çç³»ç» logo: logo-default.png logo-title: logo-title-default.png support: æºæ §ç²®åºç»¼å管çå¹³å° support: 飿£è´è¿ä¿¡æ¯ææ¯è¡ä»½æéå ¬å¸ grian-add-point: N file-path: D:/IGDS/FILE/ igds-web/src/main/resources/application-pro5333.yml
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,80 @@ ########################## 西èå±±åç²®åºé¡¹ç® ########################## server: port: 8888 context-path: / connection-timeout: 5000 tomcat: uri-encoding: UTF-8 ########################## datasourcec ########################## spring: datasource: db-base: name: db-base type: com.alibaba.druid.pool.DruidDataSource url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8 driver-class-name: com.mysql.jdbc.Driver username: root password: VoN6mGy94W/8BcVVpTsa+J2sjO4oBTDU25XkwdI2tJW4wj7ZOjuOHFonNaFcFoG3KfotN1M5p7mhxim8PkLcnw== public-key: config-decrypt: true initial-size: 5 min-idle: 5 max-active: 50 max-wait: 60000 time-between-eviction-runs-millis: 60000 min-evictable-idle-time-millis: 300000 validation-query: select 1 from dual test-whileIdle: true test-on-borrow: false test-on-return: false pool-prepared-statements: true max-pool-prepared-statement-per-connection-size: 20 filters: stat connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 use-global-data-source-stat: true removeAbandoned: true removeAbandonedTimeout: 90 logAbandoned: true poolPreparedStatements: true maxPoolPreparedStatementPerConnectionSize: 20 db-sqlite: name: db-sqlite url: jdbc:sqlite:D:/app/igds/db/iot_cfg.db driver-class-name: org.sqlite.JDBC type: com.alibaba.druid.pool.DruidDataSource username: password: # Redisç¸å ³é ç½® redis: database: 0 host: 127.0.0.1 port: 6379 password: Redispwd.. # è¿æ¥æ± æå¤§è¿æ¥æ°ï¼ä½¿ç¨è´å¼è¡¨ç¤ºæ²¡æéå¶ï¼ pool: max-active: 200 max-wait: -1 max-idle: 10 min-idle: 0 timeout: 6000 license: subject: ld_license publicAlias: publicCert storePass: PUBLICFZZYXXJSGFYXGS888888 licensePath: D:/IGDS/license/license.lic publicKeysStorePath: D:/IGDS/license/publicCerts.keystore ########################## IGDS ########################## ## ç³»ç»æ¥å£è·¯ç±é ç½® æ³¨ææ°å妿以0å¼å¤´çè¯ï¼åå°ä¼åºç°è½¬ä¹ï¼è¯·æ·»å "" igds: default: companyId: 5333 sys-name: æºæ §ç²®åºç®¡çç³»ç» logo: logo-default.png logo-title: logo-title-default.png support: 飿£è´è¿ä¿¡æ¯ææ¯è¡ä»½æéå ¬å¸ grian-add-point: N file-path: D:/IGDS/FILE/ igds-web/src/main/resources/templates/index/index-5329.html
@@ -111,7 +111,7 @@ <P>æºè½é¢è¦</P> </a> </span> <span class="i-menu-item i-menu5 i-navBg5"> <a href="javascript:;" onClick="open3d()"> <a href="javascript:;" onClick="openHelp()"> <i><img th:src="@{/static/images/i-icon-help1.png}"/></i> <P>帮å©ä¸å¿</P> </a> @@ -207,14 +207,15 @@ }; //æå¼è´¨éæ£æµ // function open3d() { // if ("#" == threePath) { // window.open("#", "_self"); // } else { // window.open(threePath, "_blank"); // } // }; function open3d() { if ("#" == threePath) { window.open("#", "_self"); } else { window.open(threePath, "_blank"); } }; function openHelp() { window.open("./basic/common/help-center", "_blank"); }; </script>