diff --git a/pom.xml b/pom.xml
index 9a9ff72..9b87f38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,28 +14,274 @@
system_aishop
system_aishop
- 22
+ 1.8
+ 2.1.4
+ 8.0.22
+ 1.1.9
org.springframework.boot
- spring-boot-starter
+ spring-boot-starter-web
+
+
+ org.springframework.boot
+ spring-boot-starter-thymeleaf
+
+
+ org.springframework.boot
+ spring-boot-starter-freemarker
+
+
+ mysql
+ mysql-connector-java
+ ${mysql.version}
+ runtime
-
org.springframework.boot
spring-boot-starter-test
test
+
+ org.mybatis.spring.boot
+ mybatis-spring-boot-starter
+ ${spring-mybatis.version}
+
+
+ com.alibaba
+ druid-spring-boot-starter
+ ${druid.version}
+
+
+ junit
+ junit
+ test
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ink.wgink
+ login-oauth2-server
+ 1.0-SNAPSHOT
+
+
+ ink.wgink
+ module-oauth2-client
+ 1.0-SNAPSHOT
+
+
+ ink.wgink
+ login-app
+ 1.0-SNAPSHOT
+
+
+ ink.wgink
+ service-group
+ 1.0-SNAPSHOT
+
+
+ ink.wgink
+ register-base
+ 1.0-SNAPSHOT
+
+
+ ink.wgink
+ service-position
+ 1.0-SNAPSHOT
+
+
+ ink.wgink
+ service-role
+ 1.0-SNAPSHOT
+
+
+ ink.wgink
+ module-sms
+ 1.0-SNAPSHOT
+
+
+ ink.wgink
+ module-file
+ 1.0-SNAPSHOT
+
+
+ ink.wgink
+ module-dictionary
+ 1.0-SNAPSHOT
+
+
+
+
+
+
+
+ cn.com.tenlion
+ module-project-config
+ 1.0-SNAPSHOT
+
+
+
+ org.springframework.boot
+ spring-boot-starter-data-mongodb
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-data-redis
+
+
+
+
+ com.google.code.gson
+ gson
+ 2.8.5
+
+
+
+ com.google.zxing
+ core
+ 3.3.3
+
+
+ com.google.zxing
+ javase
+ 3.3.3
+
+
+
+
+ com.github.wechatpay-apiv3
+ wechatpay-java
+ 0.2.11
+
+
+
+ com.alipay.sdk
+ alipay-sdk-java
+ 4.39.2.ALL
+
+
+
+
+
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-websocket
+
+
+ org.quartz-scheduler
+ quartz
+ 2.2.1
+
+
+ com.github.binarywang
+ java-emoji-converter
+ 0.1.1
+
+
+ org.projectlombok
+ lombok
+ 1.16.10
+
+
+ ink.wgink
+ mongo-module-file
+ 1.0-SNAPSHOT
+
+
+
+ ink.wgink
+ module-file
+ 1.0-SNAPSHOT
+
+
+ org.apache.commons
+ commons-compress
+ 1.19
+
+
org.springframework.boot
spring-boot-maven-plugin
+
+ ZIP
+
+
+ non-exists
+ non-exists
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+
+ copy-dependencies
+ package
+
+ copy-dependencies
+
+
+
+ target/lib
+ false
+ false
+ runtime
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+
+
+ **/*.properties
+ **/*.xml
+ **/*.yml
+ static/**
+ templates/**
+ mybatis/**
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+ true
+
+
+ org.projectlombok
+ lombok
+
+
+
-
diff --git a/src/main/java/com/cn/tenlion/aishop/SystemAishopApplication.java b/src/main/java/com/cn/tenlion/aishop/SystemAishopApplication.java
new file mode 100644
index 0000000..1a5d15b
--- /dev/null
+++ b/src/main/java/com/cn/tenlion/aishop/SystemAishopApplication.java
@@ -0,0 +1,17 @@
+package com.cn.tenlion.aishop;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@EnableSwagger2
+@SpringBootApplication(scanBasePackages = {"ink.wgink", "cn.com.tenlion"} )
+@MapperScan(basePackages = {"ink.wgink.**.dao", "cn.com.tenlion.**.dao"})
+public class SystemAishopApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(SystemAishopApplication.class, args);
+ }
+
+}
diff --git a/src/main/java/com/cn/tenlion/aishop/system_aishop/SystemAishopApplication.java b/src/main/java/com/cn/tenlion/aishop/system_aishop/SystemAishopApplication.java
deleted file mode 100644
index 4fddd79..0000000
--- a/src/main/java/com/cn/tenlion/aishop/system_aishop/SystemAishopApplication.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.cn.tenlion.aishop.system_aishop;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class SystemAishopApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(SystemAishopApplication.class, args);
- }
-
-}
diff --git a/src/main/resources/application-lanproxy.yml b/src/main/resources/application-lanproxy.yml
new file mode 100644
index 0000000..cb31214
--- /dev/null
+++ b/src/main/resources/application-lanproxy.yml
@@ -0,0 +1,125 @@
+server:
+ port: 9001
+ url: http://121.36.71.250:58086/aishop
+ system-title: AI商城
+ system-sub-title: AI商城
+ default-home-page: agent/index/home
+ nav-page: ${api-path.user-center}
+ servlet:
+ context-path: /aishop
+
+spring:
+ login-url: /oauth/login
+ login-failure: /oauth/login?error
+ login-process: /userlogin
+ assets-matchers: /assets/**,/inspur/**,
+ thymeleaf:
+ prefix: classpath:/templates/
+ suffix: .html
+ mode: HTML5
+ encoding: UTF-8
+ cache: false
+ main:
+ allow-bean-definition-overriding: true
+ servlet:
+ multipart:
+ max-file-size: 1GB
+ max-request-size: 1GB
+ datasource:
+ druid:
+ url: jdbc:mysql://192.168.0.151:3306/db_system_ai_shop?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC&nullCatalogMeansCurrent=true
+ db-type: mysql
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ username: root
+ password: root
+ initial-size: 2
+ min-idle: 2
+ max-active: 200
+ max-wait: 60000
+ time-between-eviction-runs-millis: 60000
+ min-evictable-idle-time-millis: 300000
+ validation-query: SELECT 1 FROM DUAL
+ test-while-idle: true
+ test-on-borrow: false
+ test-on-return: false
+ pool-prepared-statements: true
+ max-pool-prepared-statement-per-connection-size: 10
+ filter:
+ commons-log:
+ connection-logger-name: stat,wall,log4j
+ stat:
+ log-slow-sql: true
+ slow-sql-millis: 2000
+ connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+ use-global-data-source-stat: true
+
+
+mybatis:
+ config-location: classpath:mybatis/mybatis-config.xml
+ mapper-locations: classpath*:mybatis/mapper/**/*.xml
+
+access-control:
+ role-permission: false
+
+swagger:
+ base-package-list: ink.wgink,cn.com.tenlion
+
+file:
+ upload-path: D:\CF_work\ideaWorkSpace\uploadFiles\system-aishop
+ image-types: png,jpg,jpeg,gif,blob
+ video-types: mp4,rmvb
+ audio-types: mp3,wmv,amr
+ file-types: doc,docx,xls,xlsx,ppt,pptx,txt,zip,rar,apk,pdf
+ max-file-count: 6
+ image-output-quality: 0.4
+ # 启用minIo
+ use-min-io: false
+ # 与use-min-io配套使用
+ min-io:
+ endpoint: http://192.168.158.17:9001
+ access-key: smartcity
+ secret-key: smartcity
+
+api-path:
+ user-center: http://121.36.71.250:58085/operator
+ client-id: 80ce03b81034487e9c348236d7a26dd6
+ client-secret: K09jUGNsWS81YlFSTXU5K1RuOFFRbGE4V1M1NS81VFhMcFBKa1NubGtIL2xIdG9KZmEyTjJIRnI0dG1McEdEVA==
+
+security:
+ oauth2:
+ oauth-server: ${api-path.user-center}
+ oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url} #外网
+ client:
+ client-id: ${api-path.client-id}
+ client-secret: ${api-path.client-secret}
+ user-authorization-uri: ${security.oauth2.oauth-server}/oauth2_client/authorize #外网
+ access-token-uri: ${api-path.user-center}/oauth2_client/token
+ grant-type: authorization_code
+ resource:
+ jwt:
+ key-uri: ${api-path.user-center}/oauth2_client/token_key
+ token-info-uri: ${api-path.user-center}/oauth2_client/check_token
+ user-info-uri: ${api-path.user-center}/user
+ authorization:
+ check-token-access: ${api-path.user-center}/oauth2_client/token_key
+
+
+logging:
+ enable-api-log: false
+ file:
+ name: D:\CF_work\ideaWorkSpace\uploadFiles\system-ai-agent\logs\system-aishop.log
+ level:
+ root: error
+ ink.wgink: debug
+
+
+agent:
+ # 账户系统地址
+ account-service-path: http://121.36.71.250:58085/operator
+ # 客户系统地址
+ copyright-service-path: http://121.36.71.250:58038/copyright
+ # 门户系统地址
+ menhu-service-path: http://192.168.0.4:7023/portal
+
+
+
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
deleted file mode 100644
index 0138ad7..0000000
--- a/src/main/resources/application.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring.application.name=system_aishop
diff --git a/src/test/java/com/cn/tenlion/aishop/system_aishop/SystemAishopApplicationTests.java b/src/test/java/com/cn/tenlion/aishop/SystemAishopApplicationTests.java
similarity index 81%
rename from src/test/java/com/cn/tenlion/aishop/system_aishop/SystemAishopApplicationTests.java
rename to src/test/java/com/cn/tenlion/aishop/SystemAishopApplicationTests.java
index 2473ccd..bb66351 100644
--- a/src/test/java/com/cn/tenlion/aishop/system_aishop/SystemAishopApplicationTests.java
+++ b/src/test/java/com/cn/tenlion/aishop/SystemAishopApplicationTests.java
@@ -1,4 +1,4 @@
-package com.cn.tenlion.aishop.system_aishop;
+package com.cn.tenlion.aishop;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;