9 Commits

Author SHA1 Message Date
547de1727d 修改log4j2 日志输出的时间格式。 2025-05-26 11:55:29 +08:00
9bb3c0dd85 保存进度! 2025-05-15 19:00:58 +08:00
01d76a9f21 添加文件头模板文件。 2025-05-15 09:31:31 +08:00
ef8f8db904 保存进度! 2025-04-19 20:42:24 +08:00
771f4108c2 保存进度! 2025-04-18 11:58:33 +08:00
217503bfc3 Merge branch 'feature-惠厦保接口' of http://222.76.244.118:3000/CPICXIM/cpicxim-huixiabao into feature-惠厦保接口 2025-04-18 11:58:03 +08:00
3b3bf34bb4 1 2025-04-18 01:37:59 +08:00
48e816f3ae 保存进度 2025-04-11 10:42:48 +08:00
cd183f6676 保存进度 2025-03-17 07:33:36 +08:00
16 changed files with 251 additions and 59 deletions

View File

@@ -1,3 +1,10 @@
# cpicxim-huixiabao
惠厦保相关项目
惠厦保相关项目
莲富wifi管理员账号admin密码Cpic#1234。wifi ssid HXB密码 CpicXimHXB#2025
GigabitEthernet0/0/11 柜台右一
GigabitEthernet0/0/9 柜台右二

View File

@@ -0,0 +1,87 @@
/*
* @Author: Kane
* @Date: 2025-03-16 00:35:09
* @LastEditors: Kane
* @FilePath: /cpicxim-huixiabao/.vscode/fileheader.template.js
* @Description:
*
* Copyright (c) ${2023} by Kane, All Rights Reserved.
*/
/**
* This file is generated by VSCode extension: Fileheader Pro
*/
/**
* These comments can help you write your own template with type hint
* @typedef {Object} FileheaderVariable Fileheader variables
* @property {string} birthtime file birth time. will get it from VCS or fallback to filesystem when it is not available
* @property {string} mtime file modification time. will get it from VCS or fallback to filesystem when it is not available
* @property {string} authorName if the file is tracked by VCS, it will get the author name from VCS. else it will get it from current user name
* @property {string} authorEmail if the file is tracked by VCS, it will get the author email from VCS. else it will get it from current user email
* @property {string} userName else it will get it from current user name
* @property {string} userEmail user email is from VSCode config, and fallback to VCS config
* @property {string} companyName
* @property {string} projectName name of current project
* @property {string} filePath the file path, relative to project root with POSIX path separator
* @property {string} dirPath the directory path, relative to project root with POSIX path separator
* @property {string} fileName filename with extension
*/
/**
* @typedef {string | number | null | undefined | Template | boolean} TemplateInterpolation NOTE: boolean or falsy value will render empty string
*
* @typedef {{ strings: TemplateStringsArray; interpolations: TemplateInterpolation[]; }} Template
* @typedef {(strings: TemplateStringsArray, ...values: any[]) => string} ITemplateFunction
*
*/
/**
* Please confirm your provider extends from globalThis.FileheaderLanguageProvider
*/
class CustomLanguageProvider extends globalThis.FileheaderLanguageProvider {
/**
* @type {string[]}
*/
languages = [
"java",
"javascript",
"typescript",
"javascriptreact",
"typescriptreact",
];
/**
* @type {string=} the language block comment start string.
* this is for future feature: support detect old custom template when custom template changes
*/
blockCommentStart = "/**";
/**
* @type {string=}
*/
blockCommentEnd = "*/";
/**
* get your template when document language matched
* @param {ITemplateFunction} tpl template function, it is a tagged function, support nested interpolation
* @param {FileheaderVariable} variables template variables
* @returns {Template}
*/
getTemplate(tpl, variables) {
// prettier-ignore
return tpl
`/**
* @Author: ${variables.authorName} <${variables.authorEmail}>
* @Date: ${variables.birthtime}
* @LastEditors: ${variables.userName}
* @LastModified: ${variables.mtime}
* @FilePath: ${variables.filePath}
* @Description:
*
* Copyright (c) ${2025} by Kane All rights reserved
*/`;
}
}
// export your provider classes
module.exports = [CustomLanguageProvider];

View File

@@ -6,7 +6,7 @@
<groupId>com.cpic.xim</groupId>
<artifactId>cpicxim-XMNHSA-repeater</artifactId>
<version>v20250314</version>
<version>v20250526</version>
<name>cpicxim-XMNHSA-repeater</name>
<!-- FIXME change it to the project's website -->

View File

