From 8924870a053f0b882ada86421c062cbdb9cff093 Mon Sep 17 00:00:00 2001
From: shikeying <shikeying@163.com>
Date: 星期三, 08 五月 2024 13:49:06 +0800
Subject: [PATCH] 去掉加密配置文件
---
iplatform-base-tcp-client/src/test/java/com/iplatform/tcp/WebsocketDemo.java | 29 +-
iplatform-base/src/main/java/com/iplatform/base/support/DatabaseArgumentsManager.java | 2
deploy-jar-template/src/main/resources/application-ai.yml | 477 +++++++++++++++++++++++++++++++++++++++++++
iplatform-support-mybatis/src/main/java/com/iplatform/mybatis/controller/GenController.java | 11
deploy-jar-template/src/main/java/com/iplatform/IplatformApplication.java | 7
deploy-jar-template/src/test/java/com/iplatform/milvus/TestMilvus.java | 9
deploy-jar-template/src/main/resources/application.yml | 3
iplatform-base-security/src/main/java/com/iplatform/security/DefaultResourceLoaderProvider.java | 2
iplatform-base/pom.xml | 8
iplatform-base/src/main/java/com/iplatform/base/LocalDatabaseMetaEngine.java | 2
pom.xml | 12
iplatform-base/src/main/java/com/iplatform/base/support/RedisArgumentsManager.java | 3
deploy-jar-template/src/main/java/com/iplatform/api/MilvusChatApi.java | 20 +
/dev/null | 2
iplatform-base-security/src/main/java/com/iplatform/security/DefaultSecuritySpi.java | 4
iplatform-base-security/src/main/java/com/iplatform/security/config/WebSecurityConfig.java | 2
deploy-jar-template/pom.xml | 16
iplatform-scheduler/src/main/java/com/iplatform/scheduler/PlatformSchedulerManager.java | 3
iplatform-support-mybatis/pom.xml | 7
deploy-jar-template/src/main/java/com/iplatform/milvus/MilvusEngine.java | 9
20 files changed, 557 insertions(+), 71 deletions(-)
diff --git a/deploy-jar-template/pom.xml b/deploy-jar-template/pom.xml
index 75ada2a..866a5fd 100644
--- a/deploy-jar-template/pom.xml
+++ b/deploy-jar-template/pom.xml
@@ -90,10 +90,10 @@
</dependency>
<!-- tcp閫氫俊妯″潡寮曞叆锛屽彲閰嶇疆鏄惁寮�鍚細鍖呮嫭鑱婂ぉ鍔熻兘鍩虹绛夈��2023-04-17 -->
-<!-- <dependency>-->
-<!-- <groupId>com.iplatform</groupId>-->
-<!-- <artifactId>iplatform-base-tcp</artifactId>-->
-<!-- </dependency>-->
+ <dependency>
+ <groupId>com.iplatform</groupId>
+ <artifactId>iplatform-base-tcp</artifactId>
+ </dependency>
<!-- 鍚敤Rocket闃熷垪娑堟伅妯″潡锛岃亰澶╅泦缇や娇鐢�,2023-09-26 -->
<dependency>
<groupId>com.walkersoft</groupId>
@@ -124,10 +124,10 @@
</dependency>
<!-- 鐢变笟鍔℃樉寮忓紩鍏ユ敮浠樻彃浠�'鐣呰仈鍥涙柟鏀粯妯″潡'锛屼笉寮曞叆涓嶄細鍔犺浇璇ユā鍧椼��2023-10-30 -->
- <dependency>
- <groupId>com.walkersoft</groupId>
- <artifactId>walker-pay-support-payunk</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>com.walkersoft</groupId>-->
+<!-- <artifactId>walker-pay-support-payunk</artifactId>-->
+<!-- </dependency>-->
<!-- 浣跨敤杈炬ⅵ鏁版嵁搴擄紝濡傛灉浣跨敤鍏朵粬鏁版嵁搴撳垯鍘绘帀璇ラ厤缃��2023-03-03 -->
<!-- <dependency>-->
diff --git a/deploy-jar-template/src/main/java/com/iplatform/IplatformApplication.java b/deploy-jar-template/src/main/java/com/iplatform/IplatformApplication.java
index 9159e94..b0cfc9f 100644
--- a/deploy-jar-template/src/main/java/com/iplatform/IplatformApplication.java
+++ b/deploy-jar-template/src/main/java/com/iplatform/IplatformApplication.java
@@ -1,13 +1,14 @@
package com.iplatform;
-import org.mybatis.spring.annotation.MapperScan;
+//import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication(scanBasePackages = {"com.walker","com.iplatform"
// ,"org.jeecg.modules.jmreport"
- , "com.ishop"})
-@MapperScan("com.iplatform.**.mapper")
+// , "com.ishop"
+})
+//@MapperScan("com.iplatform.**.mapper")
public class IplatformApplication {
public static void main(String[] args) throws Exception{
diff --git a/deploy-jar-template/src/main/java/com/iplatform/api/MilvusChatApi.java b/deploy-jar-template/src/main/java/com/iplatform/api/MilvusChatApi.java
index ae37222..47c0401 100644
--- a/deploy-jar-template/src/main/java/com/iplatform/api/MilvusChatApi.java
+++ b/deploy-jar-template/src/main/java/com/iplatform/api/MilvusChatApi.java
@@ -7,7 +7,6 @@
import com.iplatform.milvus.ScoreText;
import com.iplatform.milvus.SearchResult;
import com.iplatform.milvus.service.EventServiceImpl;
-import com.walker.infrastructure.utils.FileUtils;
import com.walker.infrastructure.utils.JsonUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.support.milvus.OutData;
@@ -26,21 +25,26 @@
import java.util.Map;
import java.util.concurrent.TimeUnit;
-@RestController
-@RequestMapping("/test/milvus")
+//@RestController
+//@RequestMapping("/test/milvus")
public class MilvusChatApi extends SystemController {
private EventServiceImpl eventService;
private RestTemplate restTemplate;
private MilvusEngine milvusEngine;
- private Long existId = 4048L;
+ private Long existId = null;
private boolean isBreak = false;
- private static final String URL_EMBEDDING = "http://120.26.128.84:7003/ai/text/embedding";
- private static final String URL_SEARCH_SIMILAR = "http://120.26.128.84:7003/ai/text/search_similar";
- private static final String URL_MILVUS = "120.26.128.84";
+ private static final String URL_EMBEDDING = "http://10.8.4.99:7003/ai/text/embedding";
+ private static final String URL_SEARCH_SIMILAR = "http://10.8.4.99:7003/ai/text/search_similar";
+ private static final String URL_MILVUS = "10.8.4.99";
+// private static final String URL_EMBEDDING = "http://120.26.128.84:7003/ai/text/embedding";
+// private static final String URL_SEARCH_SIMILAR = "http://120.26.128.84:7003/ai/text/search_similar";
+// private static final String URL_MILVUS = "120.26.128.84";
private static final double BEST_MATCH_SCORE = 0.75;
+// private static final int VECTOR_DIMENSION = 768;
+ private static final int VECTOR_DIMENSION = 512;
@Autowired
public MilvusChatApi(EventServiceImpl eventService, RestTemplate restTemplate){
@@ -199,7 +203,7 @@
}
private List<Float> transfer2FloatList(List<?> list){
- List<Float> vector = new ArrayList<>(768);
+ List<Float> vector = new ArrayList<>(VECTOR_DIMENSION);
for(int i=0; i<list.size(); i++){
vector.add(Float.parseFloat(list.get(i).toString()));
}
diff --git a/deploy-jar-template/src/main/java/com/iplatform/milvus/MilvusEngine.java b/deploy-jar-template/src/main/java/com/iplatform/milvus/MilvusEngine.java
index 30605c6..5ae379c 100644
--- a/deploy-jar-template/src/main/java/com/iplatform/milvus/MilvusEngine.java
+++ b/deploy-jar-template/src/main/java/com/iplatform/milvus/MilvusEngine.java
@@ -25,6 +25,9 @@
public static final String TABLE_CHAT_SIMILAR = "chat_similar";
+ // private static final int VECTOR_DIMENSION = 768;
+ private static final int VECTOR_DIMENSION = 512;
+
public MilvusEngine(String ip, int port){
DefaultOperateService service = new DefaultOperateService();
service.connect(ip, port);
@@ -51,7 +54,8 @@
chatSimilarTable.setCollectionName(TABLE_CHAT_SIMILAR);
chatSimilarTable.setDescription("鑱婂ぉ鎻愬彇宸ュ崟鎽樿鍘嗗彶鏁版嵁");
chatSimilarTable.setShardsNum(1);
- chatSimilarTable.setDimension(768); // 杩欎釜鏄牴鎹娇鐢ㄥ悜閲忔ā鍨嬬淮搴﹀畾鐨�
+// chatSimilarTable.setDimension(768); // 杩欎釜鏄牴鎹娇鐢ㄥ悜閲忔ā鍨嬬淮搴﹀畾鐨�
+ chatSimilarTable.setDimension(VECTOR_DIMENSION); // 杩欎釜鏄牴鎹娇鐢ㄥ悜閲忔ā鍨嬬淮搴﹀畾鐨�
// 璁剧疆瀛楁
FieldType id = FieldType.newBuilder()
@@ -63,7 +67,7 @@
FieldType answer = FieldType.newBuilder()
.withName("answer").withPrimaryKey(false).withMaxLength(255).withDataType(DataType.VarChar).build();
FieldType embedding = FieldType.newBuilder()
- .withName("embedding").withPrimaryKey(false).withDataType(DataType.FloatVector).withDimension(768).build();
+ .withName("embedding").withPrimaryKey(false).withDataType(DataType.FloatVector).withDimension(VECTOR_DIMENSION).build();
List<FieldType> fieldTypeList = new ArrayList<>(8);
fieldTypeList.add(id);
@@ -84,6 +88,7 @@
public void dropChatSimilarTable(){
this.operateService.dropTable("chat_similar");
+ this.operateService.dropIndex("chat_similar", "chat_similar_index");
}
public void insertTestData(){
diff --git a/deploy-jar-template/src/main/resources/application-ai.yml b/deploy-jar-template/src/main/resources/application-ai.yml
new file mode 100644
index 0000000..447e7b8
--- /dev/null
+++ b/deploy-jar-template/src/main/resources/application-ai.yml
@@ -0,0 +1,477 @@
+spring:
+ application:
+ name: deploy
+ datasource:
+ # 鏄惁鏄剧ずdao涓墦鍗扮殑SQL璇彞
+ show-sql: false
+
+## driver-class-name: sunje.goldilocks.jdbc.GoldilocksDriver
+ # 娉ㄦ剰锛歁ySQL鏈嶅姟绔紝闇�瑕佽皟鏁翠袱涓弬鏁帮紝鍚﹀垯鏈嶅姟绔細涓诲姩鏂紑杩炴帴
+ # wait_timeout: 瓒呰繃鏀规椂闂�(绉�)鏈嶅姟绔富鍔ㄦ柇寮�
+ # interactive_timeout: 瀹㈡埛绔伐鍏蜂氦浜掕秴杩囪繖涓椂闂�(绉�)浼氱鍙ｏ紝琛ㄧ幇涓簄avicat
+
+# username: root
+# password: Bjjmy_2020
+# url: jdbc:mysql://116.198.40.76:3306/iplatform_base?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+ username: root
+ password: root
+ url: jdbc:mysql://127.0.0.1:3306/iplatform_base?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+
+ # 杈炬ⅵ鏁版嵁搴�
+# driver-class-name: dm.jdbc.driver.DmDriver
+# username: iplatform
+# password: iplatform
+# url: jdbc:dm://116.198.39.83:5236?schema=iplatform
+
+ #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ # 浣跨敤 Hikari 杩炴帴姹�
+ #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# type: com.walker.jdbc.ds.DefaultDataSource
+# hikari:
+# minimum-idle: 5
+# idle-timeout: 600000
+# pool-name: databasePool_walker
+# # 杩炴帴鏈�澶ц秴鏃舵椂闂�
+# connection-timeout: 30000
+# # 杩炴帴姹犳渶澶ф暟閲�
+# maximum-pool-size: 10
+# # 鎺у埗姹犱腑杩炴帴鏈�澶х敓瀛樻湡
+# # max-lifetime: 70000
+# # 姝ゅ睘鎬ф帶鍒舵祴璇曡繛鎺ユ槸鍚︽椿璺冪殑鏈�闀挎椂闂淬�傛鍊煎繀椤诲皬浜� connectionTimeout
+# validation-timeout: 10000
+# #
+# connection-test-query: select 1
+
+ #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ # 浣跨敤 Druid 杩炴帴姹�
+ #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ type: com.walker.jdbc.ds.MyDruidDataSource
+ druid:
+ initial-size: 5
+ min-idle: 10
+ max-active: 20
+ # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
+ max-wait: 60000
+ # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
+ time-between-eviction-runs-millis: 60000
+ # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣 瓒呰繃杩欎釜鏃堕棿姣忔浼氬洖鏀堕粯璁�3涓繛鎺�
+ min-evictable-idle-time-millis: 30000
+ # 绾夸笂閰嶇疆鐨刴ysql鏂紑闂茬疆杩炴帴鏃堕棿涓�1灏忔椂,鏁版嵁婧愰厤缃洖鏀舵椂闂翠负3鍒嗛挓,浠ユ渶鍚庝竴娆℃椿璺冩椂闂村紑濮嬬畻
+ max-evictable-idle-time-millis: 180000
+ validation-query: select 1
+ test-while-idle: true
+ test-on-borrow: false
+ test-on-return: false
+ pool-prepared-statements: true
+ max-open-prepared-statements: 100
+ use-global-data-source-stat: true
+ webStatFilter:
+ enabled: false
+ statViewServlet:
+ enabled: false
+ # 璁剧疆鐧藉悕鍗曪紝涓嶅～鍒欏厑璁告墍鏈夎闂�
+# allow:
+# url-pattern: /druid/*
+# # 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮�
+# login-username: ruoyi
+# login-password: 123456
+ filter:
+ stat:
+ enabled: false
+ # 鎱QL璁板綍
+ log-slow-sql: true
+ slow-sql-millis: 1000
+ merge-sql: true
+ wall:
+ config:
+ multi-statement-allow: false
+
+ redis:
+# host: 116.198.40.76
+ host: 127.0.0.1
+ port: 6379
+# password: Jmy2019.
+ password:
+ database: 15
+
+ mvc:
+ pathmatch:
+ # 鍔犺閰嶇疆鏄洜涓� swagger3 鍚姩鎶ラ敊锛�2023-02-23
+ matching-strategy: ant_path_matcher
+
+ hiddenmethod:
+ filter:
+ enabled: true # 鍔犱笂璇ラ厤缃彲浠ユ帴鏀�: application/x-www-form-urlencoded璇锋眰鍙傛暟涓哄璞°�傛敮浠橀�氱煡涓娇鐢ㄣ��2023-02-26
+
+ servlet:
+ multipart:
+ # maxFileSize 鏄崟涓枃浠跺ぇ灏�
+ # maxRequestSize鏄缃�讳笂浼犵殑鏁版嵁澶у皬
+ enabled: true
+ max-file-size: 5MB
+ max-request-size: 10MB
+
+server:
+ port: 8082
+ servlet:
+ context-path: /admin
+ session:
+ timeout: 30m
+
+logging:
+ level:
+ root: info
+ org:
+ springframework: info
+ io.swagger: error
+ com:
+ walker: debug
+ iplatform: debug
+ ishop: debug
+ RocketmqRemoting: error # MQ鎵撳嵃璇ユ棩蹇楋紝鐩墠娌℃湁鎵惧埌瑙ｅ喅璧勬枡銆�2023-09-27
+ charset:
+ # 鎺у埗鍙扮紪鐮�
+ console: UTF-8
+ # 杈撳嚭鏂囦欢缂栫爜
+ file: UTF-8
+
+# file: # logging.file.path 鍜� logging.file.name锛屽彧浼氭湁涓�涓敓鏁堬紝閰嶄簡path涓嶈閰峮ame锛岄厤浜唍ame涓嶈閰峱ath锛屽彧閰峱ath鏃秐ame榛樿涓簊pring.log锛屾兂璺緞鍜屾枃浠跺悕鍚屾椂鐢熸晥鍙厤缃甽ogging.file.name=d:/logs/mylog.log
+# name: ${spring.application.name}.log #鏃ュ織鏂囦欢鍚�
+# path: logs #鏃ュ織瀛樺偍璺緞
+# max-history: 30 #淇濈暀澶氬皯澶╃殑鏃ュ織
+# max-size: 10MB
+# pattern:
+# rolling-file-name: ${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz
+ logback:
+ rollingpolicy:
+ # 鍗曚釜鏂囦欢鏈�澶т负30MB锛岃秴杩囦箣鍚庝細鎵撳寘鎴愪竴涓棩蹇楁枃浠�
+ max-file-size: 10MB
+ # 鏂囦欢淇濆瓨7澶�
+ max-history: 1
+ # 鎵撳寘鏂囦欢鏍煎紡,榛樿锛� ${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz,涔﹀啓鏍煎紡涓猴細鏂囦欢璺緞/鏂囦欢鍚�.%i.鏂囦欢鍚庣紑,鍏朵腑%i涓嶅彲鐪佸幓锛屽惁鍒欐棤鏃ュ織鏄剧ず
+ # 渚嬪锛� 鏃ユ湡涓猴細2023/07/13 ,鍒欐墦鍖呮枃浠朵箣鍚庝负锛� log/ota.2023-07-13.0.gz,0琛ㄧず鏃ュ織鐨勭涓�閮ㄥ垎锛屽悗缁氨鏄紝1,2,3...
+ # 濡傛灉鏄帇缂╁寘锛岄噷闈細澶氫竴涓悕log/ota.2023-07-13.0鐨勬棩蹇楁枃浠�
+ # 濡備笅闈㈢殑渚嬪瓙锛屾墦鍖呬箣鍚庝负: log/2023-07/ota.2020-07-13.0.log锛岃繖鏄竴涓棩蹇楁枃浠�
+ file-name-pattern: ${logging.file.path}%d{yyyy-MM}/iplatform.%d{yyyy-MM-dd}.%i.log
+
+ file:
+ name: ${logging.file.path}iplatform.log
+ path: D:/log/
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# 骞冲彴閰嶇疆鏀寔鍔熻兘
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+iplatform:
+
+ # 骞冲彴缂撳瓨锛屾槸鍚﹀惎鐢╮edis缂撳瓨锛岄粯璁や娇鐢ㄥ熀浜庡唴瀛樼紦瀛�.
+ # 娉ㄦ剰锛氬鏋滃紑鍚痳edis缂撳瓨锛屼笟鍔″伐绋嬪繀椤讳緷璧�(walker-support-redis)
+ cache:
+ redis-enabled: true
+ # redis 缂撳瓨鏄惁瑕侀噸寤猴紝濡傛灉璁剧疆 true锛屽垯绯荤粺鍚姩鍚庝細鍒犻櫎缂撳瓨锛屽苟鎵ц榛樿閲嶆柊鍔犺浇鏂规硶銆�2023-08-26
+ # 娉ㄦ剰锛氳鍙傛暟涓�鑸湪娴嬭瘯闃舵浣跨敤锛屾寮忕幆澧冧笉瑕佷娇鐢紒
+ redis-rebuild: true
+ # 鏈烘瀯鐢ㄦ埛鏄惁寰堝簽澶э紝濡傛灉鏄垯缂撳瓨涓細鍏抽棴鍒濆鍖栧姞杞斤紝鍚屾椂鏈烘瀯鏍戜篃涓嶄細鏀惧叆缂撳瓨锛�2023-07-17
+ org-user-big: false
+
+ # 鐩镐技搴﹀垎鏋愭ā鍧椾娇鐢�(宸插簾寮�)
+# similarity:
+# # 鏄惁鍚敤鐩镐技搴︽ā鍧楋紝濡傛灉绂佺敤鍒欒纭繚娉ㄥ叆鏃舵敮鎸佷负绌�
+# enabled: false
+# milvus-host: 172.16.60.65
+# milvus-port: 19530
+# word-file: d:/dev_tools/ai/w2v_sogou_dim300_vocab.txt
+# embedding-file: d:/dev_tools/ai/w2v_sogou_dim300.npy
+
+ # 璋冨害鍣ㄦā鍧楋紝鏄惁鍚敤
+ scheduler:
+ enabled: false
+ # 鏄惁鏀寔鏁版嵁搴撳瓨鍌ㄤ换鍔�(搴熷純璇ラ厤缃�)
+ database-enabled: false
+
+ # 鏁版嵁閲囬泦妯″潡
+ gather:
+ enabled: false
+
+ # 鏉冮檺鎺у埗鐩稿叧
+ security:
+ # 鍖垮悕鍙闂湴鍧�(寮�鏀惧湴鍧�)
+ anonymous-list:
+ - /login
+ - /register
+ - /captcha/* # 楠岃瘉鐮佺粺涓�鏀惧紑
+ - /test/** # 寮�鍙戞祴璇曪紝浠呭紑鍙戞澘鍙敤
+ - /swagger-resources/** # swagger
+ - /swagger-ui/** # swagger
+ - /v3/** # swagger
+ - /pay/notify/** # 鏀粯閫氱煡
+ - /jmreport/** # 绉湪鎶ヨ〃
+ - /file/** # 鐧诲綍鐢ㄦ埛鍙闂郴缁熸枃浠讹紝2023-06-09
+ - /front/index/** # APP鍏佽鏈櫥褰曠湅鍒伴儴鍒嗛椤靛唴瀹癸紝2023-06-23
+ - /front/product/**
+ - /front/merchant/**
+ - /front/city/**
+ - /front/login/**
+ - /front/wechat/get/**
+ - /front/article/**
+ - /tool/generate/** # 鏂癿ybatis鐢熸垚鍣ㄦ祴璇曪紝2024-01-17銆�
+
+ # 鍏佽鎵�鏈夎璇佺敤鎴烽兘鍙闂湴鍧�锛岃鎱庨噸鍚﹀垯鏉冮檺閮借繃澶э紝涓�鑸珹PI閮藉簲璇ヨ缃湪杩欓噷
+ permit-list:
+# - /permit # 鍏敤鏉冮檺锛�2023-03-13锛屽钩鍙颁唬鐮佸凡缁忔坊鍔犺繃浜嗭紝杩欓噷涓嶉渶瑕侀厤缃�
+ - /getInfo
+ - /getRouters
+ - /getMenus # 鏂扮晫闈㈣彍鍗曪紝2023-05-12
+ - /logout
+ - /api/**
+ - /system/form/info # 涓存椂澶勭悊锛岄渶瑕佸姞鍏ュ埌鐗瑰畾瑙掕壊锛堝晢鎴风鐞嗗憳锛夛紝2023-06-07
+ - /front/user/**
+ - /front/upload/**
+ - /front/order/**
+ - /front/address/**
+ - /front/coupon/**
+ - /front/qrcode/**
+ - /front/pay/**
+ - /front/cart/**
+ - /front/recharge/**
+ - /front/retail/**
+ - /front/kyzt/**
+# - /front/user/center/**
+# - /file/** # 鐧诲綍鐢ㄦ埛鍙闂郴缁熸枃浠讹紝2023-06-09
+
+ # 瓒呯骇绠＄悊鍛樺瘑鐮侊紝鍔犲瘑鍚庣殑绉樻枃
+ supervisor-password: $2a$10$9lSwwUFMULR6/KhPsUbTj.0PTZfTnq0fB3OtS6PWoKAibpa8hL1cy
+
+ # 鏄惁鍏佽閰嶇疆璺ㄥ煙鍝嶅簲澶�, true 鍚敤锛� false 涓嶅惎鐢ㄣ��2022-12-28
+ # 鍦℅ateway妯″紡涓紝闇�瑕佸叧闂法鍩熼厤缃紝鍥犱负缃戝叧涔熶細閰嶇疆銆�
+ cors-enabled: true
+
+ # 鐢ㄦ埛鍚嶅瘑鐮佹柟寮忕櫥褰曪紝閰嶇疆鐨勯獙璇佺爜绫诲瀷锛歝ode/sms/slide/jigsaw锛�2023-03-14
+ login-captcha-user-pass: code
+ # 鎵嬫満楠岃瘉鐮佹柟寮忕櫥褰曪紝閰嶇疆鐨勯獙璇佺爜绫诲瀷锛歝ode/sms/slide/jigsaw锛�2023-03-14
+ login-captcha-sms-code: sms
+
+ # 鏄惁鍏佽鍚庡彴鐢ㄦ埛锛堥潪App锛夌櫥褰曟墜鏈虹锛�2023-03-20
+ allow-pc-user-access-app: true
+
+ # 鏄惁鏀寔鎵嬫満鐧诲綍鏃讹紙涓嶅瓨鍦ㄦ墜鏈哄彿锛夌洿鎺ユ敞鍐岋紵鐩墠鐢靛晢绯荤粺鏀寔! 2023-06-26
+ allow-mobile-login-reg: true
+
+ # PC绔痶oken澶辨晥鍒嗛挓锛岄粯璁わ細120鍒嗛挓锛�2023-03-28
+ token-expire-web: 120
+ # 绉诲姩绔痶oken澶辨晥鍒嗛挓锛�2023-03-28
+ token-expire-mobile: 21600
+
+ # 鐢ㄦ埛浣撶郴锛堢敤鎴峰悕锛夐兘鏄墜鏈哄彿锛�2023-06-28
+ # 涓�鑸郴缁烶C绔�氬父閮戒笉鏄墜鏈哄彿浣滀负鐢ㄦ埛鍚嶏紝鍙湁鍦ㄤ簰鑱旂綉鐩稿叧绯荤粺涓細瀛樺湪鎵嬫満鍙蜂綔涓虹櫥褰曡处鍙�
+ user-name-is-phone: false
+
+ # 2023-07-11 鐧诲綍绛栫暐閰嶇疆锛屽垪琛ㄤ腑瀛樺湪鐨勭瓥鐣ラ兘琛ㄧず鍚敤锛堜笉鍚敤鐨勫垹鎺夛級
+ login-strategy-list:
+ - com.iplatform.base.support.strategy.WebOnceLoginStrategy
+# - com.iplatform.base.support.strategy.MobileOnceLoginStrategy
+
+ # 鐢ㄦ埛鐩稿叧瀹夊叏閰嶇疆锛�2023-08-03
+ user:
+ # 鐢ㄦ埛淇敼瀵嗙爜绛夌骇锛屽垎鍥涚骇锛�1-2-3-4锛屽父閲忥細PasswordUtils#
+ pass-level: 1
+ # 鏄惁寮哄埗鐢ㄦ埛淇敼榛樿瀵嗙爜锛�
+ pass-default-modify: true
+
+ # 浠ｇ爜鐢熸垚锛�2022-11-26
+ gen:
+ # 浣滆��
+ author: Mike
+ # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
+ package-name: com.iplatform.model.po
+ # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸false
+ auto-remove-pre: false
+ # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
+ table-prefix: s_
+
+ log:
+ # 鏄惁鎵撳紑鐧诲綍鏃ュ織锛�2023-01-05
+ # 濡傛灉涓嶆墦寮�锛屽垯璁惧鐧诲綍鐨剈uid鏇存柊鎿嶄綔涔熸棤娉曡幏寰楋紝鐢ㄤ簬璁板綍姣忎釜鐧诲綍鐢ㄦ埛鐨剈uid锛堢敤鎴风櫥褰曡鑹叉洿鏂帮級锛�2023-03-23
+ login-enabled: true
+ # 鏄惁鎵撳紑鎿嶄綔鏃ュ織锛�2023-01-05
+ operate-enabled: true
+
+ # 楠岃瘉鐮佺浉鍏抽厤缃紝2023-01-27
+ captcha:
+ # 鍥惧舰楠岃瘉鐮佸疄鐜扮被, TextCaptchaProvider | DefaultCaptchaProvider
+ image-captcha-class: com.iplatform.base.captcha.TextCaptchaProvider
+ # 鐭俊楠岃瘉鐮佸疄鐜扮被锛堥厤缃簾寮冿紝2023-04-25锛�
+ sms-captcha-class: com.iplatform.base.captcha.MockSmsCaptchaProvider
+
+ # 骞冲彴鏂囦欢瀛樺偍閰嶇疆锛�2023-02-15
+ file:
+ # FileStoreType = FileSystem 鏈湴纾佺洏瀛樺偍鏍硅矾寰�
+ file-root: d:/tmp/
+ # 璋冪敤杩滅▼涓婁紶鏂囦欢锛屾槸鍚︽寜鐓ф湰鍦版枃浠跺鐞嗭紝2023-07-03
+ # 鍦ㄦ祴璇曡繃绋嬩腑濡傛灉娌℃湁FTP绛夋湇鍔★紝鍙互璁剧疆涓簍rue涓存椂瀛樺偍鏈湴
+ remote-as-local: false
+
+ # oss瀹炵幇绫诲瀷锛歛ws_s3锛堜簹椹�婏級 | tx锛堣吘璁級 | ali锛堥樋閲岋級 | qn锛堜竷鐗涳級锛�2023-12-13
+ # | ftp锛�2024-02-23澧炲姞
+ oss-type: aws_s3
+ # oss璁块棶鍓嶇紑锛屽锛歨ttp://localhost:8082/admin/oss/锛�2023-12-13
+ oss-prefix: http://localhost:8082/admin/oss/
+ oss-access-key: HDKSYC2Y4FELF5CL5FIB
+ oss-secret-key: ktf8Px9uTvLFFpQNGsO41ehRsgJ0hWnLtxZnDBCX
+ # oss鏈嶅姟鍦板潃
+ oss-endpoint: http://eos-beijing-1.cmecloud.cn
+ # oss榛樿鐨勬《鍚嶇О
+ oss-bucket-name: ctoms-file
+ protocol: http
+
+ ftp:
+ ip: 116.198.40.76
+ port: 22
+ user-name: mysftp
+ password: Bjjmy_2020
+ private-key:
+ # ftp鏈嶅姟涓婇潰鐨勫瓨鍌ㄦ牴璺緞锛屽彧鑳芥槸linux璺緞
+# file-root: /files/
+ file-root: /train/
+
+ # 鎺ュ彛鏂囨。鐢熸垚锛宻wagger3锛�2023-02-23
+ swagger:
+ enable: false
+ # 鍖呰矾寰勶紝鏆傛椂涓嶇敤
+ base-package: com.iplatform.base.controller
+ title: 浜戝師鐢熷井鏈嶅姟骞冲彴
+ description: 涓�涓揩閫焪eb寮�鍙戞鏋�
+
+ # TCP閫氫俊閰嶇疆锛�2023-04-17
+ tcp:
+ # 鏄惁寮�鍚紩鎿�
+ enabled: true
+ # 鏄惁鎵撳紑蹇冭烦
+ open-heart-beat: false
+ # 蹇冭烦鏃堕棿锛堢锛夛紝2023-08-28
+ heart-beat-seconds: 60
+ # 鏄惁鏄剧ず璇︾粏鏃ュ織
+ show-log: false
+ # 璇锋眰闃熷垪绫诲瀷锛歮emory 鍩轰簬鍐呭瓨
+ queue-type: memory
+ # tcp鏂瑰紡瑕佹壂鎻忕殑璇锋眰瀵硅薄鐨勫寘绌洪棿
+ scan-packages-tcp: com.walker.tcp,com.iplatform.tcp
+ # websocket鏂瑰紡瑕佹壂鎻忕殑璇锋眰瀵硅薄鐨勫寘绌洪棿
+ scan-packages-ws: com.iplatform.tcp.util.ws
+ # tcp闀胯繛鎺ョ殑绔彛
+ port-tcp: 7878
+ # websocket杩炴帴绔彛
+ port-ws: 60000
+ # websocket杩炴帴uri
+# websocket-uri: ws://localhost:60000/websocket
+ websocket-uri: ws://localhost:60000
+ # 閫氫俊绾跨▼鏁伴噺
+ boss-thread-num: 2
+ # 涓氬姟澶勭悊绾跨▼鏁伴噺
+ worker-thread-num: 4
+ # 鍚敤鑷畾涔夎繛鎺ョ鐞嗗櫒锛屽鏋渢rue鍒欎笟鍔￠渶瑕佹彁渚涜嚜瀹氫箟瀹炵幇锛堥厤缃級锛�2023-07-18
+ custom-connection-manager: false
+ # 鏄惁寮�鍚泦缇ゆā寮忥紝杩炴帴绠＄悊鍣ㄤ細榛樿鍔犺浇璐熻浇鏀寔锛�2023-09-26
+ load-balance-enabled: false
+ # 闀胯繛鎺ヤ富鏈猴紙鏍囪锛変俊鎭紝鍙互鏄换鎰忓瓧绗︿覆锛屽彧瑕侀泦缇や腑姣忎釜鏈嶅姟閰嶇疆涓嶅悓鍗冲彲銆�
+ # 鍦ㄩ泦缇ゆā寮忎腑锛屾瘡涓繛鎺ヨ鍔犱笂涓绘満鏍囪瘑锛屼互渚垮埆浜烘帹閫佹秷鎭椂锛岀煡閬撳湪鍝釜涓绘満涓婃帹閫併��2023-09-19
+ connection-host: topic_master
+
+ # 鎺ㄩ�佹ā鍧楅厤缃紝2023-04-25
+ push:
+ # 鐭俊鎺ㄩ�佽�呭悕绉帮細mock_sms_push锛堟ā鎷熺煭淇★級锛宎lidy_sms_push锛堥樋閲屽ぇ楸肩煭淇★級
+ sms-push-name: alidy_sms_push
+ # 鐭俊楠岃瘉鐮佹ā鏉縄D锛屾牴鎹疄闄呮儏鍐碉紙姣忎釜骞冲彴鍙兘涓嶅悓锛�
+ sms-template-code: SMS_285145505
+
+ # 瀵逛簬涓�鑸笟鍔℃彁閱掞紙涓嶅寘鎷細閭欢銆佺煭淇★級锛屾帹閫佺殑鏂瑰紡銆傛帹閫佽�匢D缁勫悎
+ # && 琛ㄧず骞跺垪锛寍| 琛ㄧず鎴栵紙鍙涓�涓垚鍔熷氨OK锛�
+ # 2023-04-26锛屽彲鐢ㄧ殑 id = 'tcp', 'web_socket', 'wx', 'system'
+# message-type: tcp && web_socket && wx && system
+ # 濡傛灉鏄垨鑰呮柟寮忥紝闇�瑕佹妸鏈�鍙潬鐨勬斁鍓嶉潰锛屽洜涓虹郴缁熶細鎵惧埌绗竴涓彂閫佹垚鍔熷嵆鍙��
+ message-type: system || tcp || web_socket || wx
+
+ # 閭欢閫氱煡鍙戦�佷俊鎭厤缃紝2023-04-26
+ mail-server: smtp.126.com
+ mail-from: hnzzzhsl@126.com
+ mail-password: UWBUXNLFJEANRCXX
+
+ # 鑱婂ぉ鐩稿叧閰嶇疆锛�2023-07-07
+ chat:
+ # 鏄惁鍚敤鏈哄櫒浜虹瓟澶嶏紝2023-07-12
+ robot-enabled: true
+ # 鏈哄櫒浜哄叿浣撳疄鐜板璞★紝2023-07-12
+ robot-class: com.iplatform.chat.support.TestRobot
+ # 鏄惁寮�鍚痬ongo瀛樺偍锛屽鏋渇alse鍒欓粯璁や娇鐢ㄦ暟鎹簱琛�
+ mongo-enabled: true
+ mongo:
+ ip: 116.198.40.76
+ port: 27017
+ # 鑱婂ぉ鏁版嵁搴撳悕绉帮紝榛樿锛歝hat
+ database: czt_ops_test
+ user-name: czt_ops_test
+ password: czt_ops_test
+ max-size: 10
+ min-size: 2
+ # 杩炴帴鏈�澶х┖闂叉椂闂达紝20鍒嗛挓
+ max-idle-time-seconds: 1200
+ # 杩炴帴绛夊緟鏈�澶ф椂闂达紝10绉�
+ max-wait-time-seconds: 10
+
+ # 鏀粯妯″潡锛堢郴缁燂級閰嶇疆锛�2023-08-12
+ pay:
+ # 寰俊锛孷2鐗堟湰锛岃鍗曞洖璋冪被璺緞锛�2023-09-12
+ wechat-two-order-callback: com.ishop.merchant.support.MerchantWechatOrderCallback
+
+ # RestTemplate杩炴帴姹犻厤缃紝2023-08-18
+ rest:
+ # 杩炴帴淇濇寔娲诲姩鏃堕棿锛岄粯璁わ細600绉�
+ keep-alive-duration-seconds: 600
+ # 绌洪棽杩炴帴鏁伴噺锛岄粯璁わ細200涓�
+ max-idle-connections: 200
+ # 杩炴帴瓒呮椂锛岄粯璁わ細2绉�
+ connect-timeout-seconds: 20
+ # 璇昏秴鏃讹紝榛樿3绉�
+ read-timeout-seconds: 30
+ # 鍐欒秴鏃讹紝榛樿3绉�
+ write-timeout-seconds: 30
+
+ # 闆嗙兢鏀寔鐩稿叧閰嶇疆锛�2023-09-29
+ lb:
+ # 鏈満鏈嶅姟鑺傜偣ID锛屾瘡涓富鏈轰竴涓敮涓�鏁板瓧缂栧彿锛屼粠1寮�濮�
+ server-id: 1
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# 鐢靛晢妯″潡锛屾敮鎸佸姛鑳�
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ishop:
+ wechat-js-api-debug: true
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# 寮�杩愮洿閫氭暟鎹繛鎺ユ敮鎸侊紝2023-09-03
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+kyzt:
+ enabled: false
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# RocketMQ闃熷垪閰嶇疆锛�2023-09-26
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+rocketmq:
+ # 鏈嶅姟鍦板潃锛屽涓敤閫楀彿鍒嗗紑
+# name-server: 116.198.40.76:9876
+ name-server: 116.198.39.83:9898
+ producer:
+ # 鍙戦�佹秷鎭秴鏃舵椂闂达紝榛樿3000
+ send-message-timeout: 3000
+ # 鐢熶骇鑰呯粍
+ group: producer_group
+ # 鍙戦�佹秷鎭け璐ラ噸璇曟鏁帮紝榛樿2
+ retryTimesWhenSendFailed: 2
+ # 寮傛娑堟伅閲嶈瘯姝ゅ锛岄粯璁�2
+ retryTimesWhenSendAsyncFailed: 2
+ # 娑堟伅鏈�澶ч暱搴︼紝榛樿1024 * 1024 * 4(榛樿4M)
+ # 1024 * 128 = 128K
+ maxMessageSize: 131072
+ # 鍘嬬缉娑堟伅闃堝�硷紝榛樿4k(1024 * 4)
+ compressMessageBodyThreshold: 4096
+ # 鏄惁鍦ㄥ唴閮ㄥ彂閫佸け璐ユ椂閲嶈瘯鍙︿竴涓猙roker锛岄粯璁alse
+ retryNextServer: false
diff --git a/deploy-jar-template/src/main/resources/application.yml b/deploy-jar-template/src/main/resources/application.yml
index 55db90a..8ddc928 100644
--- a/deploy-jar-template/src/main/resources/application.yml
+++ b/deploy-jar-template/src/main/resources/application.yml
@@ -1,7 +1,8 @@
spring:
profiles:
# active: oracle
- active: dev
+# active: dev
+ active: ai
# active: master
# active: test
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/iplatform/milvus/TestMilvus.java b/deploy-jar-template/src/test/java/com/iplatform/milvus/TestMilvus.java
index 883114a..37506da 100644
--- a/deploy-jar-template/src/test/java/com/iplatform/milvus/TestMilvus.java
+++ b/deploy-jar-template/src/test/java/com/iplatform/milvus/TestMilvus.java
@@ -5,6 +5,12 @@
public class TestMilvus {
+// @Test
+ public void dropTable(){
+ this.acquireMilvusEngine();
+ this.milvusEngine.dropChatSimilarTable();
+ }
+
/**
* 鍒涘缓鑱婂ぉ涓彁鍙栧伐鍗曟憳瑕佸姛鑳斤紝milvus娴嬭瘯琛ㄥ垱寤恒��
* <p>绗竴姝ワ細鍒涘缓琛ㄥ拰绱㈠紩</p>
@@ -27,7 +33,8 @@
private void acquireMilvusEngine(){
if(this.milvusEngine == null){
- MilvusEngine engine = new MilvusEngine("120.26.128.84", 19530);
+// MilvusEngine engine = new MilvusEngine("120.26.128.84", 19530);
+ MilvusEngine engine = new MilvusEngine("10.8.4.99", 19530);
this.milvusEngine = engine;
}
}
diff --git a/iplatform-base-security/src/main/java/com/iplatform/security/DefaultResourceLoaderProvider.java b/iplatform-base-security/src/main/java/com/iplatform/security/DefaultResourceLoaderProvider.java
index cbe9688..f7bd564 100644
--- a/iplatform-base-security/src/main/java/com/iplatform/security/DefaultResourceLoaderProvider.java
+++ b/iplatform-base-security/src/main/java/com/iplatform/security/DefaultResourceLoaderProvider.java
@@ -3,7 +3,6 @@
import com.iplatform.base.SecurityConstants;
import com.iplatform.base.cache.MenuCacheProvider;
import com.walker.infrastructure.utils.StringUtils;
-import com.walker.security.SystemLogMan;
import com.walker.web.Constants;
import com.walker.web.security.ResourceLoadProvider;
import org.slf4j.Logger;
@@ -68,7 +67,6 @@
}
public void setMenuCacheProvider(MenuCacheProvider menuCacheProvider) {
- SystemLogMan.getInstance().checkMan();
this.menuCacheProvider = menuCacheProvider;
}
diff --git a/iplatform-base-security/src/main/java/com/iplatform/security/DefaultSecuritySpi.java b/iplatform-base-security/src/main/java/com/iplatform/security/DefaultSecuritySpi.java
index 6d12b97..fa01fd1 100644
--- a/iplatform-base-security/src/main/java/com/iplatform/security/DefaultSecuritySpi.java
+++ b/iplatform-base-security/src/main/java/com/iplatform/security/DefaultSecuritySpi.java
@@ -126,8 +126,8 @@
} catch (Exception e){
this.recordLoginInfo(requestLogin.getUsername(), String.valueOf(ResponseCode.ERROR.getCode()), "鐧诲綍鏈垚鍔熻璇�", 0, null, null);
if(e instanceof UsernameNotFoundException){
-// logger.debug(".............鐢ㄦ埛涓嶅瓨鍦細" + requestLogin.getUsername());
- throw new LoginException("鐢ㄦ埛璐﹀彿涓嶅瓨鍦紝鎴栧凡鍋滅敤锛�" + requestLogin.getUsername(), e, true);
+// throw new LoginException("鐢ㄦ埛璐﹀彿涓嶅瓨鍦紝鎴栧凡鍋滅敤锛�" + requestLogin.getUsername(), e, true);
+ throw new LoginException("鐢ㄦ埛璐﹀彿涓嶅瓨鍦紝鎴栧凡鍋滅敤锛�" + requestLogin.getUsername(), null, true);
}
if (e instanceof BadCredentialsException){
// return ResponseValue.error(ResponseCode.USER_CREDENTIALS_ERROR.getCode(), ResponseCode.USER_CREDENTIALS_ERROR.getMessage());
diff --git a/iplatform-base-security/src/main/java/com/iplatform/security/config/WebSecurityConfig.java b/iplatform-base-security/src/main/java/com/iplatform/security/config/WebSecurityConfig.java
index 8c2191a..90761ab 100644
--- a/iplatform-base-security/src/main/java/com/iplatform/security/config/WebSecurityConfig.java
+++ b/iplatform-base-security/src/main/java/com/iplatform/security/config/WebSecurityConfig.java
@@ -27,7 +27,6 @@
import com.iplatform.security.util.SecurityConfigUtils;
import com.walker.cache.CacheProvider;
import com.walker.infrastructure.utils.StringUtils;
-import com.walker.security.SystemLogMan;
import com.walker.web.CaptchaProvider;
import com.walker.web.CaptchaResult;
import com.walker.web.TokenGenerator;
@@ -84,7 +83,6 @@
this.userService = userService;
this.userOnlineProvider = userOnlineProvider;
this.userCacheProvider = userCacheProvider;
- SystemLogMan.getInstance().checkMan();
// 2023-07-11
this.userLoginCache = userLoginCache;
}
diff --git a/iplatform-base-tcp-client/src/test/java/com/iplatform/tcp/WebsocketDemo.java b/iplatform-base-tcp-client/src/test/java/com/iplatform/tcp/WebsocketDemo.java
index 822842e..fd2939f 100644
--- a/iplatform-base-tcp-client/src/test/java/com/iplatform/tcp/WebsocketDemo.java
+++ b/iplatform-base-tcp-client/src/test/java/com/iplatform/tcp/WebsocketDemo.java
@@ -1,22 +1,17 @@
package com.iplatform.tcp;
-import com.iplatform.tcp.util.ws.WebDataResponse;
-import com.walker.infrastructure.utils.JsonUtils;
-import com.walker.infrastructure.utils.NumberGenerator;
-import org.junit.Test;
-
public class WebsocketDemo {
- @Test
- public void sendDataFormat(){
- WebDataResponse msg = new WebDataResponse();
- msg.setMessageId(NumberGenerator.getLongSequenceId());
- msg.setName("shikeying"); // 鎸囧畾鐢ㄦ埛鍙戦�侊紝璇d涓庢祻瑙堝櫒绔敞鍐岀殑id淇濇寔涓�鑷淬��
- msg.setData("浣犲ソ锛岃繖鏄帹閫佺粰娴忚鍣ㄧ殑鍐呭锛屼竴鑸槸JSON鏍煎紡銆�");
- try {
- System.out.println(JsonUtils.objectToJsonString(msg));
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
+// @Test
+// public void sendDataFormat(){
+// WebDataResponse msg = new WebDataResponse();
+// msg.setMessageId(NumberGenerator.getLongSequenceId());
+// msg.setName("shikeying"); // 鎸囧畾鐢ㄦ埛鍙戦�侊紝璇d涓庢祻瑙堝櫒绔敞鍐岀殑id淇濇寔涓�鑷淬��
+// msg.setData("浣犲ソ锛岃繖鏄帹閫佺粰娴忚鍣ㄧ殑鍐呭锛屼竴鑸槸JSON鏍煎紡銆�");
+// try {
+// System.out.println(JsonUtils.objectToJsonString(msg));
+// } catch (Exception e) {
+// throw new RuntimeException(e);
+// }
+// }
}
diff --git a/iplatform-base/pom.xml b/iplatform-base/pom.xml
index 19ba529..69df2f2 100644
--- a/iplatform-base/pom.xml
+++ b/iplatform-base/pom.xml
@@ -134,10 +134,10 @@
</dependency>
<!-- 寮曞叆mybatis鏀寔妯″潡锛�2024-01-16 -->
- <dependency>
- <groupId>com.iplatform</groupId>
- <artifactId>iplatform-support-mybatis</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>com.iplatform</groupId>-->
+<!-- <artifactId>iplatform-support-mybatis</artifactId>-->
+<!-- </dependency>-->
</dependencies>
diff --git a/iplatform-base/src/main/java/com/iplatform/base/LocalDatabaseMetaEngine.java b/iplatform-base/src/main/java/com/iplatform/base/LocalDatabaseMetaEngine.java
index 4cdbef8..b57b050 100644
--- a/iplatform-base/src/main/java/com/iplatform/base/LocalDatabaseMetaEngine.java
+++ b/iplatform-base/src/main/java/com/iplatform/base/LocalDatabaseMetaEngine.java
@@ -11,7 +11,6 @@
import com.walker.dbmeta.support.OracleMetaEngine;
import com.walker.dbmeta.support.PostgresMetaEngine;
import com.walker.dbmeta.support.SqlserverMetaEngine;
-import com.walker.security.SystemLogMan;
import java.util.ArrayList;
import java.util.List;
@@ -34,7 +33,6 @@
throw new IllegalArgumentException("LocalAddress 蹇呴』鎻愪緵");
}
this.localAddress = localAddress;
- SystemLogMan.getInstance().checkMan();
}
public void setDatabaseType(DatabaseType databaseType){
diff --git a/iplatform-base/src/main/java/com/iplatform/base/support/DatabaseArgumentsManager.java b/iplatform-base/src/main/java/com/iplatform/base/support/DatabaseArgumentsManager.java
index aab363a..7dc5083 100644
--- a/iplatform-base/src/main/java/com/iplatform/base/support/DatabaseArgumentsManager.java
+++ b/iplatform-base/src/main/java/com/iplatform/base/support/DatabaseArgumentsManager.java
@@ -12,7 +12,6 @@
import com.walker.infrastructure.arguments.Variable;
import com.walker.infrastructure.arguments.VariableType;
import com.walker.infrastructure.utils.StringUtils;
-import com.walker.security.SystemLogMan;
import java.util.ArrayList;
import java.util.HashMap;
@@ -33,7 +32,6 @@
public void setConfigArgumentService(ConfigArgumentServiceImpl configArgumentService) {
this.configArgumentService = configArgumentService;
- SystemLogMan.getInstance().checkMan();
}
@Override
diff --git a/iplatform-base/src/main/java/com/iplatform/base/support/RedisArgumentsManager.java b/iplatform-base/src/main/java/com/iplatform/base/support/RedisArgumentsManager.java
index 070ccbd..c7d9ba1 100644
--- a/iplatform-base/src/main/java/com/iplatform/base/support/RedisArgumentsManager.java
+++ b/iplatform-base/src/main/java/com/iplatform/base/support/RedisArgumentsManager.java
@@ -11,7 +11,6 @@
import com.walker.infrastructure.arguments.Variable;
import com.walker.infrastructure.arguments.VariableType;
import com.walker.infrastructure.utils.StringUtils;
-import com.walker.security.SystemLogMan;
import com.walker.support.redis.cache.RedisCacheProvider;
import java.util.ArrayList;
@@ -33,11 +32,9 @@
public void setConfigArgumentService(ConfigArgumentServiceImpl configArgumentService) {
this.configArgumentService = configArgumentService;
- SystemLogMan.getInstance().checkMan();
}
public RedisArgumentsManager(){
- SystemLogMan.getInstance().checkMan();
this.setUseRedis(true);
this.setLoadPage(false);
}
diff --git a/iplatform-scheduler/src/main/java/com/iplatform/scheduler/PlatformSchedulerManager.java b/iplatform-scheduler/src/main/java/com/iplatform/scheduler/PlatformSchedulerManager.java
index 8d36384..27c88d2 100644
--- a/iplatform-scheduler/src/main/java/com/iplatform/scheduler/PlatformSchedulerManager.java
+++ b/iplatform-scheduler/src/main/java/com/iplatform/scheduler/PlatformSchedulerManager.java
@@ -2,12 +2,10 @@
import com.iplatform.model.po.S_scheduler;
import com.iplatform.scheduler.util.SchedulerUtils;
-
import com.walker.infrastructure.utils.StringUtils;
import com.walker.scheduler.GatherSchedulerManager;
import com.walker.scheduler.ScheduleEngine;
import com.walker.scheduler.impl.TimedScheduler;
-import com.walker.security.SystemLogMan;
import java.util.List;
@@ -31,7 +29,6 @@
if(this.scheduleEngine == null){
throw new IllegalArgumentException("璇锋彁渚涗竴涓彲鐢ㄧ殑璋冨害寮曟搸瀵硅薄: ScheduleEngine");
}
- SystemLogMan.getInstance().checkMan();
List<S_scheduler> schedulerList = this.acquireRunningList();
int count = 0;
diff --git a/iplatform-support-mybatis/pom.xml b/iplatform-support-mybatis/pom.xml
index 1a8584a..b8457cb 100644
--- a/iplatform-support-mybatis/pom.xml
+++ b/iplatform-support-mybatis/pom.xml
@@ -91,6 +91,13 @@
<artifactId>poi-ooxml</artifactId>
</dependency>
+ <!-- 鍩虹妯″潡鎻愪緵web鏀寔, 2022/10/31 -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
</project>
diff --git a/iplatform-base-admin/src/main/java/com/iplatform/base/controller/GenController.java b/iplatform-support-mybatis/src/main/java/com/iplatform/mybatis/controller/GenController.java
similarity index 97%
rename from iplatform-base-admin/src/main/java/com/iplatform/base/controller/GenController.java
rename to iplatform-support-mybatis/src/main/java/com/iplatform/mybatis/controller/GenController.java
index 425c2d2..1473cef 100644
--- a/iplatform-base-admin/src/main/java/com/iplatform/base/controller/GenController.java
+++ b/iplatform-support-mybatis/src/main/java/com/iplatform/mybatis/controller/GenController.java
@@ -1,6 +1,5 @@
-package com.iplatform.base.controller;
+package com.iplatform.mybatis.controller;
-import com.iplatform.base.SystemController;
import com.iplatform.core.util.CharsetKit;
import com.iplatform.core.util.Convert;
import com.iplatform.mybatis.domain.GenTable;
@@ -17,6 +16,8 @@
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.validation.annotation.Validated;
@@ -53,8 +54,12 @@
//@Api(value = "浠ｇ爜鐢熸垚绠＄悊", tags = {"浠ｇ爜鐢熸垚绠＄悊"})
@RestController
@RequestMapping("/tool/generate")
-public class GenController extends SystemController
+public class GenController
+// extends SystemController
{
+
+ protected final transient Logger logger = LoggerFactory.getLogger(this.getClass());
+
@Autowired
private IGenTableService genTableService;
diff --git a/pom.xml b/pom.xml
index 1b7b369..9804167 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<module>ishop-mobile</module>
<module>iplatform-base-tcp-client</module>
<module>iplatform-support-mybatis</module>
- <module>iplatform-test-mybatis</module>
+<!-- <module>iplatform-test-mybatis</module>-->
</modules>
<parent>
@@ -223,11 +223,11 @@
</dependency>
<!-- mybatis绀轰緥妯″潡锛�2024-02-19 -->
- <dependency>
- <groupId>com.iplatform</groupId>
- <artifactId>iplatform-test-mybatis</artifactId>
- <version>${iplatform.version}</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>com.iplatform</groupId>-->
+<!-- <artifactId>iplatform-test-mybatis</artifactId>-->
+<!-- <version>${iplatform.version}</version>-->
+<!-- </dependency>-->
<!-- 鎺ㄩ�佸疄鐜版ā鍧楋紝2023-04-24 -->
<dependency>
--
Gitblit v1.9.1