Parcourir la source

项目名更改为cleanMachine

wuhongshuang il y a 5 ans
Parent
commit
7e9182c113

+ 18 - 0
.gitignore

@@ -1,3 +1,21 @@
+
+*.DS_Store
+
+### IntelliJ IDEA ###
+**/.idea/
+**/*.iws
+**/*.iml
+**/*.ipr
+
+### eclipse ###
+**/.project
+**/.classpath
+**/.settings
+**/.metadata
+**/velocity.log
+**.factorypath
+
+
 ### Eclipse template
 *.pydevproject
 .metadata

+ 1 - 1
README.md

@@ -1 +1 @@
-#mianhuatang_houtai
+#cleanMachine_houtai

+ 2 - 2
app-api/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>mianhuatang</artifactId>
+        <artifactId>cleanMachine</artifactId>
         <groupId>com.hboxs</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
@@ -41,4 +41,4 @@
     </dependencies>
 
 
-</project>
+</project>

+ 2 - 2
app-backend-myshiro/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>mianhuatang</artifactId>
+        <artifactId>cleanMachine</artifactId>
         <groupId>com.hboxs</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
@@ -25,4 +25,4 @@
     </dependencies>
 
 
-</project>
+</project>

+ 2 - 2
app-backend-web/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>mianhuatang</artifactId>
+        <artifactId>cleanMachine</artifactId>
         <groupId>com.hboxs</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
@@ -120,4 +120,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

+ 2 - 2
app-common-aop/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>mianhuatang</artifactId>
+        <artifactId>cleanMachine</artifactId>
         <groupId>com.hboxs</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
@@ -12,4 +12,4 @@
     <artifactId>app-common-aop</artifactId>
 
 
-</project>
+</project>

+ 2 - 2
app-common-filter/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>mianhuatang</artifactId>
+        <artifactId>cleanMachine</artifactId>
         <groupId>com.hboxs</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
@@ -19,4 +19,4 @@
     </dependencies>
 
 
-</project>
+</project>

+ 2 - 2
app-common-interceptor/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>mianhuatang</artifactId>
+        <artifactId>cleanMachine</artifactId>
         <groupId>com.hboxs</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
@@ -24,4 +24,4 @@
     </dependencies>
 
 
-</project>
+</project>

+ 2 - 2
app-common-listener/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>mianhuatang</artifactId>
+        <artifactId>cleanMachine</artifactId>
         <groupId>com.hboxs</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
@@ -24,4 +24,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>

+ 2 - 2
app-common/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>mianhuatang</artifactId>
+        <artifactId>cleanMachine</artifactId>
         <groupId>com.hboxs</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
@@ -20,4 +20,4 @@
     </dependencies>
 
 
-</project>
+</project>

+ 2 - 2
app-dao/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>mianhuatang</artifactId>
+        <artifactId>cleanMachine</artifactId>
         <groupId>com.hboxs</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
@@ -25,4 +25,4 @@
     </dependencies>
 
 
-</project>
+</project>

+ 2 - 2
app-entity/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>mianhuatang</artifactId>
+        <artifactId>cleanMachine</artifactId>
         <groupId>com.hboxs</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
@@ -19,4 +19,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>

+ 2 - 2
app-service/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>mianhuatang</artifactId>
+        <artifactId>cleanMachine</artifactId>
         <groupId>com.hboxs</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
@@ -30,4 +30,4 @@
     </dependencies>
 
 
-</project>
+</project>

+ 3 - 3
app-service/src/main/java/com/hboxs/service/impl/MchServiceImpl.java

@@ -73,11 +73,11 @@ public class MchServiceImpl extends BaseServiceImpl<Mch, Long> implements MchSer
 
         JSONObject requestData = new JSONObject(new LinkedHashMap());
 
-        String login_name = "test1_" + adminId + "@mianhuatang.com";
+        String login_name = "test1_" + adminId + "@cleanMachine.com";
 //        String login_name = mch.getLegal_person();
         mch.setLogin_name(login_name);
 
-//        String alt_mch_name = "test1_" + adminId  + "@mianhuatang.com";
+//        String alt_mch_name = "test1_" + adminId  + "@cleanMachine.com";
 //        String alt_mch_name = mch.getLegal_person();
         String alt_mch_name = mch.getBank_account_name();
         mch.setAlt_mch_name(alt_mch_name);
@@ -317,7 +317,7 @@ public class MchServiceImpl extends BaseServiceImpl<Mch, Long> implements MchSer
 
         String url = "https://www.joinpay.com/allocFunds";
         JSONObject requestData = new JSONObject(new LinkedHashMap());
-        requestData.put("alt_login_name", "test1_" + mch.getAdminId() + "@mianhuatang.com");
+        requestData.put("alt_login_name", "test1_" + mch.getAdminId() + "@cleanMachine.com");
 
 
         JSONObject requestJson = new JSONObject(new TreeMap<String, Object>());

+ 4 - 4
conf/default/system.properties

@@ -1,7 +1,7 @@
 ### System Properties
 ## DB Config
 # localhost connect url
-jdbc.url=jdbc\:mysql\://localhost\:3306/mianhuatang?useUnicode\=true&characterEncoding\=UTF-8
+jdbc.url=jdbc\:mysql\://localhost\:3306/cleanMachine?useUnicode\=true&characterEncoding\=UTF-8
 jdbc.username=hboxs
 jdbc.password=hboxs@mysql
 jdbc.driver=com.mysql.jdbc.Driver