@@ -1,15 +1,12 @@
/*
* @Author: Kane
/**
* @Author: Kane Wang <wangkane@qq.com>
* @Date: 2025-03-11 15:08:37
* @LastEditors: Kane Wang
* @LastModified: 2025-04-18 00:52:16
* @FilePath: src/main/java/com/cpic/xim/huixiabao/data/config/HuixiabaoConfig.java
* @Description:
*
* @Date: 2025-03-11 09:30:38
*
* @LastEditors: Kane
*
* @FilePath: /cpicxim-XMNHSA-repeater/src/main/java/com/cpic/xim/huixiabao/data/config/HuixiabaoConfig.java
*
* @Description: 存放惠厦保相关的配置文件以后要改成json文件存放。
*
* Copyright (c) ${2023} by Kane, All Rights Reserved.
* Copyright (c) 2025 by Kane All rights reserved
*/
package com.cpic.xim.huixiabao.data.config;
@@ -60,6 +57,7 @@ public class HuixiabaoConfig
private static final int SLEEP_SECONDS = 10;
private static final String url = "http://172.18.1.150:9040/h3c/new/api/gafe/rest";
// private static final String url = "http://172.16.39.44:9040/h3c/new/api/gafe/rest";
private static final String appid = "hxb-tb";
private static final String appSecret = "60F468FB46170DD4CF6CBECE215DBFC0";
private static final String funId = "XY00.00.00.03";

View File

