Merge branch 'main' into production
This commit is contained in:
		
							
								
								
									
										2
									
								
								TODOs.md
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								TODOs.md
									
									
									
									
									
								
							@@ -63,6 +63,8 @@ ping epp.only4.work
 | 
				
			|||||||
```bash
 | 
					```bash
 | 
				
			||||||
; /www/wwwroot/env/jdk-11/bin/java -jar -Xmx1024M -Xms256M  /www/wwwroot/workspace/microservice-gateway-0.0.1-SNAPSHOT.jar --server.port=7087
 | 
					; /www/wwwroot/env/jdk-11/bin/java -jar -Xmx1024M -Xms256M  /www/wwwroot/workspace/microservice-gateway-0.0.1-SNAPSHOT.jar --server.port=7087
 | 
				
			||||||
/www/wwwroot/env/jdk-11/bin/java -jar -Xmx512M -Xms128M -Dspring.profiles.active=production -Dserver.port=8000 /www/wwwroot/workspace/microservice-gateway-0.0.1-SNAPSHOT.jar
 | 
					/www/wwwroot/env/jdk-11/bin/java -jar -Xmx512M -Xms128M -Dspring.profiles.active=production -Dserver.port=8000 /www/wwwroot/workspace/microservice-gateway-0.0.1-SNAPSHOT.jar
 | 
				
			||||||
 | 
					# 小程序提审期间
 | 
				
			||||||
 | 
					# /www/wwwroot/env/jdk-11/bin/java -jar -Xmx512M -Xms128M -Dspring.profiles.active=production -Dserver.port=8000 -Depp.miniprogram.config=hide /www/wwwroot/workspace/microservice-gateway-0.0.1-SNAPSHOT.jar
 | 
				
			||||||
/www/wwwroot/env/jdk-11/bin/java -jar -Xmx512M -Xms128M -Dspring.profiles.active=production /www/wwwroot/workspace/microservice-provider-user-8001-0.0.1-SNAPSHOT.jar
 | 
					/www/wwwroot/env/jdk-11/bin/java -jar -Xmx512M -Xms128M -Dspring.profiles.active=production /www/wwwroot/workspace/microservice-provider-user-8001-0.0.1-SNAPSHOT.jar
 | 
				
			||||||
/www/wwwroot/env/jdk-11/bin/java -jar -Xmx512M -Xms128M -Dspring.profiles.active=production /www/wwwroot/workspace/microservice-provider-access-8002-0.0.1-SNAPSHOT.jar
 | 
					/www/wwwroot/env/jdk-11/bin/java -jar -Xmx512M -Xms128M -Dspring.profiles.active=production /www/wwwroot/workspace/microservice-provider-access-8002-0.0.1-SNAPSHOT.jar
 | 
				
			||||||
/www/wwwroot/env/jdk-11/bin/java -jar -Xmx512M -Xms128M -Dspring.profiles.active=production /www/wwwroot/workspace/microservice-provider-shop-8003-0.0.1-SNAPSHOT.jar
 | 
					/www/wwwroot/env/jdk-11/bin/java -jar -Xmx512M -Xms128M -Dspring.profiles.active=production /www/wwwroot/workspace/microservice-provider-shop-8003-0.0.1-SNAPSHOT.jar
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -32,7 +32,7 @@ public class Controller {
 | 
				
			|||||||
        boolean showReport = true;
 | 
					        boolean showReport = true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // 第一版提审,已通过,在线上 version == null
 | 
					        // 第一版提审,已通过,在线上 version == null
 | 
				
			||||||
        if (version.equals("2")) {
 | 
					        if (Objects.equals(version, "2")) {
 | 
				
			||||||
            // 第一版提审,按照配置文件中的配置来
 | 
					            // 第一版提审,按照配置文件中的配置来
 | 
				
			||||||
            if (Objects.equals(miniprogramConfig, "hide")) {
 | 
					            if (Objects.equals(miniprogramConfig, "hide")) {
 | 
				
			||||||
                showCode = false;
 | 
					                showCode = false;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user