瀏覽代碼

配置调整

xiwa 3 年之前
父節點
當前提交
3ad6ad2751

+ 0 - 4
manager/src/main/java/cc/iotkit/manager/controller/UserInfoController.java

@@ -12,7 +12,6 @@ import cc.iotkit.manager.utils.AuthUtil;
 import cc.iotkit.model.UserInfo;
 import cn.dev33.satoken.annotation.SaCheckRole;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
@@ -21,9 +20,6 @@ import java.util.*;
 @RequestMapping("/user")
 public class UserInfoController {
 
-    @Value("${app.systemRole}")
-    private String systemRole;
-
     @Autowired
     private UserInfoRepository userInfoRepository;
     @Autowired

+ 11 - 17
manager/src/main/resources/application-dev.yml

@@ -8,32 +8,32 @@ spring:
       max-file-size: 10MB
       max-request-size: 12MB
 
+  #mongodb数据库配置
   data:
     mongodb:
-      uri: mongodb://填写mongodb地址/admin
+      uri: mongodb://填写mongodb地址
       database: iotkit
 
   elasticsearch:
     rest:
-      uris: http://elasticsearch 连接地址
-      username: elasticsearch 用户名
-      password: 密码
+      #使用内置es的配置
+      uris: http://127.0.0.1:9200
+      username:
+      password:
       connection-timeout: 10s
 
   redis:
-    host: redis地址
+    #使用内置redis的配置
+    host: 127.0.0.1
     port: 6379
     database: 0
-    password: redis密码
+    password:
 
-  cache:
-    cache-names: foo,bar
-    caffeine:
-      spec: maximumSize=5000,expireAfterAccess=120s
   mvc:
     pathmatch:
       matching-strategy: ant_path_matcher
 
+#图片存储用的是阿里云oss,如果需要上传产品图片才需要配置
 aliyun:
   bucketId: 填写阿里云bucketId
   endpoint: oss-cn-shenzhen.aliyuncs.com
@@ -56,13 +56,7 @@ sa-token:
   # 是否输出操作日志
   is-log: false
 
+#pulsar消息队列配置,需要进行配置
 pulsar:
   broker: pulsar://pulsar broker地址:6650
   service: http://pulsar 服务地址:8080
-
-app:
-  systemRole: iot_system_user
-
-mqtt:
-  url: tcp://填写mqtt连接地址
-

+ 11 - 15
manager/src/main/resources/application.yml

@@ -8,30 +8,32 @@ spring:
       max-file-size: 10MB
       max-request-size: 12MB
 
+  #mongodb数据库配置
   data:
     mongodb:
-      uri: mongodb://填写mongodb地址/admin
+      uri: mongodb://填写mongodb地址
       database: iotkit
 
   elasticsearch:
     rest:
-      uris: http://elasticsearch 连接地址
+      #使用内置es的配置
+      uris: http://127.0.0.1:9200
+      username:
+      password:
       connection-timeout: 10s
 
   redis:
-    host: redis地址
+    #使用内置redis的配置
+    host: 127.0.0.1
     port: 6379
     database: 0
     password:
 
-  cache:
-    cache-names: foo,bar
-    caffeine:
-      spec: maximumSize=5000,expireAfterAccess=300s
   mvc:
     pathmatch:
       matching-strategy: ant_path_matcher
 
+#图片存储用的是阿里云oss,如果需要上传产品图片才需要配置
 aliyun:
   bucketId: 填写阿里云bucketId
   endpoint: oss-cn-shenzhen.aliyuncs.com
@@ -53,14 +55,8 @@ sa-token:
   token-style: uuid
   # 是否输出操作日志
   is-log: false
-  
+
+#pulsar消息队列配置,需要进行配置
 pulsar:
   broker: pulsar://pulsar broker地址:6650
   service: http://pulsar 服务地址:8080
-
-app:
-  systemRole: iot_system_user
-
-mqtt:
-  url: tcp://填写mqtt连接地址
-

+ 0 - 0
protocol-gateway/emqx-component/dependency-reduced-pom.xml