@@ -1,13 +1,13 @@
<Configuration status="WARN" monitorInterval="300">
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} ### %msg%n" />
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{36} ### %msg%n" />
<ThresholdFilter level="trace" onMatch="ACCEPT" onMismatch="DENY" />
</Console>
<RollingFile name="rolling_file_win"
filePattern="./logs/huixiabao/$${date:yyyy-MM}/huixiabao-%d{MM-dd-yyyy}-%i.log.gz">
<PatternLayout>
<Pattern>[%t][%level][%d{HH:mm:ss.SSS}][%logger.%M{36}#%L] %msg%n</Pattern>
<Pattern>[%t][%level][%d{yyyy-MM-dd HH:mm:ss.SSS}][%logger.%M{36}#%L] %msg%n</Pattern>
</PatternLayout>
<Policies>
<TimeBasedTriggeringPolicy interval="1" />
@@ -18,7 +18,7 @@
<RollingFile name="rolling_file_linux"
filePattern="/logs/huixiabao/$${date:yyyy-MM}/app-%d{MM-dd-yyyy}-%i.log.gz">
<PatternLayout>
<Pattern>[%t][%level][%d{HH:mm:ss.SSS}][%logger.%M{36}#%L] %msg%n</Pattern>
<Pattern>[%t][%level][%d{yyyy-MM-dd HH:mm:ss.SSS}][%logger.%M{36}#%L] %msg%n</Pattern>
</PatternLayout>
<Policies>
<TimeBasedTriggeringPolicy interval="1" />

3
code/cpicxim-huixiabao/.idea/.gitignore generated vendored Normal file
View File

@@ -0,0 +1,3 @@
# 默认忽略的文件
/shelf/
/workspace.xml

View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="cpicxim-huixiabao" />
</profile>
</annotationProcessing>
</component>
</project>

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
</component>
</project>

View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://maven.aliyun.com/repository/public" />
</remote-repository>
</component>
</project>

12
code/cpicxim-huixiabao/.idea/misc.xml generated Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/pom.xml" />
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" project-jdk-name="22" project-jdk-type="JavaSDK" />
</project>

6
code/cpicxim-huixiabao/.idea/vcs.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
</component>
</project>

View File

@@ -1,12 +1,3 @@
/*
* @Author: Kane
* @Date: 2025-03-16 00:35:09
* @LastEditors: Kane
* @FilePath: /cpicxim-huixiabao/.vscode/fileheader.template.js
* @Description:
*
* Copyright (c) ${2023} by Kane, All Rights Reserved.
*/
/**
* This file is generated by VSCode extension: Fileheader Pro
*/
@@ -71,14 +62,14 @@ class CustomLanguageProvider extends globalThis.FileheaderLanguageProvider {
// prettier-ignore
return tpl
`/**
* @Author: ${variables.authorName} <${variables.authorEmail}>
* @Date: ${variables.birthtime}
* @LastEditors: ${variables.userName}
* @LastModified: ${variables.mtime}
* @FilePath: ${variables.filePath}
* @Author: ${variables.authorName} <${variables.authorEmail}>
* @Date: ${variables.birthtime}
* @LastEditors: ${variables.userName}
* @LastModified: ${variables.mtime}
* @FilePath: ${variables.filePath}
* @Description:
*
* Copyright (c) ${2025} by Kane All rights reserved
* Copyright (c) ${2025} by Kane All rights reserved
*/`;
}
}

View File

@@ -12,34 +12,81 @@ package com.cpic.xim.data.config;
public class AppConfig
{
public static String getDrivername()
public static String getDrivernamemysql()
{
return driverName;
return driverNameMySQL;
}
public static String getUrlproduct()
public static String getUrlproductmysql()
{
return urlProduct;
return urlProductMySQL;
}
public static String getUrltest()
public static String getUrltestmysql()
{
return urlTest;
return urlTestMySQL;
}
public static String getUsername()
public static String getUsernamemysql()
{
return userName;
return userNameMySQL;
}
public static String getPassword()
public static String getPasswordmysql()
{
return password;
return passwordMySQL;
}
private final static String driverName = "com.mysql.cj.jdbc.Driver";
private final static String urlProduct = "jdbc:mysql://10.39.0.85:3306/huixiabao?useUnicode=true&characterEncoding=utf8&useSSL=true";
private final static String urlTest = "jdbc:mysql://10.39.0.84:3306/huixiabao?useUnicode=true&characterEncoding=utf8&useSSL=true";
private final static String userName = "huixiabao";
private final static String password = "Kane@1981";
public static String getDrivernamegaussdb()
{
return driverNameGaussDB;
}
public static String getUrlgaussdbproduct()
{
return urlGaussDBProduct;
}
public static String getUsernamegaussdbproduct()
{
return userNameGaussDBProduct;
}
public static String getPasswordgaussdbproduct()
{
return passwordGaussDBProduct;
}
public static String getUrlgaussdbtest()
{
return urlGaussDBTest;
}
public static String getUsernamegaussdbtest()
{
return userNameGaussDBTest;
}
public static String getPasswordgaussdbtest()
{
return passwordGaussDBTest;
}
private final static String driverNameMySQL = "com.mysql.cj.jdbc.Driver";
private final static String urlProductMySQL = "jdbc:mysql://10.39.0.85:3306/huixiabao?useUnicode=true&characterEncoding=utf8&useSSL=true";
private final static String urlTestMySQL = "jdbc:mysql://10.39.0.84:3306/huixiabao?useUnicode=true&characterEncoding=utf8&useSSL=true";
private final static String userNameMySQL = "huixiabao";
private final static String passwordMySQL = "Kane@1981";
// 高斯数据库
private final static String driverNameGaussDB = "org.postgresql.Driver";
private final static String urlGaussDBProduct = "jdbc:postgresql://30.191.0.36:25308/qing";
private final static String userNameGaussDBProduct = "xim_ywglxt_app";
private final static String passwordGaussDBProduct = "qYldSdbfQ!o5M4M";
private final static String urlGaussDBTest = "jdbc:postgresql://10.182.2.208:25308/qing";
private final static String userNameGaussDBTest = "cx_xiamen";
private final static String passwordGaussDBTest = "aThK80#!";
}

View File

@@ -46,9 +46,9 @@ public class HuixiabaoDbUtils
Class.forName( "com.mysql.cj.jdbc.Driver" );
connection = DriverManager.getConnection( AppConfig.getUrltest(),
AppConfig.getUsername(),
AppConfig.getPassword() );
connection = DriverManager.getConnection( AppConfig.getUrltestmysql(),
AppConfig.getUsernamemysql(),
AppConfig.getPasswordmysql() );
statementDelete = connection.prepareStatement( sqlDelete.trim() );
statementInsert = connection.prepareStatement( sqlInsert.trim() );

View File

@@ -1,20 +1,19 @@
/**
* @Author: Kane
* @Date: 2025-03-15 21:01:56
* @LastEditors: Kane
* @FilePath: /cpicxim-huixiabao/src/main/java/com/cpic/xim/huixiabao/web/controllers/MediCover/MediCoverRequestBody.java
* @Description:
* @
* @Copyright (c) ${2023} by Kane, All Rights Reserved.
* @Author: Kane Wang <wangkane@qq.com>
* @Date: 2025-03-15 18:40:54
* @LastEditors: Kane Wang
* @LastModified: 2025-03-17 07:21:58
* @FilePath: src/main/java/com/cpic/xim/huixiabao/web/controllers/MediCover/MediCoverRequestBody.java
* @Description:
*
* Copyright (c) 2025 by Kane All rights reserved
*/
package com.cpic.xim.huixiabao.web.controllers.MediCover;
import com.fasterxml.jackson.annotation.JsonProperty;
public class MediCoverRequestBody
{
@JsonProperty( "transId" )
private String transId;
@@ -45,7 +44,9 @@ public class MediCoverRequestBody
this.timestamp = timestamp;
}
public MediCoverRequestBody() {}
public MediCoverRequestBody()
{
}
public String getTransId()
{

Binary file not shown.