diff --git a/securitycontrol-auth/src/main/resources/bootstrap.yml b/securitycontrol-auth/src/main/resources/bootstrap.yml index d6f6646..d02711a 100644 --- a/securitycontrol-auth/src/main/resources/bootstrap.yml +++ b/securitycontrol-auth/src/main/resources/bootstrap.yml @@ -16,19 +16,19 @@ spring: cloud: nacos: username: nacos - password: nacos - # password: Jjsp@nacos2023 + # password: nacos + password: Jjsp@nacos2023 discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 - # server-addr: 127.0.0.1:18848 + # server-addr: 192.168.0.14:8848 + server-addr: 127.0.0.1:18848 # server-addr: 127.0.0.1:8848 - namespace: jj_zhgd_test + namespace: jjzhgd config: - server-addr: 192.168.0.14:8848 - # server-addr: 127.0.0.1:18848 + # server-addr: 192.168.0.14:8848 + server-addr: 127.0.0.1:18848 # server-addr: 127.0.0.1:8848 - namespace: jj_zhgd_test + namespace: jjzhgd # 配置文件格式 file-extension: yml # 共享配置 diff --git a/securitycontrol-gateway/src/main/resources/bootstrap.yml b/securitycontrol-gateway/src/main/resources/bootstrap.yml index 66e6c37..72ee857 100644 --- a/securitycontrol-gateway/src/main/resources/bootstrap.yml +++ b/securitycontrol-gateway/src/main/resources/bootstrap.yml @@ -16,22 +16,22 @@ spring: cloud: nacos: username: nacos - password: nacos + password: Jjsp@nacos2023 # password: Jjsp@nacos2023 discovery: # 服务注册地址 - # server-addr: 127.0.0.1:18848 - server-addr: 192.168.0.14:8848 + server-addr: 127.0.0.1:18848 + # server-addr: 192.168.0.14:8848 # server-addr: 192.168.0.14:8848 # server-addr: 127.0.0.1:8848 - namespace: jj_zhgd_test + namespace: jjzhgd config: # 配置中心地址 - # server-addr: 127.0.0.1:18848 - server-addr: 192.168.0.14:8848 + server-addr: 127.0.0.1:18848 + # server-addr: 192.168.0.14:8848 # server-addr: 192.168.0.14:8848 # server-addr: 127.0.0.1:8848 - namespace: jj_zhgd_test + namespace: jjzhgd # 配置文件格式 file-extension: yml #server-addr: 10.145.34.32:8848 diff --git a/securitycontrol-model/securitycontrol-Interface/pom.xml b/securitycontrol-model/securitycontrol-Interface/pom.xml index 511ef62..b8a9662 100644 --- a/securitycontrol-model/securitycontrol-Interface/pom.xml +++ b/securitycontrol-model/securitycontrol-Interface/pom.xml @@ -136,11 +136,7 @@ com.securitycontrol securitycontrol-commons-entity - - com.securitycontrol - securitycontrol-background - 3.6.1 - + diff --git a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/hksdk/HCNetSDK.java b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/hksdk/HCNetSDK.java index 128cebd..a53cb8c 100644 --- a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/hksdk/HCNetSDK.java +++ b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/hksdk/HCNetSDK.java @@ -22,7 +22,7 @@ public interface HCNetSDK extends Library { // /*** 宏定义 ***/ //常量 - String windowsPath = "F:\\hkfile\\lib\\HCNetSDK.dll"; + String windowsPath = "G:\\back\\hkfile\\lib\\HCNetSDK.dll"; diff --git a/securitycontrol-model/securitycontrol-Interface/src/main/resources/bootstrap.yml b/securitycontrol-model/securitycontrol-Interface/src/main/resources/bootstrap.yml index 3c46600..57f24d7 100644 --- a/securitycontrol-model/securitycontrol-Interface/src/main/resources/bootstrap.yml +++ b/securitycontrol-model/securitycontrol-Interface/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 18087 + port: 18079 management: server: port: -1 @@ -43,7 +43,12 @@ log: file: logs/sys-back.log maxsize: 30MB file: - temp_file_path: /data/zhgd/file + temp_file_path: /data/zhgd/file/ + windwos: + upload_path: F:/files/zhgd/ + linux: + upload_path: /data/zhgd/file/ + pagehelper: helper-dialect: mysql diff --git a/securitycontrol-model/securitycontrol-background/lib/sgjdbc-20250604.6638.jar b/securitycontrol-model/securitycontrol-background/lib/sgjdbc-20250604.6638.jar new file mode 100644 index 0000000..9ce2cb1 Binary files /dev/null and b/securitycontrol-model/securitycontrol-background/lib/sgjdbc-20250604.6638.jar differ diff --git a/securitycontrol-model/securitycontrol-background/pom.xml b/securitycontrol-model/securitycontrol-background/pom.xml index 9f54039..8265bd8 100644 --- a/securitycontrol-model/securitycontrol-background/pom.xml +++ b/securitycontrol-model/securitycontrol-background/pom.xml @@ -52,7 +52,8 @@ sgjdbc_20230302 1.0 system - ${project.basedir}/lib/sgjdbc_20230302.jar + ${project.basedir}/lib/sgjdbc_dev.jar + diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/bootstrap.yml b/securitycontrol-model/securitycontrol-background/src/main/resources/bootstrap.yml index 06b6073..c8c65d0 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/bootstrap.yml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/bootstrap.yml @@ -18,16 +18,16 @@ spring: cloud: nacos: username: nacos - password: nacos - # password: Jjsp@nacos2023 + # password: nacos + password: Jjsp@nacos2023 discovery: - # server-addr: 127.0.0.1:18848 - server-addr: 192.168.0.14:8848 - namespace: jj_zhgd_test + server-addr: 127.0.0.1:18848 + #server-addr: 192.168.0.14:8848 + namespace: jjzhgd config: - # server-addr: 127.0.0.1:18848 - server-addr: 192.168.0.14:8848 - namespace: jj_zhgd_test + server-addr: 127.0.0.1:18848 + # server-addr: 192.168.0.14:8848 + namespace: jjzhgd # 配置文件格式 file-extension: yml # 共享配置 diff --git a/securitycontrol-model/securitycontrol-files/lib/sgjdbc-20250604.6638.jar b/securitycontrol-model/securitycontrol-files/lib/sgjdbc-20250604.6638.jar new file mode 100644 index 0000000..9ce2cb1 Binary files /dev/null and b/securitycontrol-model/securitycontrol-files/lib/sgjdbc-20250604.6638.jar differ diff --git a/securitycontrol-model/securitycontrol-files/pom.xml b/securitycontrol-model/securitycontrol-files/pom.xml index dfbefb6..4be86dc 100644 --- a/securitycontrol-model/securitycontrol-files/pom.xml +++ b/securitycontrol-model/securitycontrol-files/pom.xml @@ -59,7 +59,15 @@ 1.0 system ${project.basedir}/lib/sgjdbc_dev.jar + + + + + + + + org.springframework.boot diff --git a/securitycontrol-model/securitycontrol-files/src/main/resources/bootstrap.yml b/securitycontrol-model/securitycontrol-files/src/main/resources/bootstrap.yml index f4ceaf3..b7cebb0 100644 --- a/securitycontrol-model/securitycontrol-files/src/main/resources/bootstrap.yml +++ b/securitycontrol-model/securitycontrol-files/src/main/resources/bootstrap.yml @@ -4,6 +4,11 @@ server: # Spring spring: + security: + user: + name: admin + password: admin + roles: ADMIN servlet: multipart: max-file-size: -1 @@ -17,14 +22,14 @@ spring: cloud: nacos: username: nacos - password: nacos + password: Jjsp@nacos2023 discovery: - server-addr: 192.168.0.14:8848 - namespace: jj_zhgd_test + server-addr: 127.0.0.1:18848 + namespace: jjzhgd # server-addr: 27.50.49.56:21625 config: - server-addr: 192.168.0.14:8848 - namespace: jj_zhgd_test + server-addr: 127.0.0.1:18848 + namespace: jjzhgd # server-addr: 27.50.49.56:21625 # 配置文件格式 file-extension: yml @@ -40,16 +45,35 @@ spring: # password: Bonus@admin123! file: upload: - # path: /home/zhgd/file/ - path: F:/File/ -# data: -# mongodb: -# host: 47.115.207.135 -# port: 27017 -# database: admin -# username: admin -# password: Bonus@admin123! + path: /data/zhgd/file/ + # path: F:/files/zhgd/ +#file: +# temp_file_path: /data/zhgd/file +# windwos: +# upload_path: F:/files/zhgd/ +# linux: +# upload_path: /data/zhgd/file + data: + mongodb: + host: 47.115.207.135 + port: 27017 + database: admin + username: admin + password: Bonus@admin123! #加密组件 + +#management.security.enabled=true security.user.name=admin security.user.password=admin 2 jasypt: encryptor: password: Encrypt +management: + server: + port: -1 + endpoints: + web: + exposure: + exclude: [] + enabled-by-default: false + endpoint: + beans: + enabled: false diff --git a/securitycontrol-model/securitycontrol-screen/lib/sgjdbc-20250604.6638.jar b/securitycontrol-model/securitycontrol-screen/lib/sgjdbc-20250604.6638.jar new file mode 100644 index 0000000..9ce2cb1 Binary files /dev/null and b/securitycontrol-model/securitycontrol-screen/lib/sgjdbc-20250604.6638.jar differ diff --git a/securitycontrol-model/securitycontrol-screen/lib/sgjdbc_20230302.jar b/securitycontrol-model/securitycontrol-screen/lib/sgjdbc_20230302.jar deleted file mode 100644 index 648ef76..0000000 Binary files a/securitycontrol-model/securitycontrol-screen/lib/sgjdbc_20230302.jar and /dev/null differ diff --git a/securitycontrol-model/securitycontrol-screen/pom.xml b/securitycontrol-model/securitycontrol-screen/pom.xml index 675654c..b9a6f57 100644 --- a/securitycontrol-model/securitycontrol-screen/pom.xml +++ b/securitycontrol-model/securitycontrol-screen/pom.xml @@ -42,6 +42,7 @@ 1.0 system ${project.basedir}/lib/sgjdbc_dev.jar + diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/XcIndexServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/XcIndexServiceImpl.java index 187244f..ef4c698 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/XcIndexServiceImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/XcIndexServiceImpl.java @@ -205,7 +205,8 @@ public class XcIndexServiceImpl implements XcIndexService { List costList=new ArrayList(); ProVo proVo=mapper.getProDetails(dto.getBidCode()); String startTime=proVo.getPlanStartTime(); - String time=DateTimeHelper.getNowMonth(); + String time=proVo.getPlanEndTime(); + time=time.substring(0,7); String nowTime=startTime.substring(0,7); if(DateTimeHelper.compareMonth(startTime,time)){ monList.add(nowTime); diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/bootstrap.yml b/securitycontrol-model/securitycontrol-screen/src/main/resources/bootstrap.yml index 72e514f..c4aaa63 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/bootstrap.yml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/bootstrap.yml @@ -18,13 +18,13 @@ spring: cloud: nacos: username: nacos - password: nacos + password: Jjsp@nacos2023 discovery: - server-addr: 192.168.0.14:8848 - namespace: jj_zhgd_test + server-addr: 127.0.0.1:18848 + namespace: jjzhgd config: - server-addr: 192.168.0.14:8848 - namespace: jj_zhgd_test + server-addr: 127.0.0.1:18848 + namespace: jjzhgd # 配置文件格式 file-extension: yml # 共享配置 @@ -35,6 +35,14 @@ jasypt: encryptor: password: Encrypt - +file: + temp_file_path: /data/zhgd/file + windwos: + upload_path: F:/files/zhgd/ + linux: + upload_path: /data/zhgd/file/ + +pagehelper: + helper-dialect: mysql diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml index c5823bd..4c74493 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml @@ -105,8 +105,7 @@ SELECT ANY_VALUE(GROUP_CONCAT(tdd.mode_name)) AS modeName, ANY_VALUE( GROUP_CONCAT(tdv.val)) AS val, - ANY_VALUE( ttp.user_name)AS userName, - ANY_VALUE(ttp.phone) phone + ANY_VALUE( ttp.user_name)AS userName FROM tb_bd_device tbd INNER JOIN tb_pro_bd tpb ON tbd.bd_id = tpb.id AND tpb.del_flag = 0 AND tpb.bid_code = #{bidCode} INNER JOIN tb_device_detail tdd ON tbd.device_id = tdd.device_id AND tdd.del_flag = 0 diff --git a/securitycontrol-model/securitycontrol-system/lib/sgjdbc-20250604.6638.jar b/securitycontrol-model/securitycontrol-system/lib/sgjdbc-20250604.6638.jar new file mode 100644 index 0000000..9ce2cb1 Binary files /dev/null and b/securitycontrol-model/securitycontrol-system/lib/sgjdbc-20250604.6638.jar differ diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/bootstrap.yml b/securitycontrol-model/securitycontrol-system/src/main/resources/bootstrap.yml index 16f96d3..eb12083 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/resources/bootstrap.yml +++ b/securitycontrol-model/securitycontrol-system/src/main/resources/bootstrap.yml @@ -18,17 +18,17 @@ spring: cloud: nacos: username: nacos - password: nacos - # password: Jjsp@nacos2023 + # password: nacos + password: Jjsp@nacos2023 discovery: - # server-addr: 127.0.0.1:18848 - server-addr: 192.168.0.14:8848 - namespace: jj_zhgd_test + server-addr: 127.0.0.1:18848 + # server-addr: 192.168.0.14:8848 + namespace: jjzhgd config: - # server-addr: 127.0.0.1:18848 - server-addr: 192.168.0.14:8848 + server-addr: 127.0.0.1:18848 + # server-addr: 192.168.0.14:8848 # server-addr: 127.0.0.1:8848 - namespace: jj_zhgd_test + namespace: jjzhgd # 配置文件格式 file-extension: yml # 共享配置