From feeccd3d3d61b157de96460fd6beebdc1a54e86f Mon Sep 17 00:00:00 2001 From: wangyan Date: Wed, 10 Sep 2025 09:04:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0=E8=84=B1?= =?UTF-8?q?=E6=95=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/HeadController.java | 68 +++++++++---------- src/main/java/com/zcloud/util/AliSmsUtil.java | 2 +- src/main/resources/application-dev.properties | 46 ++++++------- src/main/resources/application.properties | 6 +- src/main/resources/config/sysSet.ini | 2 +- 5 files changed, 62 insertions(+), 62 deletions(-) diff --git a/src/main/java/com/zcloud/controller/system/HeadController.java b/src/main/java/com/zcloud/controller/system/HeadController.java index 8f590be..a329243 100644 --- a/src/main/java/com/zcloud/controller/system/HeadController.java +++ b/src/main/java/com/zcloud/controller/system/HeadController.java @@ -35,7 +35,7 @@ import com.zcloud.util.PathUtil; @Controller @RequestMapping("/head") public class HeadController extends BaseController { - + @Autowired private UsersService usersService; @Autowired @@ -46,7 +46,7 @@ public class HeadController extends BaseController { private FhsmsService fhsmsService; @Autowired private DatajurService datajurService; - + /**保存用户皮肤 * @return * @throws Exception @@ -64,10 +64,10 @@ public class HeadController extends BaseController { map.put("result", "success"); return map; } - + /**获取基本信息 * @return - * @throws Exception + * @throws Exception */ @RequestMapping(value="/getInfo", produces="application/json;charset=UTF-8") @ResponseBody @@ -85,33 +85,33 @@ public class HeadController extends BaseController { map.put("NAME", user.getNAME()); map.put("USERNAME", user.getUSERNAME()); map.put("ROLE_NAME", user.getRole().getROLE_NAME()); - + String infFilePath = PathUtil.getClasspath()+Const.SYSSET; //配置文件路径 if(null == session.getAttribute(Const.SHOWCOUNT)){ session.setAttribute(Const.SHOWCOUNT, IniFileUtil.readCfgValue(infFilePath, "SysSet1", Const.SHOWCOUNT, "10"));//初始系统带分页的列表每页显示条数 } - + String onlineIp = IniFileUtil.readCfgValue(infFilePath, "SysSet1", "onlineIp", "127.0.0.1"); //在线管理IP String onlinePort = IniFileUtil.readCfgValue(infFilePath, "SysSet1", "onlinePort", "8869"); //在线管理端口 map.put("onlineAdress", onlineIp+":"+onlinePort); //在线管理websocket地址 - + String imIp = IniFileUtil.readCfgValue(infFilePath, "SysSet1", "imIp", "127.0.0.1"); //即时聊天IP String imPort = IniFileUtil.readCfgValue(infFilePath, "SysSet1", "imPort", "8869"); //即时聊天端口 map.put("wimadress", imIp+":"+imPort); //即时聊天websocket地址 - - String sysName = IniFileUtil.readCfgValue(infFilePath, "SysSet1", Const.SYSNAME, "秦安双控运营平台"); //系统名称 + + String sysName = IniFileUtil.readCfgValue(infFilePath, "SysSet1", Const.SYSNAME, "新泰双控运营平台"); //系统名称 map.put(Const.SYSNAME, sysName); - + map.put("fhsmsCount", fhsmsService.findFhsmsCount(Jurisdiction.getUsername()).get("fhsmsCount").toString());//站内信未读总数 map.put("fhsmsSound", IniFileUtil.readCfgValue(infFilePath, "SysSet1", "fhsmsSound", "1")); //信息提示音 - + Object RNUMBERS = session.getAttribute(Const.SESSION_RNUMBERS); if(null == RNUMBERS){ session.setAttribute(Const.SESSION_RNUMBERS, getRnumbers()); //把当前用户的角色编码放入session } - + this.setAttributeToAllDEPARTMENT_ID(session, user.getUSERNAME()); //把用户的组织机构权限放到session里面 - + errInfo = "success"; }else { errInfo = "error"; @@ -119,7 +119,7 @@ public class HeadController extends BaseController { map.put("result", errInfo); return map; } - + /**获取基本信息用作加入线管理(手机端用) * @return */ @@ -137,7 +137,7 @@ public class HeadController extends BaseController { map.put("result", errInfo); return map; } - + /**判断当前用户角色编码符合过滤条件(用于新任务消息通知) * @return * @throws Exception @@ -155,7 +155,7 @@ public class HeadController extends BaseController { } return map; } - + /**根据按钮权限标识，判断是否有此按钮权限，用于前端页面是否显示按钮 * @return * @throws Exception @@ -171,13 +171,13 @@ public class HeadController extends BaseController { String keys[] = pd.getString("keys").split(","); Session session = Jurisdiction.getSession(); Collection shiroSet = (Collection)session.getAttribute(Jurisdiction.getUsername() + Const.SHIROSET); - for(String key : keys){ + for(String key : keys){ map.put(key.replace(":", "fhadmin"), shiroSet.contains(key)); } map.put("result", errInfo); return map; } - + /**通过角色ID数组获取角色列表拼接角色编码 * @return * @throws Exception @@ -197,12 +197,12 @@ public class HeadController extends BaseController { RNUMBERS.append("'fhadmin')"); return RNUMBERS.toString(); } - + /**把用户的组织机构权限放到session里面 * @param session * @param USERNAME * @return - * @throws Exception + * @throws Exception */ public void setAttributeToAllDEPARTMENT_ID(Session session, String USERNAME) throws Exception{ String DEPARTMENT_IDS = "",DEPARTMENT_ID = ""; @@ -214,7 +214,7 @@ public class HeadController extends BaseController { // session.setAttribute(Const.DEPARTMENT_IDS, DEPARTMENT_IDS); //把用户的组织机构权限集合放到session里面 // session.setAttribute(Const.DEPARTMENT_ID, DEPARTMENT_ID); //把用户的最高组织机构权限放到session里面 } - + /**去系统设置页面 * @return * @throws Exception @@ -226,7 +226,7 @@ public class HeadController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); String infFilePath = PathUtil.getClasspath()+Const.SYSSET; //配置文件路径 - + pd.put("sysName", IniFileUtil.readCfgValue(infFilePath, "SysSet1", Const.SYSNAME, "FH Admin")); //系统名称 pd.put("showCount", IniFileUtil.readCfgValue(infFilePath, "SysSet1", Const.SHOWCOUNT, "10")); //每页显示条数 pd.put("onlineIp", IniFileUtil.readCfgValue(infFilePath, "SysSet1", "onlineIp", "127.0.0.1")); //在线管理IP @@ -238,12 +238,12 @@ public class HeadController extends BaseController { pd.put("PORT", IniFileUtil.readCfgValue(infFilePath, "SysSet1", "PORT", "465")); //邮箱服务器端口 pd.put("EMAIL", IniFileUtil.readCfgValue(infFilePath, "SysSet1", "EMAIL", "emailtest@fhadmin.org")); //邮箱服务器邮箱 pd.put("PAW", IniFileUtil.readCfgValue(infFilePath, "SysSet1", "PAW", "Fh123456")); //邮箱服务器密码 - + map.put("pd", pd); map.put("result", errInfo); return map; } - + /** * 保存系统设置 */ @@ -256,7 +256,7 @@ public class HeadController extends BaseController { String infFilePath = PathUtil.getClasspath()+Const.SYSSET; //配置文件路径 PageData pd = new PageData(); pd = this.getPageData(); - + String sysName = pd.getString("sysName"); //系统名称 String showCount = pd.getString("showCount"); //每页显示条数 String onlineIp = pd.getString("onlineIp"); //在线管理IP @@ -268,23 +268,23 @@ public class HeadController extends BaseController { String PORT = pd.getString("PORT"); //邮箱服务器端口 String EMAIL = pd.getString("EMAIL"); //邮箱服务器邮箱 String PAW = pd.getString("PAW"); //邮箱服务器密码 - + /*每页显示条数放入session,其它不需要放,因为这个参数调用频繁*/ session.setAttribute(Const.SHOWCOUNT, showCount); - + /*写入配置文件*/ - IniFileUtil.writeCfgValue(infFilePath, "SysSet1", Const.SYSNAME, sysName); - IniFileUtil.writeCfgValue(infFilePath, "SysSet1", Const.SHOWCOUNT, showCount); + IniFileUtil.writeCfgValue(infFilePath, "SysSet1", Const.SYSNAME, sysName); + IniFileUtil.writeCfgValue(infFilePath, "SysSet1", Const.SHOWCOUNT, showCount); IniFileUtil.writeCfgValue(infFilePath, "SysSet1", "onlineIp", onlineIp); IniFileUtil.writeCfgValue(infFilePath, "SysSet1", "onlinePort", onlinePort); IniFileUtil.writeCfgValue(infFilePath, "SysSet1", "imIp", imIp); IniFileUtil.writeCfgValue(infFilePath, "SysSet1", "imPort", imPort); IniFileUtil.writeCfgValue(infFilePath, "SysSet1", "fhsmsSound", fhsmsSound); - IniFileUtil.writeCfgValue(infFilePath, "SysSet1", "SMTP", SMTP); - IniFileUtil.writeCfgValue(infFilePath, "SysSet1", "PORT", PORT); - IniFileUtil.writeCfgValue(infFilePath, "SysSet1", "EMAIL", EMAIL); - IniFileUtil.writeCfgValue(infFilePath, "SysSet1", "PAW", PAW); - + IniFileUtil.writeCfgValue(infFilePath, "SysSet1", "SMTP", SMTP); + IniFileUtil.writeCfgValue(infFilePath, "SysSet1", "PORT", PORT); + IniFileUtil.writeCfgValue(infFilePath, "SysSet1", "EMAIL", EMAIL); + IniFileUtil.writeCfgValue(infFilePath, "SysSet1", "PAW", PAW); + map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/util/AliSmsUtil.java b/src/main/java/com/zcloud/util/AliSmsUtil.java index 5f659e9..7a83d49 100644 --- a/src/main/java/com/zcloud/util/AliSmsUtil.java +++ b/src/main/java/com/zcloud/util/AliSmsUtil.java @@ -50,7 +50,7 @@ public class AliSmsUtil { //必填:待发送手机号18630110835 request.setPhoneNumbers(sendmap.get("phone").toString()); //必填:短信签名-可在短信控制台中找到 - request.setSignName("秦安安全"); + request.setSignName("新泰安全"); //必填:短信模板-可在短信控制台中找到 request.setTemplateCode(sendmap.get("templateCode").toString()); //可选:模板中的变量替换JSON串,如模板内容为"亲爱的${name},您的验证码为${code}"时,此处的值为 diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 56a7edc..ca2ba60 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,30 +1,30 @@ -#数据源1(默认没用，俩地址写一样即可) +#\u6570\u636E\u6E901(\u9ED8\u8BA4\u6CA1\u7528\uFF0C\u4FE9\u5730\u5740\u5199\u4E00\u6837\u5373\u53EF) datasource.no1.driver-class-name:com.mysql.cj.jdbc.Driver -datasource.no1.url=jdbc:mysql://192.168.20.230:33080/integrated_yjb?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no1.url=jdbc:mysql://192.168.20.130:33082/integrated_yjb?allowPublicKeyRetrieval=true&serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no1.username=root -datasource.no1.password=Mysql@zcloud33080 -#数据源2 +datasource.no1.password=Mysql@zcloud33082 +#\u6570\u636E\u6E902 datasource.no2.driver-class-name:com.mysql.cj.jdbc.Driver -datasource.no2.url=jdbc:mysql://192.168.20.230:33080/integrated_yjb?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no2.url=jdbc:mysql://192.168.20.130:33082/integrated_yjb?allowPublicKeyRetrieval=true&serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no2.username=root -datasource.no2.password=Mysql@zcloud33080 -#数据源3(admin资源库) +datasource.no2.password=Mysql@zcloud33082 +#\u6570\u636E\u6E903(admin\u8D44\u6E90\u5E93) datasource.no3.driver-class-name:com.mysql.cj.jdbc.Driver -datasource.no3.url=jdbc:mysql://192.168.20.230:33080/integrated_yjb_admin?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no3.url=jdbc:mysql://192.168.20.130:33082/integrated_yjb_admin?allowPublicKeyRetrieval=true&serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no3.username=root -datasource.no3.password=Mysql@zcloud33080 -#druid连接池 +datasource.no3.password=Mysql@zcloud33082 +#druid\u8FDE\u63A5\u6C60 spring.datasource.type:com.alibaba.druid.pool.DruidDataSource -#最大活跃数 +#\u6700\u5927\u6D3B\u8DC3\u6570 spring.datasource.maxActive:20 -#初始化数量 +#\u521D\u59CB\u5316\u6570\u91CF spring.datasource.initialSize:1 -#最大连接等待超时时间 +#\u6700\u5927\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u65F6\u95F4 spring.datasource.maxWait:60000 -#打开PSCache，并且指定每个连接PSCache的大小 +#\u6253\u5F00PSCache\uFF0C\u5E76\u4E14\u6307\u5B9A\u6BCF\u4E2A\u8FDE\u63A5PSCache\u7684\u5927\u5C0F spring.datasource.poolPreparedStatements:true spring.datasource.maxPoolPreparedStatementPerConnectionSize:20 -#通过connectionProperties属性来打开mergeSql功能；慢SQL记录 +#\u901A\u8FC7connectionProperties\u5C5E\u6027\u6765\u6253\u5F00mergeSql\u529F\u80FD\uFF1B\u6162SQL\u8BB0\u5F55 #connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 spring.datasource.minIdle:1 spring.datasource.timeBetweenEvictionRunsMillis:60000 @@ -33,24 +33,24 @@ spring.datasource.validationQuery:select 1 from dual spring.datasource.testWhileIdle:true spring.datasource.testOnBorrow:false spring.datasource.testOnReturn:false -#配置监控统计拦截的filters，去掉后监控界面sql将无法统计,'wall'用于防火墙 +#\u914D\u7F6E\u76D1\u63A7\u7EDF\u8BA1\u62E6\u622A\u7684filters\uFF0C\u53BB\u6389\u540E\u76D1\u63A7\u754C\u9762sql\u5C06\u65E0\u6CD5\u7EDF\u8BA1,'wall'\u7528\u4E8E\u9632\u706B\u5899 filters:stat, wall, log4j -#缓存配置文件位置 +#\u7F13\u5B58\u914D\u7F6E\u6587\u4EF6\u4F4D\u7F6E spring.cache.ehcache.cofnig=ehcache.xml -#配置这句话,控制台输出sql语句 +#\u914D\u7F6E\u8FD9\u53E5\u8BDD,\u63A7\u5236\u53F0\u8F93\u51FAsql\u8BED\u53E5 logging.level.com.zcloud.mapper=debug -#上传文件大小限制 +#\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F\u9650\u5236 spring.servlet.multipart.max-file-size=500MB spring.servlet.multipart.max-request-size=500MB -#activiti模型检测 +#activiti\u6A21\u578B\u68C0\u6D4B spring.activiti.check-process-definitions=false -#字符 +#\u5B57\u7B26 spring.http.encoding.charset=UTF-8 spring.http.encoding.force=true spring.http.encoding.enabled=true -# 关闭springboot启动时的banner +# \u5173\u95EDspringboot\u542F\u52A8\u65F6\u7684banner spring.main.banner-mode=off -# 测试 +# \u6D4B\u8BD5 customer.id=LAZ-20221129-3 customer.SECRET_KEY=a256e8575c3f4240b08f6350f13ce8e2 customer.url=https://api.qhdsafety.com/sync/ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 4382ac9..460633a 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,7 +1,7 @@ spring.application.name=integrated_yjb_admin server.port=8098 #spring.profiles.active=local -#spring.profiles.active=dev -spring.profiles.active=master +spring.profiles.active=dev +#spring.profiles.active=master management.endpoints.web.exposure.include=prometheus -management.metrics.tags.application=\u798F\u5E86\u9F99\u94A2\u5B89\u5168\u7BA1\u7406\u7CFB\u7EDF\u8FD0\u8425\u7AEF +management.metrics.tags.application=\u5C71\u897F\u65B0\u6CF0\u94A2\u94C1\u6709\u9650\u516C\u53F8\u5B89\u5168\u7BA1\u7406\u7CFB\u7EDF\u8FD0\u8425\u7AEF diff --git a/src/main/resources/config/sysSet.ini b/src/main/resources/config/sysSet.ini index 8e7f13e..9b92ebc 100644 --- a/src/main/resources/config/sysSet.ini +++ b/src/main/resources/config/sysSet.ini @@ -1,7 +1,7 @@ ;系统设置 [SysSet1] ;系统名称 -sysName=秦安双控运营平台 +sysName=新泰双控运营平台 ;带分页的列表页面,每页条数 showCount=10 ;在线管理IP