From 6a7ec92c752fb8b060b4a67b78a741ba75ea642a Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Wed, 27 Dec 2023 10:21:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20app=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=97=B6=E5=80=99=E5=90=8E=E5=8F=B0=E5=9C=B0=E5=9D=80=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/LoginController.java | 72 ++++++++++--------- src/main/resources/application-dev.properties | 19 +++-- src/main/resources/application.properties | 4 +- .../datasource/system/CorpPathMapper.xml | 5 +- 4 files changed, 51 insertions(+), 49 deletions(-) diff --git a/src/main/java/com/zcloud/controller/system/LoginController.java b/src/main/java/com/zcloud/controller/system/LoginController.java index d6b03f2f..512463d5 100644 --- a/src/main/java/com/zcloud/controller/system/LoginController.java +++ b/src/main/java/com/zcloud/controller/system/LoginController.java @@ -70,19 +70,19 @@ public class LoginController extends BaseController { @Autowired private PhotoService photoService; - @Value("${czks-useridentity}") - private String czksIdentity; - @Value("${czks-baseimgpath}") - private String czksBaseimgpath; - @Value("${czks-backendaddr}") - private String czksBackendaddr; - - @Value("${gwj-useridentity}") - private String gwjIdentity; - @Value("${gwj-baseimgpath}") - private String gwjBaseimgpath; - @Value("${gwj-backendaddr}") - private String gwjBackendaddr; +// @Value("${czks-useridentity}") +// private String czksIdentity; +// @Value("${czks-baseimgpath}") +// private String czksBaseimgpath; +// @Value("${czks-backendaddr}") +// private String czksBackendaddr; +// +// @Value("${gwj-useridentity}") +// private String gwjIdentity; +// @Value("${gwj-baseimgpath}") +// private String gwjBaseimgpath; +// @Value("${gwj-backendaddr}") +// private String gwjBackendaddr; @Autowired private CorpPathService corpPathService; @@ -187,24 +187,24 @@ public class LoginController extends BaseController { return map; } // 判断是不是沧州矿石的用户 - if (czksIdentity.equals(pd.getString("USER_IDENTITY"))) { - // 沧州矿石的用户 - // 用户标识 - map.put("USER_IDENTITY", czksIdentity); - // 图片路径 - map.put("baseImgPath", czksBaseimgpath); - // 后台地址 - map.put("BACKENDADDR", czksBackendaddr); - } - if ("".equals(pd.getString("USER_IDENTITY"))) { - // 港股的用户 - // 用户标识 - map.put("USER_IDENTITY", gwjIdentity); - // 图片路径 - map.put("baseImgPath", gwjBaseimgpath); - // 后台地址 - map.put("BACKENDADDR", gwjBackendaddr); - } +// if (czksIdentity.equals(pd.getString("USER_IDENTITY"))) { +// // 沧州矿石的用户 +// // 用户标识 +// map.put("USER_IDENTITY", czksIdentity); +// // 图片路径 +// map.put("baseImgPath", czksBaseimgpath); +// // 后台地址 +// map.put("BACKENDADDR", czksBackendaddr); +// } +// if ("".equals(pd.getString("USER_IDENTITY"))) { +// // 港股的用户 +// // 用户标识 +// map.put("USER_IDENTITY", gwjIdentity); +// // 图片路径 +// map.put("baseImgPath", gwjBaseimgpath); +// // 后台地址 +// map.put("BACKENDADDR", gwjBackendaddr); +// } PageData cpd = corpinfoService.findById(pd); //System.out.println(cpd.getString("ISUSE")); if (cpd != null) { @@ -291,12 +291,14 @@ public class LoginController extends BaseController { //查询该用户或企业的图片和后端地址 if (!Tools.isEmpty(pd.getString("CORPINFO_ID")) && !pd.getString("CORPINFO_ID").equals("1")) { PageData pathData = corpPathService.getCorpPathByCorpId(pd); - map.put("picPath",pathData.getString("PIC_PATH")); - map.put("backEndPath", pathData.getString("BACK_END_PATH")); + map.put("baseImgPath",pathData.getString("PIC_PATH")); + map.put("USER_IDENTITY",pathData.getString("USER_IDENTITY")); + map.put("BACKENDADDR", pathData.getString("BACK_END_PATH")); } else { PageData pathData = corpPathService.getCorpPathByPersonInfo(pd); - map.put("picPath", pathData.getString("PIC_PATH")); - map.put("backEndPath", pathData.getString("BACK_END_PATH")); + map.put("baseImgPath",pathData.getString("PIC_PATH")); + map.put("USER_IDENTITY",pathData.getString("USER_IDENTITY")); + map.put("BACKENDADDR", pathData.getString("BACK_END_PATH")); } } } else { diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 20e9d9dc..d8c4913b 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,13 +1,11 @@ - - datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no1.url=jdbc:mysql://192.168.0.17:3306/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no1.username=root -datasource.no1.password=root +datasource.no1.password=Mysql@zcloud88888 datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no2.url=jdbc:mysql://192.168.0.17:3306/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no2.username=root -datasource.no2.password=root +datasource.no2.password=Mysql@zcloud88888 #druid??? @@ -62,7 +60,8 @@ spring.main.banner-mode=off #qa-regulatory-gwj.api.url=http://192.168.0.79:8008 corp.default.pic-path=https://qgqy.qhdsafety.com/file/ -corp.default.back-end-path=http://192.168.151.57:8092/ +corp.default.back-end-path=http://192.168.0.31:8991/qa-prevention-gwj/ +http.file.url=https://qgqy.qhdsafety.com/file/ preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/ qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/ @@ -78,7 +77,7 @@ rocketmq.consumer.group2=edu-admin-edit rocketmq.consumer.group1=edu-admin-add #rocketmq.name-server=10.0.140.141:9876 #rocketmq.name-server=192.168.0.70:9876 -rocketmq.name-server=192.168.0.31:9876 +rocketmq.name-server=192.168.0.79:9876 rocketmq.producer.group=libmiddle rocketmq.producer.send-message-timeout=3000 rocketmq.producer.compress-message-body-threshold=4096 @@ -94,8 +93,8 @@ mq.group.info=scheduled_tasks mq.group.eightWork=scheduled_tasks_eightWork -corp.default.pic-path=https://qgqy.qhdsafety.com/file/ -corp.default.back-end-path=https://skqhdg.porthebei.com:9004/file/ +#corp.default.pic-path=https://qgqy.qhdsafety.com/file/ +#corp.default.back-end-path=https://skqhdg.porthebei.com:9004/file/ #用户标识 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index ea7feb10..25c549c5 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,9 +2,9 @@ spring.application.name=qa-prevention-gwj server.port=8091 #?? -spring.profiles.active=local +#spring.profiles.active=local #����31ʱʹ�� -#spring.profiles.active=dev +spring.profiles.active=dev #?? #spring.profiles.active=master diff --git a/src/main/resources/mybatis/datasource/system/CorpPathMapper.xml b/src/main/resources/mybatis/datasource/system/CorpPathMapper.xml index e19a4a9d..53274656 100644 --- a/src/main/resources/mybatis/datasource/system/CorpPathMapper.xml +++ b/src/main/resources/mybatis/datasource/system/CorpPathMapper.xml @@ -12,7 +12,8 @@ CORP_PATH_ID, CORPINFO_ID, PIC_PATH, - BACK_END_PATH + BACK_END_PATH, + USER_IDENTITY @@ -37,7 +38,7 @@ from where - CORPINFO_ID = #{corpId} + CORPINFO_ID = #{CORPINFO_ID}