tj

microservice-admin/src/main/resources/bootstrap.yml

 #服务器配置信息1
 server:
-  port: 8091
+  port: 8092
 
 spring:
   application:
@@ -14,7 +14,7 @@ spring:
   cloud:
     config:
       profile: dev
-      uri: http://config:8777
+      uri: http://config:8776
       #discovery:
         #enabled: true
         #service-id: microservice-config-server
@@ -30,7 +30,7 @@ warning:
   port: 30003
 
 upload:
-  realBaseDir: /usr/local/nginx/html/dist/
+  realBaseDir: /usr/local/nginx/html/zhxf/dist/
 ---
 spring:
   profiles: test
@@ -38,7 +38,7 @@ spring:
     config:
       profile: test
       label: master
-      uri: http://config:8777
+      uri: http://config:8776
 upload:
   realBaseDir: ./root/crsh/admin/upload/
   readBaseDir: http://new001.suntrayoa.com/admin/
\ No newline at end of file

microservice-admin/src/main/resources/mapper/sys/SysUserDao.xml

@@ -32,7 +32,6 @@
 
     <select id="getById" resultType="com.devplatform.admin.modules.sys.bean.SysUserEntity">
         SELECT su.user_id,
-               ls.station_name AS org_id,
                su.name,
                su.username,
                su.password,
@@ -61,7 +60,6 @@
                su.byx2,
                su.byx3
         FROM sys_user su
-                 LEFT JOIN li_station ls ON ls.id = su.org_id
         WHERE su.deleted = 0
           AND su.user_id = #{userId}
     </select>
@@ -106,11 +104,13 @@
     <select id="getAllUserByOrgIdPage" resultType="java.util.HashMap">
         SELECT u.*,sd.name AS jobName ,sn.name AS nationName
         FROM sys_user u
-        LEFT JOIN sys_dictionary sd ON u.job = sd.id AND sd.deleted = 0 AND sd.station_id = u.station_id
+        LEFT JOIN sys_dictionary sd ON u.job = sd.id AND sd.deleted = 0
         LEFT JOIN sys_nation sn ON u.nation = sn.id
         <where>
             AND u.deleted = 0 AND u.user_id not in(1, 2)
-            AND u.station_id = #{map.stationId}
+            <if test="map.stationId !=null and map.stationId != ''">
+                AND u.station_id = #{map.stationId}
+            </if>
             <if test="map.username !=null and map.username != ''">
                 AND INSTR(u.username, #{map.username})
             </if>

microservice-alram/src/main/resources/bootstrap.yml

@@ -16,7 +16,7 @@ spring:
   cloud:
     config:
       profile: dev
-      uri: http://config:8777
+      uri: http://config:8776
         #discovery:
         #enabled: true
       #service-id: microservice-config-server
@@ -25,4 +25,4 @@ environment: common
 info:
   version: 0.1
 upload:
-  realBaseDir: /usr/local/nginx/html/dist/
\ No newline at end of file
+  realBaseDir: /usr/local/nginx/html/zhxf/dist/
\ No newline at end of file

microservice-authorization-server/src/main/resources/bootstrap.yml

 server:
-  port: 8300
+  port: 8301
 
   
 spring:

microservice-config-server/src/main/resources/application-dev.yml

@@ -41,7 +41,8 @@ spring:
     async:
       request-timeout: 60000
   redis:
-    host: 47.94.207.62
+#    host: 47.94.207.62
+    host: 10.20.2.33
     port: 6379
     password:
     jedis:
@@ -62,9 +63,12 @@ spring:
 #    url: jdbc:mysql://localhost:3306/zhxf?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&allowMultiQueries=true&serverTimezone=GMT%2B8&useSSL=false
 #    username: root
 #    password: 123456
-    url: jdbc:mysql://47.94.207.62:3306/zhxf?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&allowMultiQueries=true&serverTimezone=GMT%2B8&useSSL=false
+    url: jdbc:mysql://10.20.2.33:3306/zhxf?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&allowMultiQueries=true&serverTimezone=GMT%2B8&useSSL=false
     username: root
-    password: superAdmin&321
+    password: root
+#    url: jdbc:mysql://47.94.207.62:3306/zhxf?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&allowMultiQueries=true&serverTimezone=GMT%2B8&useSSL=false
+#    username: root
+#    password: superAdmin&321
     initialSize: 5
     minIdle: 0
     maxActive: 1000

microservice-config-server/src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
         native:
           search-locations: classpath:/
 server:
-  port: 8777
+  port: 8776
 eureka:
   client:
     fetch-registry: true

microservice-equipment/src/main/resources/bootstrap.yml

 #服务器配置信息1
 server:
-  port: 8092
+  port: 8094
   #将日志输出到文件
   config: classpath:camera-log.xml
 spring:
@@ -15,7 +15,7 @@ spring:
   cloud:
     config:
       profile: dev
-      uri: http://config:8777
+      uri: http://config:8776
         #discovery:
         #enabled: true
         #service-id: microservice-config-server
@@ -24,7 +24,7 @@ info:
   version: 0.1
 
 upload:
-  realBaseDir: /usr/local/nginx/html/dist/
+  realBaseDir: /usr/local/nginx/html/zhxf/dist/
 ---
 spring:
   profiles: test
@@ -32,7 +32,7 @@ spring:
     config:
       profile: test
       label: master
-      uri: http://config:8777
+      uri: http://config:8776
 upload:
   realBaseDir: ./root/crsh/admin/upload/
   readBaseDir: http://10.20.2.132:8089/

microservice-gateway-zuul/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
   cloud:
     config:
       profile: dev
-      uri: http://config:8777
+      uri: http://config:8776
   servlet:
     multipart:
       max-file-size: 10MB
@@ -15,7 +15,7 @@ spring:
 #        service-id: microservice-config-server
 
 server:
-  port: 8046
+  port: 8047
 info:
   version: 0.1
 
@@ -79,7 +79,7 @@ zuul:
   #添加代理头
   add-proxy-headers: true
 
-auth-server: http://auth:8300 # oauth-server地址
+auth-server: http://auth:8301 # oauth-server地址
 
 security:
   oauth2: