From ece081f1f221d7e8063b655a9722d425b329dcb0 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期二, 24 十二月 2024 19:50:04 +0800
Subject: [PATCH] 维保人员资质
---
/dev/null | 0
src/main/resources/application.properties | 2
src/main/resources/cache-dev.properties | 2
src/main/java/com/product/AuthNacosConfigListener.java | 41 ++++++++++++++++++++
src/main/java/com/product/Application.java | 1
src/main/resources/application-dev.properties | 22 +++++++----
attachment/file/template/device/1700116133438u8 | 0
resources/LicenseKey.dat | 2
src/main/java/com/product/TestController.java | 39 +++++++++++++++++++
9 files changed, 98 insertions(+), 11 deletions(-)
diff --git a/attachment/file/template/device/1700116133438u8 b/attachment/file/template/device/1700116133438u8
new file mode 100644
index 0000000..db9da0c
--- /dev/null
+++ b/attachment/file/template/device/1700116133438u8
Binary files differ
diff --git a/resources/LicenseKey.dat b/resources/LicenseKey.dat
index aff0cf5..040e672 100644
--- a/resources/LicenseKey.dat
+++ b/resources/LicenseKey.dat
@@ -1 +1 @@
-8C05B9DBF6FCA491C8F3C33F0815466A92A6A1942263C8D9E373FDFE13031C6630A75985454688611439F2AB9738A44122BC8E16CA57E90CAED656D1F7A49D9CD46C943D60728A6830A893AADE88A6ABAFE4B672B385CCCFB30215AD450BD5D3E910E7A9DEE634DA14F616DACC2B69972A810FBFB6AC9478FA416B89DCB101208360C52EDA9A437B1E96B6AC661F50D104E831363373F3D8466C4BB95FE4F61135FEACEEF4D4D92E26C34030D2F298A1F03650404B96C2CB56979DE42E137A8BAE7FB8D925A1D3A524D66FCA97C5BD305E51E4290AA3733DF97FEFEEA80DE955F2C6F03F099032CDAB0F5828892610F54CED4EED45CC7CBE4CC30EE67A26A638819B7487265D2878FE5293D7408E10DBBA6048ECB02260EE0EB4276879E6E8C4D11BE99A47C806CFB35DCD2F8AC6BB7F9B6C47D63605EBE1E2BAA613110B035FBFFF27B8550BFC2B1A5B109BE6776F22FAFBF0E8F4B931CBB5380F512DE5E7103B1C7A0A6C811EADB9AFDB111FA7B969AC95A415DDD347AF96FEB7BDF169AE97
\ No newline at end of file
+F4815790B215C2D6D6EE0577C17B74EB5A7B8F449C0F19E8F52DFEFFC66722B930651A78DEC8D89F28510949D9940F44DBC9EDD261723B54C5796EC85F823DDE089B5A72C7A44A2F4BB3FD5613081ABFA1E9A425480CA6D0C2B4866494DA33A066609B6B364E9C3549AC817C3072B8B0545BD852FE4823CF02F88111B8FAF337CEF00EB43BA1D7D7A5517DE549DD2E664D35D953940039FE4AD08D14CF7C33FF411D472048EEA0FB0C305315C6214F1A7008BB6BE03339D10A5EC48FFCCC1B552B7962A054B755FC460EBB6E96CA94D5442A89CEC591D94E59A7AB6A4E6E81E0DBDCA62537CFD193B7E107A5472F64EAF45EC2FE6359645C37702F5CD91A96414D062B031DA1FB1F8334D2A417821AFA1AC38B424A4B03C322DC789241364D126125F9615C9992A0CA25472A8E82576273CF64454579692E982B35F5CDE96162CC4DAC0474676FEDEAE05BD64EBF943A0B54CCA70476155D8B3FBF4F0D79582C8F3D757A146D5E3765A6DE1CEA406C203FA4443DC842BC9392A112697CCB78BE
\ No newline at end of file
diff --git a/resources/license001.dat b/resources/license001.dat
deleted file mode 100644
index 22a5457..0000000
--- a/resources/license001.dat
+++ /dev/null
Binary files differ
diff --git a/src/main/java/com/product/Application.java b/src/main/java/com/product/Application.java
index 57e13c7..025db6a 100644
--- a/src/main/java/com/product/Application.java
+++ b/src/main/java/com/product/Application.java
@@ -9,6 +9,7 @@
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.util.ResourceUtils;
import com.product.admin.config.RegistValidate;
diff --git a/src/main/java/com/product/AuthNacosConfigListener.java b/src/main/java/com/product/AuthNacosConfigListener.java
new file mode 100644
index 0000000..11bb4da
--- /dev/null
+++ b/src/main/java/com/product/AuthNacosConfigListener.java
@@ -0,0 +1,41 @@
+package com.product;
+
+import com.alibaba.fastjson.JSONObject;
+import com.aspose.slides.p2cbca448.env;
+import com.product.common.properties.PropertiesLoader;
+import com.product.core.config.Global;
+import com.product.core.spring.context.SpringContextHolder;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Set;
+
+/**
+ * @Author cheng
+ * @Date 2024/12/19 17:22
+ * @Desc
+ */
+@Slf4j
+@Component
+public class AuthNacosConfigListener implements ApplicationListener<EnvironmentChangeEvent> {
+
+ @Resource
+ PropertiesLoader propertiesLoader;
+
+ @Override
+ public void onApplicationEvent(EnvironmentChangeEvent environmentChangeEvent) {
+ log.info("鐩戝惉鍒版潈闄愰厤缃彉鏇翠簨浠讹紝鍒锋柊鏉冮檺閰嶇疆锛岀郴缁熷彉鍖栦簨浠讹細{}", JSONObject.toJSONString(environmentChangeEvent));
+
+ Set<String> keys = environmentChangeEvent.getKeys();
+ for (String key : keys) {
+ log.info("鐩戝惉鍒版潈闄愰厤缃彉鏇翠簨浠讹紝鍒锋柊鏉冮檺閰嶇疆锛岀郴缁熷彉鍖栦簨浠讹細{}", key);
+ Object property = propertiesLoader.getProperty(key, "");
+ Global.setPropertyValue(key, property);
+ }
+ }
+}
diff --git a/src/main/java/com/product/TestController.java b/src/main/java/com/product/TestController.java
new file mode 100644
index 0000000..2038834
--- /dev/null
+++ b/src/main/java/com/product/TestController.java
@@ -0,0 +1,39 @@
+package com.product;
+
+import com.product.core.cache.util.RedisUtil;
+import com.product.core.config.Global;
+import com.product.module.sys.version.ApiVersion;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author cheng
+ * @Date 2024/12/19 16:45
+ * @Desc
+ */
+@RestController
+@RequestMapping("/api/test")
+public class TestController {
+
+
+
+
+ @GetMapping("/get/{version}")
+ @ApiVersion(1)
+ public String get() {
+ String result = Global.getSystemConfig("product-server.nacos2", "null");
+// 鑾峰彇springboot涓殑鍙橀噺
+
+
+// RedisUtil.addSet("test:123", "test");
+ RedisUtil.delSetAimValue("test:123", "test");
+
+
+// 杩斿洖json瀛楃涓� 鑷繁鎷兼帴
+ return "{\\\"result\\\":\\\"" + result + "\\\" }";
+ }
+
+}
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index 966151e..437559c 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -1,6 +1,8 @@
#======================================#
#=============\u7CFB\u7EDF\u53C2\u6570 \u76F8\u5173\u914D\u7F6E==============#
#======================================#
+#\u7CFB\u7EDF\u5B9E\u4F8Bid \u5F53\u4E3A AUTO\uFF08\u4E0D\u533A\u5206\u5927\u5C0F\u5199\uFF09 \u81EA\u52A8\u751F\u6210
+system.instance.id=AUTO
#\u5E73\u53F0\u7C7B\u578B device\u3001lift\u3001OA\u3001sei
system.platform.type=lift
#\u542F\u7528\u65E5\u5FD7\u6253\u5370
@@ -14,7 +16,7 @@
#\u662F\u5426\u542F\u7528\u63A5\u53E3\u7B7E\u540D\u8BA4\u8BC1
signature.isEnable=true
#\u5728\u542F\u7528\u63A5\u53E3\u7B7E\u540D\u8BA4\u8BC1\u65F6\uFF0C\u6392\u9664\u6307\u5B9A\u63A5\u53E3\u65E0\u9700\u7B7E\u540D\u8BA4\u8BC1
-signature.exclude.path=/api/mobile/system/table/list-meta/v1,/api/rsa/getKey/v1,/api/token/refresh/v1,/api/mobile/network/check/v1,/api/system/config/info/v1,/static/**,/api/system-user/avatar/v1/*,/api/office/save-office/v1,/download-mobile-apk/v1
+signature.exclude.path=/api/mobile/system/table/list-meta/v1,/api/rsa/getKey/v1,/api/token/refresh/v1,/api/mobile/network/check/v1,/api/system/config/info/v1,/static/**,/api/system-user/avatar/v1/*,/api/office/save-office/v1,/download-mobile-apk/v1,/api/test/**
#\u7B7E\u540D\u8BA4\u8BC1Key
signature.key=299cb5bb4c9040a29c58304c25001d72
#\u63A5\u53E3\u7B7E\u540D\u8BA4\u8BC1\u6709\u6548\u671F\uFF0C\u5355\u4F4D\u79D2,0\u8868\u793A\u4E0D\u9A8C\u8BC1
@@ -26,13 +28,13 @@
#\u63A5\u53E3token\u8FC7\u671F\uFF0C\u5237\u65B0token\u7684\u63A5\u53E3\u4F7F\u7528\u7684Token\u8FC7\u671F\u65F6\u95F4
refresh.token.expiration=12
#token\u9A8C\u8BC1\u3001\u767B\u5F55\u9A8C\u8BC1\uFF0C\u6392\u9664URL,\u9017\u53F7\u5206\u9694
-token.exclude.path=/api/mobile/system/table/list-meta/v1,/api/token/refresh/v1,/login,/login/v1,/api/personalcenter/send-updatePwdEmail/v1,/api/language/login-language/v1,/api/lable_internationalization/list_lable_internation/v1,/api/lable_internationalization/list-label-internation-web/v1,/api/personalcenter/check-token/v1,/api/rsa/getKey/v1,/api/mobile/network/check/v1,/api/system/config/info/v1,/api/fileManager/get-static-file,/static/**,/download-mobile-apk/v1
+token.exclude.path=/api/mobile/system/table/list-meta/v1,/api/token/refresh/v1,/login,/login/v1,/api/personalcenter/send-updatePwdEmail/v1,/api/language/login-language/v1,/api/lable_internationalization/list_lable_internation/v1,/api/lable_internationalization/list-label-internation-web/v1,/api/personalcenter/check-token/v1,/api/rsa/getKey/v1,/api/mobile/network/check/v1,/api/system/config/info/v1,/api/fileManager/get-static-file,/static/**,/download-mobile-apk/v1,/api/test/**
#\u662F\u5426\u542F\u7528\u6570\u636E\u64CD\u4F5C\u6743\u9650\u9A8C\u8BC1!
data.handle.valid.isEnable=false
#\u662F\u5426\u542F\u7528\u529F\u80FD\u6743\u9650\u9A8C\u8BC1
url.valid.isEnable=false
#\u4E0D\u9700\u8981\u6743\u9650\u9A8C\u8BC1\u63A5\u53E3\u5730\u5740,\u4E0D\u80FD\u914D/v1\u3001v2\u7B49
-url.valid.pass=/api/prompt/business/findPrompt,/api/dictionary/list-dictionary-byname,/logout,/api/functions/onload-button,/api/language/login-language/v1,/api/fileManager/get-file-info,/api/language/list-international-fields,/api/user/language/update-language,/api/staff-manager/upload_staff_avatar,api/rsa/getKey,/api/mobile/network/check,/api/system/config/info,/api/fileManager/get-static-file,/static/**,/download-mobile-apk
+url.valid.pass=/api/prompt/business/findPrompt,/api/dictionary/list-dictionary-byname,/logout,/api/functions/onload-button,/api/language/login-language/v1,/api/fileManager/get-file-info,/api/language/list-international-fields,/api/user/language/update-language,/api/staff-manager/upload_staff_avatar,api/rsa/getKey,/api/mobile/network/check,/api/system/config/info,/api/fileManager/get-static-file,/static/**,/download-mobile-apk,/api/test/**
#\u662F\u5426\u6253\u5370\u9519\u8BEF\u4FE1\u606F
info.print=true
error.info.print=true
@@ -75,8 +77,8 @@
data.source.type=mysql
data.source.driver=com.mysql.jdbc.Driver
#################local###############################
-data.source.url=jdbc:mysql://192.168.0.200:3308/product_db_xn?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
-#data.source.url=jdbc:mysql://192.168.0.200:3308/product_db_v3.0.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
+#data.source.url=jdbc:mysql://192.168.0.200:3308/product_db_xn?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
+data.source.url=jdbc:mysql://192.168.0.200:3308/product_db_v3.0.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
#data.source.url=jdbc:mysql://127.0.0.1:3306/product_db_v3.0.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
#data.source.url=jdbc:mysql://222.209.28.250:3005/product_db_lift?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
data.source.user=root
@@ -123,7 +125,7 @@
#========== Server settings ===========#
#======================================#
server.servlet.context-path=/lx
-server.port=9998
+server.port=9997
spring.servlet.multipart.enabled=false
spring.http.encoding.force=true
spring.http.encoding.charset=UTF-8
@@ -307,6 +309,10 @@
server.tomcat.max-threads=200
server.tomcat.max-connections=1000
server.tomcat.max-http-header-size=1024KB
+#\u79FB\u52A8\u7AEFapk\u7248\u672C\u53F7 \u4F8B\u5982 1.0.0
mobile.apk.version=3.0.0
-
-
+#nacos
+spring.cloud.nacos.config.server-addr=192.168.0.197:8848
+spring.cloud.nacos.discovery.server-addr=192.168.0.197:8848
+spring.cloud.nacos.config.enabled=false
+spring.cloud.nacos.discovery.enabled=false
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index c61ecc6..1341aa9 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,6 +1,6 @@
# dev prod
spring.profiles.active=dev
-
+spring.application.name=product-server
# *********server log start **************
server.tomcat.access-log-pattern=%h %D %m %l %u %t "%r" %s %b
server.tomcat.background-processor-delay=-1
diff --git a/src/main/resources/cache-dev.properties b/src/main/resources/cache-dev.properties
index 5bdb527..5f53f25 100644
--- a/src/main/resources/cache-dev.properties
+++ b/src/main/resources/cache-dev.properties
@@ -14,7 +14,7 @@
#\u96C6\u7FA4\u914D\u7F6E
#redis \u901A\u7528\u914D\u7F6E
spring.redis.password=
-spring.redis.database=13
+spring.redis.database=11
#-------------------------------------------------
# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
spring.redis.pool.max-active=200
--
Gitblit v1.9.2