From 19ab3a8c760fa5e7e6cfab1b2ff97c187589efae Mon Sep 17 00:00:00 2001
From: shikeying <pxzsky@163.com>
Date: 星期三, 08 五月 2024 11:57:22 +0800
Subject: [PATCH] 去掉加密文件验证
---
/dev/null | 8 ----
walker-tcp/src/main/java/com/walker/tcp/support/AbstractConnectionManager.java | 2 -
walker-infrastructure/src/main/java/com/walker/infrastructure/arguments/AbstractArgumentsManager.java | 64 +++++++++++++++----------------
walker-pay-support-payunk/src/test/java/com/walker/pay/payunk/TestPayUnkEngine.java | 4 -
walker-jdbc/src/main/java/com/walker/jdbc/JdbcInspector.java | 2 -
pom.xml | 11 -----
walker-di-support-univocity/src/main/java/com/walker/di/excel/DefaultDataListener.java | 2 -
walker-tcp/src/main/java/com/walker/tcp/support/AbstractTcpLongEngine.java | 2 -
walker-infrastructure/pom.xml | 6 ---
9 files changed, 33 insertions(+), 68 deletions(-)
diff --git a/deploy-jar-template/src/main/resources/wk_sn_lic.bin b/deploy-jar-template/src/main/resources/wk_sn_lic.bin
deleted file mode 100644
index 06d8ace..0000000
--- a/deploy-jar-template/src/main/resources/wk_sn_lic.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-A拞/3鰁篳D荿坊z灅紱 O臵广y鹑蛼紙.4KU瀃仪撅孺螒鉟$q馴_h胶^+E螏�*潚 挎�>n渦4G�-#
-�(|6蠻q澧gt0� b�
蟎�:?S滆}湠e_�-詯誆览��
\ No newline at end of file
diff --git a/deploy-jar-template/src/test/java/com/walker/TestGenerator.java b/deploy-jar-template/src/test/java/com/walker/TestGenerator.java
deleted file mode 100644
index dadf235..0000000
--- a/deploy-jar-template/src/test/java/com/walker/TestGenerator.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.walker;
-
-public class TestGenerator {
-
- public void test1(){
-
- }
-}
diff --git a/pom.xml b/pom.xml
index 245b7f9..544514e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
<spring-cloud-dependencies.version>2021.0.4</spring-cloud-dependencies.version>
<spring.cloud.alibaba.version>2021.0.4.0</spring.cloud.alibaba.version>
- <walker-tools.version>1.0.0-SNAPSHOT</walker-tools.version>
+<!-- <walker-tools.version>1.0.0-SNAPSHOT</walker-tools.version>-->
<walker-dependencies.version>2.7.18</walker-dependencies.version>
<!-- <walker-infrastructure.version>2.3.0-SNAPSHOT</walker-infrastructure.version>-->
@@ -158,15 +158,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
<!-- <scope>compile</scope>-->
- </dependency>
-
- <!-- 鎶婂畨鍏ㄦā鍧楁斁鍒板伐鍏烽」鐩伐绋嬩腑锛�2022/09-27 -->
- <dependency>
- <groupId>com.walkersoft</groupId>
- <artifactId>walker-tools</artifactId>
- <type>pom</type>
- <scope>import</scope>
- <version>${walker-tools.version}</version>
</dependency>
<!-- =================================================
diff --git a/walker-di-support-univocity/src/main/java/com/walker/di/excel/DefaultDataListener.java b/walker-di-support-univocity/src/main/java/com/walker/di/excel/DefaultDataListener.java
index d752fae..60f2c85 100644
--- a/walker-di-support-univocity/src/main/java/com/walker/di/excel/DefaultDataListener.java
+++ b/walker-di-support-univocity/src/main/java/com/walker/di/excel/DefaultDataListener.java
@@ -4,7 +4,6 @@
import com.alibaba.excel.event.AnalysisEventListener;
import com.walker.infrastructure.ApplicationRuntimeException;
import com.walker.infrastructure.utils.StringUtils;
-import com.walker.security.SystemLogMan;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,7 +36,6 @@
// throw new IllegalArgumentException("LoadListener is required!");
// }
this.loadListener = loadListener;
- SystemLogMan.getInstance().checkMan();
}
@Override
diff --git a/walker-infrastructure/pom.xml b/walker-infrastructure/pom.xml
index dede31e..65ae31a 100644
--- a/walker-infrastructure/pom.xml
+++ b/walker-infrastructure/pom.xml
@@ -121,12 +121,6 @@
<artifactId>jaxen</artifactId>
</dependency>
- <!-- 鎺堟潈璁块棶锛�2022/10/08 -->
- <dependency>
- <groupId>com.walkersoft</groupId>
- <artifactId>walker-security</artifactId>
- </dependency>
-
</dependencies>
<!--<build>
diff --git a/walker-infrastructure/src/main/java/com/walker/infrastructure/arguments/AbstractArgumentsManager.java b/walker-infrastructure/src/main/java/com/walker/infrastructure/arguments/AbstractArgumentsManager.java
index 7c6e963..580bea8 100644
--- a/walker-infrastructure/src/main/java/com/walker/infrastructure/arguments/AbstractArgumentsManager.java
+++ b/walker-infrastructure/src/main/java/com/walker/infrastructure/arguments/AbstractArgumentsManager.java
@@ -2,7 +2,6 @@
import com.walker.infrastructure.arguments.support.DefaultVariable;
import com.walker.infrastructure.utils.StringUtils;
-import com.walker.security.SystemLogMan;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -22,42 +21,41 @@
public abstract class AbstractArgumentsManager implements ArgumentsManager {
protected Logger logger = LoggerFactory.getLogger(getClass());
-
+
private Object source;
-
+
/* 鍒嗙粍闆嗗悎 */
private Map<String, Group> groupMap = new TreeMap<String, Group>();
-
+
/* 鍙橀噺闆嗗悎涓庣粍ID鏄犲皠鍏崇郴锛歬ey=groupId, value=variable ID set */
private ConcurrentHashMap<String, List<String>> variableMap = new ConcurrentHashMap<String, List<String>>(8);
-
+
private ConcurrentHashMap<String, Variable> allVars = new ConcurrentHashMap<String, Variable>(32);
-
+
private Object lock = new Object();
-
+
@Override
public void setSource(Object source){
assert (source != null);
this.source = source;
}
-
+
@Override
public void afterPropertiesSet() throws Exception{
- SystemLogMan.getInstance().checkMan();
// if(this.source == null){
// throw new ArgumentsException("parameter: source is not found!");
// }
-
+
List<Group> groupList = null;
-
+
try{
groupList = load(source);
} catch(Exception ex){
throw new ArgumentsException("涓氬姟鍔犺浇閰嶇疆鍙傛暟澶辫触:" + ex.getMessage(), ex);
}
-
+
initGroup(groupList);
-
+
if(logger.isDebugEnabled()){
logger.debug("~~~~~~~~~~~~~~~~~ 绯荤粺鍔犺浇鎵�鏈夐厤缃弬鏁�-start ~~~~~~~~~~~~~~~~~");
for(Variable v : allVars.values()){
@@ -66,7 +64,7 @@
logger.debug("~~~~~~~~~~~~~~~~~ 绯荤粺鍔犺浇鎵�鏈夐厤缃弬鏁�-end ~~~~~~~~~~~~~~~~~");
}
}
-
+
private void initGroup(List<Group> groupList){
if(groupList != null){
Collections.sort(groupList);
@@ -76,7 +74,7 @@
}
}
}
-
+
private void initVariableInGroup(Group group){
List<Variable> varList = group.getChildren();
if(varList != null && varList.size() > 0){
@@ -89,7 +87,7 @@
} else
variableMap.put(group.getId(), null);
}
-
+
/**
* 鍔犺浇鍏蜂綋鐨勫弬鏁版暟鎹紝骞惰繑鍥炲垎缁勯泦鍚堜俊鎭紝鍒嗙粍涓寘鍚簡鍙彉鍙傛暟鏁版嵁銆�</p>
* 瀛愮被瀹炵幇鍏蜂綋鍔犺浇杩囩▼銆�
@@ -97,15 +95,15 @@
* @return
*/
protected abstract List<Group> load(Object source) throws Exception;
-
+
/**
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
+ *
* 浠ヤ笅涓虹郴缁熸彁渚涚殑鏍囧噯API
- *
+ *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*/
-
+
@Override
public Variable getVariable(String id) {
assert (StringUtils.isNotEmpty(id));
@@ -127,19 +125,19 @@
public void persist(String groupId, String variableId, Object value) {
assert (StringUtils.isNotEmpty(groupId));
assert (value != null);
-
+
/* 鏇存柊瀹炰綋涓殑鏁版嵁 */
try {
saveVariable(groupId, variableId, value);
} catch (Exception e) {
throw new ArgumentsException("鏇存柊鍙彉鍙傛暟鍒颁笟鍔′腑鍑虹幇閿欒: " + e.getMessage(), e);
}
-
+
synchronized (lock) {
updateCache(groupId, variableId, value);
}
}
-
+
private void updateCache(String groupId, String variableId, Object value){
if(groupMap.get(groupId) == null)
throw new IllegalArgumentException("not found group id: " + groupId);
@@ -153,7 +151,7 @@
} else
throw new ElementNotFoundException("var id: " + variableId);
}
-
+
@Override
public void persist(List<Object[]> changedList){
if(changedList == null) return;
@@ -167,21 +165,21 @@
if(arr[2] == null)
throw new IllegalArgumentException("绗笁涓弬鏁�:value涓嶅瓨鍦ㄦ垨鑰呮槸绌哄��");
}
-
+
/* 鏇存柊瀹炰綋涓殑鏁版嵁 */
try {
saveVariables(changedList);
} catch (Exception e) {
throw new ArgumentsException("鏇存柊鍙彉鍙傛暟鍒颁笟鍔′腑鍑虹幇閿欒: " + e.getMessage(), e);
}
-
+
synchronized (lock){
for(Object[] args : changedList){
updateCache(args[0].toString(), args[1].toString(), args[2]);
}
}
}
-
+
@Override
public void insert(List<Object[]> insertList) {
if(insertList == null) return;
@@ -199,14 +197,14 @@
} catch (Exception e) {
throw new ArgumentsException("鏂板缓鍙彉鍙傛暟鍑虹幇閿欒: " + e.getMessage(), e);
}
-
+
synchronized (lock){
for(Object[] args : insertList){
insertCache((Group)args[0], (Variable)args[1]);
}
}
}
-
+
/**
* 鐢卞瓙绫绘潵瀹炵幇鍏蜂綋鐨勬洿鏂颁粙璐ㄤ腑鐨勫弬鏁帮紝濡傦細鏁版嵁搴撱�侀厤缃枃浠剁瓑銆�
* @param groupId 鍒嗙粍ID
@@ -216,7 +214,7 @@
*/
protected abstract void saveVariable(String groupId
, String variableId, Object value) throws Exception;
-
+
/**
* 瀛愮被瀹炵幇鎸佷箙鍖栨洿鏂板弬鏁颁俊鎭埌浠嬭川涓紝濡傦細鏁版嵁搴撱�侀厤缃枃浠剁瓑銆�</p>
* 鎵归噺鏇存柊鏂规硶锛岄泦鍚堜腑鏄暟缁勫璞★紝Object[]{groupId, variableId, value}</br>
@@ -225,7 +223,7 @@
* @throws Exception
*/
protected abstract void saveVariables(List<Object[]> changedList) throws Exception;
-
+
/**
* 鍔犲叆鏂扮殑鍙傛暟闆嗗悎锛岄泦鍚堜腑鏄暟缁勫璞★紝Object[]{group, variable}
* 濡傛灉宸茬粡瀛樺湪璇ュ弬鏁帮紝鍒欎笉鍐嶅垱寤恒��
@@ -251,7 +249,7 @@
varList.add(variable.getId());
}
}
-
+
@Override
public List<Group> getGroupList() {
if(groupMap.size() == 0) return null;
@@ -272,7 +270,7 @@
List<String> varIds = variableMap.get(groupId);
if(varIds == null)
return null;
-
+
List<Variable> result = new ArrayList<Variable>(8);
Variable var = null;
for(String vid : varIds){
diff --git a/walker-jdbc/src/main/java/com/walker/jdbc/JdbcInspector.java b/walker-jdbc/src/main/java/com/walker/jdbc/JdbcInspector.java
index b8733b0..0f5744d 100644
--- a/walker-jdbc/src/main/java/com/walker/jdbc/JdbcInspector.java
+++ b/walker-jdbc/src/main/java/com/walker/jdbc/JdbcInspector.java
@@ -1,7 +1,6 @@
package com.walker.jdbc;
import com.walker.db.DatabaseType;
-import com.walker.security.SystemLogMan;
/**
* 瀛樺偍绯荤粺鏁版嵁搴撶浉鍏崇殑鍏抽敭淇℃伅锛屾柟渚夸笟鍔℃煡鐪嬪苟浣跨敤銆�
@@ -19,7 +18,6 @@
private JdbcInspector(){}
public static JdbcInspector getInstance(){
- SystemLogMan.getInstance().checkMan();
if(instance == null){
instance = new JdbcInspector();
}
diff --git a/walker-pay-support-payunk/src/test/java/com/walker/pay/payunk/TestPayUnkEngine.java b/walker-pay-support-payunk/src/test/java/com/walker/pay/payunk/TestPayUnkEngine.java
index c2d3606..e808518 100644
--- a/walker-pay-support-payunk/src/test/java/com/walker/pay/payunk/TestPayUnkEngine.java
+++ b/walker-pay-support-payunk/src/test/java/com/walker/pay/payunk/TestPayUnkEngine.java
@@ -30,7 +30,7 @@
System.out.println(MoneyUtils.scaleYuan2Accuracy(1));
}
- @Test
+// @Test
public void payAliAnDf(){
RestTemplate restTemplate = this.getRestTemplate();
PayEngineProvider payEngineProvider = new PayUnkEngineProvider(restTemplate);
@@ -70,8 +70,6 @@
configuration.put(Constants.CONFIG_KEY_APPID, new DefaultVariable(VariableType.String, "APP202310209174137956073295", null).setId(Constants.CONFIG_KEY_APPID));
// 鏀粯瀹滱鐗堜唬浠樺埌鎴风紪鍙凤細3635
configuration.put(Constants.CONFIG_KEY_USER_ACCOUNT_ID, new DefaultVariable(VariableType.String, "3635", null).setId(Constants.CONFIG_KEY_USER_ACCOUNT_ID));
-// configuration.put(Constants.CONFIG_KEY_ALIPAY_IDENTITY, new DefaultVariable(VariableType.String, "2088820986081574", null).setId(Constants.CONFIG_KEY_ALIPAY_IDENTITY));
-// configuration.put(Constants.CONFIG_KEY_ALIPAY_AGREEMENT_NO, new DefaultVariable(VariableType.String, "20235824012463444332", null).setId(Constants.CONFIG_KEY_ALIPAY_AGREEMENT_NO));
configuration.put(Constants.CONFIG_KEY_ALIPAY_IDENTITY, new DefaultVariable(VariableType.String, "identity", null).setId(Constants.CONFIG_KEY_ALIPAY_IDENTITY));
configuration.put(Constants.CONFIG_KEY_ALIPAY_AGREEMENT_NO, new DefaultVariable(VariableType.String, "agreement", null).setId(Constants.CONFIG_KEY_ALIPAY_AGREEMENT_NO));
return configuration;
diff --git a/walker-tcp/src/main/java/com/walker/tcp/support/AbstractConnectionManager.java b/walker-tcp/src/main/java/com/walker/tcp/support/AbstractConnectionManager.java
index dd7d16b..3df6de1 100644
--- a/walker-tcp/src/main/java/com/walker/tcp/support/AbstractConnectionManager.java
+++ b/walker-tcp/src/main/java/com/walker/tcp/support/AbstractConnectionManager.java
@@ -2,7 +2,6 @@
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
-import com.walker.security.SystemLogMan;
import com.walker.tcp.Connection;
import com.walker.tcp.ConnectionCache;
import com.walker.tcp.ConnectionManager;
@@ -43,7 +42,6 @@
if(connectionTypes != null){
this.connectionTypeCache = connectionTypes;
}
- SystemLogMan.getInstance().checkMan();
}
public void setMultipleEngine(boolean multipleEngine) {
diff --git a/walker-tcp/src/main/java/com/walker/tcp/support/AbstractTcpLongEngine.java b/walker-tcp/src/main/java/com/walker/tcp/support/AbstractTcpLongEngine.java
index 1114ff8..d8c3333 100644
--- a/walker-tcp/src/main/java/com/walker/tcp/support/AbstractTcpLongEngine.java
+++ b/walker-tcp/src/main/java/com/walker/tcp/support/AbstractTcpLongEngine.java
@@ -1,7 +1,6 @@
package com.walker.tcp.support;
import com.walker.infrastructure.utils.StringUtils;
-import com.walker.security.SystemLogMan;
import com.walker.tcp.Connection;
import com.walker.tcp.ConnectionCallback;
import com.walker.tcp.ConnectionManager;
@@ -97,7 +96,6 @@
// throw new IllegalArgumentException(ProtocolResolver.ERR_NOFOUND);
// }
try{
- SystemLogMan.getInstance().checkMan();
this.onStart();
startTime = System.currentTimeMillis();
if(openHeartBeat){
--
Gitblit v1.9.1