diff --git a/busi-back/busi-app-control/src/main/resources/dev/application.properties b/busi-back/busi-app-control/src/main/resources/dev/application.properties index 398ecfa..6377e2f 100644 --- a/busi-back/busi-app-control/src/main/resources/dev/application.properties +++ b/busi-back/busi-app-control/src/main/resources/dev/application.properties @@ -11,11 +11,6 @@ torch.login.use=true #\u7528\u6237\u4F1A\u8BDD\u4FDD\u6301\u65F6\u95F4 \u5355\u4F4D\u79D2 torch.login.time=1200000 #\u52A0\u5BC6\u6587\u4EF6 -#torch.key.path=D:\\Tools\\huatek-license\\xinyingdashuju\\license.torch -#torch.key.path=C:\\workspace\\Branch_ZGH\\ZGH\\02Engineering\\license.torch -#torch.key.path=D:\\DaShuJu\\xykj-dsj-app\\license.torch -#torch.key.path=D:\\devel\\xydler_works\\license\\license.torch -#torch.key.path=D:\\buck_guo\\git\\DaShuJu\\xykj-dsj-back\\license.torch torch.key.path=/usr/local/license/license.torch #\u516C\u94A5 torch.public.key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCOVWoo3EZ8jI06cJ37uA8dYHAlcZakpxsvnTNgeP49DZfx457rh8+sdGDq/BYE6KwQvzSW0A5kTDVOKj/YTTE7rB0OpeTmksnK3aQe+iiJFSojgSLGiHpHOBV2wHZztDc3ME72u3dtd31ncUaRZYWUNlJq37p5OL/qBLHjqDMW8QIDAQAB @@ -43,7 +38,7 @@ base.verify=false base.verifyType=1 #\u7CFB\u7EDF\u65E5\u5FD7\u6570\u636E\u5E93 log.driver=com.mysql.jdbc.Driver -log.url=jdbc:mysql://192.168.135.130:3306/xydl_dsj_dev2&allowMultiQueries=true +log.url=jdbc:mysql://127.0.0.1:3306/jsyx0801&allowMultiQueries=true log.username=root -log.password=root +log.password=123456 log.publickey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKvUGsGxGw0WJnveOqnULaG0uvAe3vBqcUhBGwnmWJaqWv8XVnqz8YQFJxA8ua7hwUVjtcHzGekbUeStx1BrYsECAwEAAQ== diff --git a/busi-back/busi-app-control/src/main/resources/test/application.properties b/busi-back/busi-app-control/src/main/resources/test/application.properties index 208a129..57878aa 100644 --- a/busi-back/busi-app-control/src/main/resources/test/application.properties +++ b/busi-back/busi-app-control/src/main/resources/test/application.properties @@ -38,7 +38,7 @@ base.verify=false base.verifyType=1 #\u7cfb\u7edf\u65e5\u5fd7\u6570\u636e\u5e93 log.driver=com.mysql.jdbc.Driver -log.url=jdbc:mysql://192.168.135.130:3306/xydl_dsj_dev2&allowMultiQueries=true +log.url=jdbc:mysql://127.0.0.1:3306/jsyx0801&allowMultiQueries=true log.username=root -log.password=root +log.password=123456 log.publickey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKvUGsGxGw0WJnveOqnULaG0uvAe3vBqcUhBGwnmWJaqWv8XVnqz8YQFJxA8ua7hwUVjtcHzGekbUeStx1BrYsECAwEAAQ== diff --git a/busi-back/busi-back-control/src/main/resources/test/application.properties b/busi-back/busi-back-control/src/main/resources/test/application.properties index c0340a4..da9ff3b 100644 --- a/busi-back/busi-back-control/src/main/resources/test/application.properties +++ b/busi-back/busi-back-control/src/main/resources/test/application.properties @@ -38,7 +38,7 @@ base.verify=false base.verifyType=1 #\u7cfb\u7edf\u65e5\u5fd7\u6570\u636e\u5e93 log.driver=com.mysql.jdbc.Driver -log.url=jdbc:mysql://192.168.135.130:3306/xydl_dsj_dev2&allowMultiQueries=true +log.url=jdbc:mysql://127.0.0.1:3306/jsyx0801&allowMultiQueries=true log.username=root -log.password=root +log.password=123456 log.publickey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKvUGsGxGw0WJnveOqnULaG0uvAe3vBqcUhBGwnmWJaqWv8XVnqz8YQFJxA8ua7hwUVjtcHzGekbUeStx1BrYsECAwEAAQ== diff --git a/busi-back/busi-back-serviceImpl/generatorConfig.xml b/busi-back/busi-back-serviceImpl/generatorConfig.xml index 5f29b00..0d42763 100644 --- a/busi-back/busi-back-serviceImpl/generatorConfig.xml +++ b/busi-back/busi-back-serviceImpl/generatorConfig.xml @@ -2,7 +2,7 @@ - + diff --git a/busi-back/busi-back-serviceImpl/pom.xml b/busi-back/busi-back-serviceImpl/pom.xml index 55bf86d..ffc6c84 100644 --- a/busi-back/busi-back-serviceImpl/pom.xml +++ b/busi-back/busi-back-serviceImpl/pom.xml @@ -118,20 +118,7 @@ - - local - matlabplot - 1 - system - ${pom.basedir}/src/main/webapp/WEB-INF/lib/matlabplot.jar - - - local - javabuilder - 1 - system - ${pom.basedir}/src/main/webapp/WEB-INF/lib/javabuilder.jar - + busi-back-serviceImpl diff --git a/busi-back/busi-back-serviceImpl/src/main/resources/dev/application.properties b/busi-back/busi-back-serviceImpl/src/main/resources/dev/application.properties index 0ceeeaf..bbdd8cd 100644 --- a/busi-back/busi-back-serviceImpl/src/main/resources/dev/application.properties +++ b/busi-back/busi-back-serviceImpl/src/main/resources/dev/application.properties @@ -43,8 +43,8 @@ base.service.impl.package=com.huatek.busi.service.impl base.mapper.path=classpath:com/huatek/busi/mapping/*Mapping.xml #\u6570\u636E\u8F93\u51FA\u6839\u76EE\u5F55 -dataoutput.base.path=D://sftp//outd -#dataoutput.base.path=/home/sftp/outd +#dataoutput.base.path=D://sftp//outd +dataoutput.base.path=/home/sftp/outd #dataoutput.base.path=/appdata/sftp/outd #Matlab\u8C31\u56FE\u5730\u5740 #base.matlabImage.path=D://matlabImage @@ -132,7 +132,7 @@ ftp-centos.user=sasftp ftp-centos.password=sasftp ftp-centos.basePath=outd/simulate -dangle.dat.path=D:\\dongle.dat -#dangle.dat.path=/usr/local/dogfile/dongle.dat +#dangle.dat.path=D:\\dongle.dat +dangle.dat.path=/usr/local/dogfile/dongle.dat dangle.dat.ip=192.168.128.86 dangle.dat.mac=60:a4:4c:52:e6:d6 diff --git a/busi-back/busi-back-serviceImpl/src/main/resources/dev/jdbc.properties b/busi-back/busi-back-serviceImpl/src/main/resources/dev/jdbc.properties index 8d7064f..e8b8bc5 100644 --- a/busi-back/busi-back-serviceImpl/src/main/resources/dev/jdbc.properties +++ b/busi-back/busi-back-serviceImpl/src/main/resources/dev/jdbc.properties @@ -1,23 +1,7 @@ base.driverClassName=com.mysql.jdbc.Driver -#base.url=jdbc:mysql://localhost:3307/xy_test -#base.username=xytest -#base.password=xytest - -#base.url=jdbc:mysql://192.168.1.11:3306/jxhp2?zeroDateTimeBehavior=convertToNull -#base.url=jdbc:mysql://192.168.1.11:3306/zjxi_0818?zeroDateTimeBehavior=convertToNull -#base.url=jdbc:mysql://192.168.1.10:3306/text_jxhp?zeroDateTimeBehavior=convertToNull -#base.url=jdbc:mysql://localhost:3306/hmfdb?zeroDateTimeBehavior=convertToNullH -#base.url=jdbc:mysql://192.168.1.15:3306/hmfdb?zeroDateTimeBehavior=convertToNull -#base.url=jdbc:mysql://192.168.128.86:3306/jxhp_0708?zeroDateTimeBehavior=convertToNull -#base.url=jdbc:mysql://192.168.135.81:3306/hmfdb_0719?zeroDateTimeBehavior=convertToNull -#base.url=jdbc:mysql://192.168.135.81:3306/xydl_zgh_1009?zeroDateTimeBehavior=convertToNull -#base.url=jdbc:mysql://192.168.135.81:3306/xydl_zgh_zhenan?zeroDateTimeBehavior=convertToNull -base.url=jdbc:mysql://127.0.0.1:3306/jsyx20240223?zeroDateTimeBehavior=convertToNull -#base.url=jdbc:mysql://192.168.135.81:3306/xydl_test_230301?zeroDateTimeBehavior=convertToNull +base.url=jdbc:mysql://127.0.0.1:3306/jsyx0801?zeroDateTimeBehavior=convertToNull base.username=root -#base.password=root -#base.password=$WLge61D?LD? -base.password=root +base.password=123456 base.publickey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAI5Zd7sp6YWTOD8PuXwGAFXkolrW/87Zhd9+Oa4Q3nDG3DdJW86rW9Mj06pF/MxZfGzGDwKPtOBFeGx1KpCV0xsCAwEAAQ== #\u521D\u59CB\u5316\u8FDE\u63A5\u5927\u5C0F diff --git a/busi-back/busi-back-serviceImpl/src/main/resources/test/jdbc.properties b/busi-back/busi-back-serviceImpl/src/main/resources/test/jdbc.properties index e94e6e7..7c50f92 100644 --- a/busi-back/busi-back-serviceImpl/src/main/resources/test/jdbc.properties +++ b/busi-back/busi-back-serviceImpl/src/main/resources/test/jdbc.properties @@ -1,5 +1,5 @@ base.driverClassName=com.mysql.jdbc.Driver -base.url=jdbc:mysql://192.168.128.86:3306/xy_test?zeroDateTimeBehavior=convertToNull +base.url=jdbc:mysql://127.0.0.1:3306/jsyx0801?zeroDateTimeBehavior=convertToNull base.username=root base.password=123456 base.publickey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAI5Zd7sp6YWTOD8PuXwGAFXkolrW/87Zhd9+Oa4Q3nDG3DdJW86rW9Mj06pF/MxZfGzGDwKPtOBFeGx1KpCV0xsCAwEAAQ== diff --git a/busi-back/busi-back-ws/src/main/resources/dev/application.properties b/busi-back/busi-back-ws/src/main/resources/dev/application.properties index 417d5ae..2d27168 100644 --- a/busi-back/busi-back-ws/src/main/resources/dev/application.properties +++ b/busi-back/busi-back-ws/src/main/resources/dev/application.properties @@ -11,8 +11,7 @@ torch.login.use=true #\u7528\u6237\u4F1A\u8BDD\u4FDD\u6301\u65F6\u95F4 \u5355\u4F4D\u79D2 torch.login.time=1200000 #\u52A0\u5BC6\u6587\u4EF6 -#torch.key.path=/usr/local/license/license.torch -torch.key.path=D:\\code\\0total-zgh\\zgh\\zgh-ZhenAn\\02Engineering\\xykj-dsj-back\\license.torch +torch.key.path=/usr/local/license/license.torch #\u516C\u94A5 torch.public.key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCX+3A/V4y3qNMcV1K28+DbsSIQVG+mfL40sSIR5N0TBNz2xViCgw7BDl91ilByM+Y8+/bnE/NsQlGGtRc+wuYJthpZ4/N8TaQT3UJ+xNlphXf01GI8bD7xQ0ITLR0iXkwr4cNIR8yVcbc1DPLqxfusBG7UL8vuQ99KxnOcp+yMxQIDAQAB #\u6821\u9A8C\u5305\u540D diff --git a/frame-base/frame-base-serviceImpl/src/main/resources/dev/application.properties b/frame-base/frame-base-serviceImpl/src/main/resources/dev/application.properties index 8afe00f..cbd65f7 100644 --- a/frame-base/frame-base-serviceImpl/src/main/resources/dev/application.properties +++ b/frame-base/frame-base-serviceImpl/src/main/resources/dev/application.properties @@ -48,7 +48,7 @@ base.user.remote.aadd=http://192.168.129.213:8081/userRemote/addUser #密码加密传输，前端公钥加密，后端私钥解密 rsa.private_key=MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKNPuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gAkM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWowcSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99EcvDQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthhYhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3UP8iWi1Qw0Y= -dangle.dat.path=D:\\dongle.dat -#dangle.dat.path=/usr/local/dogfile/dongle.dat +#dangle.dat.path=D:\\dongle.dat +dangle.dat.path=/usr/local/dogfile/dongle.dat dangle.dat.ip=192.168.128.86 dangle.dat.mac=60:a4:4c:52:e6:d6 \ No newline at end of file diff --git a/frame-base/frame-base-serviceImpl/src/main/resources/dev/jdbc.properties b/frame-base/frame-base-serviceImpl/src/main/resources/dev/jdbc.properties index f8bab45..088bdb0 100644 --- a/frame-base/frame-base-serviceImpl/src/main/resources/dev/jdbc.properties +++ b/frame-base/frame-base-serviceImpl/src/main/resources/dev/jdbc.properties @@ -1,20 +1,7 @@ base.driverClassName=com.mysql.jdbc.Driver -#base.url=jdbc:mysql://192.168.135.130:3306/xydl_dsj_dev2 -#base.username=root -#base.password=root - -#base.url=jdbc:mysql://192.168.1.15:3306/hmfdb?zeroDateTimeBehavior=convertToNull -#base.url=jdbc:mysql://192.168.135.81:3306/hmfdb_0719?zeroDateTimeBehavior=convertToNull -#base.url=jdbc:mysql://192.168.1.15:3306/hmfdb?zeroDateTimeBehavior=convertToNull -#base.url=jdbc:mysql://192.168.128.86:3306/jxhp_0708?zeroDateTimeBehavior=convertToNull -#base.url=jdbc:mysql://192.168.135.81:3306/xydl_zgh_1009?zeroDateTimeBehavior=convertToNull -#base.url=jdbc:mysql://192.168.135.81:3306/xydl_zgh_zhenan?zeroDateTimeBehavior=convertToNull -base.url=jdbc:mysql://127.0.0.1:3306/jsyx20240223?zeroDateTimeBehavior=convertToNull -#base.url=jdbc:mysql://192.168.135.81:3306/xydl_test_230301?zeroDateTimeBehavior=convertToNull - +base.url=jdbc:mysql://127.0.0.1:3306/jsyx0801?zeroDateTimeBehavior=convertToNull base.username=root -base.password=root -#base.password=root +base.password=123456 base.publickey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANCOXuL4ix0ofb0gBe7YcZt8ZVI0jahslyKco0ZREJB7RbVRla+Bmrr0hoFcVyd5qRiFAwflqiwDIOEEEmX7U2MCAwEAAQ== #\u521d\u59cb\u5316\u8fde\u63a5\u5927\u5c0f base.initialSize=0 diff --git a/frame-base/frame-base-serviceImpl/src/main/resources/test/jdbc.properties b/frame-base/frame-base-serviceImpl/src/main/resources/test/jdbc.properties index e72954b..d293c4b 100644 --- a/frame-base/frame-base-serviceImpl/src/main/resources/test/jdbc.properties +++ b/frame-base/frame-base-serviceImpl/src/main/resources/test/jdbc.properties @@ -1,5 +1,5 @@ base.driverClassName=com.mysql.jdbc.Driver -base.url=jdbc:mysql://192.168.128.86:3306/xy_test +base.url=jdbc:mysql://127.0.0.1:3306/jsyx0801 base.username=root base.password=123456 base.publickey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANCOXuL4ix0ofb0gBe7YcZt8ZVI0jahslyKco0ZREJB7RbVRla+Bmrr0hoFcVyd5qRiFAwflqiwDIOEEEmX7U2MCAwEAAQ==