@@ -45,9 +45,9 @@ mail.smtp.starttls.enable=false
 mail.smtp.auth=true
 mail.smtp.timeout=25000
 ## System Config
-system.description=申泽智能
+system.description=锟斤拷锟斤拷锟斤拷锟斤拷
 system.version=1.0
-system.name=mianhuatang
+system.name=cleanMachine
 system.project_name=127_0_0_1_hboxs
 system.show_powered=true
 ## Shipping Config
@@ -84,4 +84,4 @@ redis.maxActive=1024
 redis.maxIdle=200
 redis.maxWait=10000
 redis.testOnBorrow=true
-#DBSync.testOnBorrow=true
+#DBSync.testOnBorrow=true

+ 1 - 1
conf/default/system.xml

@@ -3,7 +3,7 @@
 <system>
     <!--<setting name="siteUrl" value="http://39.108.10.195:80"/>-->
     <setting name="siteUrl" value="http://47.112.127.131"/>
-    <setting name="rootPath" value="/hboxs/mianhuatang/static"/>
+    <setting name="rootPath" value="/hboxs/cleanMachine/static"/>
     <setting name="siteName" value="申泽智能"/>
     <setting name="watermarkAlpha" value="50"/>
     <setting name="watermarkImage" value="/upload/image/watermark.png"/>

+ 4 - 4
conf/local/system.properties

@@ -1,7 +1,7 @@
 ### System Properties
 ## DB Config
 # localhost connect url
-jdbc.url=jdbc\:mysql\://localhost\:3306/mianhuatang?useUnicode\=true&characterEncoding\=UTF-8
+jdbc.url=jdbc\:mysql\://localhost\:3306/cleanMachine?useUnicode\=true&characterEncoding\=UTF-8
 jdbc.username=hboxs
 jdbc.password=hboxs@mysql
 jdbc.driver=com.mysql.jdbc.Driver
@@ -45,9 +45,9 @@ mail.smtp.starttls.enable=false
 mail.smtp.auth=true
 mail.smtp.timeout=25000
 ## System Config
-system.description=申泽智能
+system.description=锟斤拷锟斤拷锟斤拷锟斤拷
 system.version=1.0
-system.name=mianhuatang
+system.name=cleanMachine
 system.project_name=127_0_0_1_hboxs
 system.show_powered=true
 ## Shipping Config
@@ -84,4 +84,4 @@ redis.maxActive=1024
 redis.maxIdle=200
 redis.maxWait=10000
 redis.testOnBorrow=true
-#DBSync.testOnBorrow=true
+#DBSync.testOnBorrow=true

+ 1 - 1
conf/local/system.xml

@@ -3,7 +3,7 @@
 <system>
     <!--<setting name="siteUrl" value="http://39.108.10.195:80"/>-->
     <setting name="siteUrl" value="http://127.0.0.1:8080"/>
-    <setting name="rootPath" value="/hboxs/mianhuatang/static"/>
+    <setting name="rootPath" value="/hboxs/cleanMachine/static"/>
     <setting name="siteName" value="申泽智能"/>
     <setting name="watermarkAlpha" value="50"/>
     <setting name="watermarkImage" value="/upload/image/watermark.png"/>

+ 3 - 3
conf/release/system.properties

@@ -1,7 +1,7 @@
 ### System Properties
 ## DB Confighttp
 # localhost connect url
-jdbc.url=jdbc\:mysql\://localhost:3306/mianhuatang?useUnicode\=true&characterEncoding\=UTF-8
+jdbc.url=jdbc\:mysql\://localhost:3306/cleanMachine?useUnicode\=true&characterEncoding\=UTF-8
 jdbc.username=hboxs
 jdbc.password=hboxs@mysql
 jdbc.driver=com.mysql.jdbc.Driver
@@ -45,9 +45,9 @@ mail.smtp.starttls.enable=false
 mail.smtp.auth=true
 mail.smtp.timeout=25000
 ## System Config
-system.description=申泽智能
+system.description=锟斤拷锟斤拷锟斤拷锟斤拷
 system.version=1.0
-system.name=mianhuatang
+system.name=cleanMachine
 system.project_name=127_0_0_1_hboxs
 system.show_powered=true
 ## Shipping Config

+ 1 - 1
conf/release/system.xml

@@ -3,7 +3,7 @@
 <system>
     <!--<setting name="siteUrl" value="http://39.108.10.195:80"/>-->
     <setting name="siteUrl" value="http://127.0.0.1:8080"/>
-    <setting name="rootPath" value="/hboxs/mianhuatang/static"/>
+    <setting name="rootPath" value="/hboxs/cleanMachine/static"/>
     <setting name="siteName" value="申泽智能"/>
     <setting name="watermarkAlpha" value="50"/>
     <setting name="watermarkImage" value="/upload/image/watermark.png"/>

+ 1 - 1
pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.hboxs</groupId>
-    <artifactId>mianhuatang</artifactId>
+    <artifactId>cleanMachine</artifactId>
     <packaging>pom</packaging>
     <version>1.0-SNAPSHOT</version>
     <modules>

+ 2 - 2
tools-env-exe/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>mianhuatang</artifactId>
+        <artifactId>cleanMachine</artifactId>
         <groupId>com.hboxs</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
@@ -12,4 +12,4 @@
     <artifactId>tools-env-exe</artifactId>
 
 
-</project>
+</project>