yshop1.9,新增城市接口,修复小程序登陆与支付问题,发布mpvue1.0小程序

RothsZhao · Jan 19, 2020 · dcfca45 · dcfca45
1 parent a598920
commit dcfca45
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -147,15 +147,14 @@ CMS，CRM，OA等等本版本本身属于独立后台商城管理系统;
 - yshop1.6.4发布：后台新增修改订单价格与备注优化订单详情显示明细,修复积分记录标题不显示的问题
 - yshop1.7 发布
  - yshop1.8发布:
- - yshop1.8.1发布更新如下：
-   - 1、修复库存问题#I17Z5X
-   - 2、修复评价百分比精度问题#I17UQY
-   - 3、修复评价列表问题#I17TZC
-   - 4、移动端图片上传修改为统一处理
 - yshop1.8.3发布更新如下：
   -  1、H5注册新增阿里云短信功能 #I17Z7F
   -  2、解决后台修改价格之后不能重复发起微信支付的问题 #I185TD
   -  2、修复移动springsecurity 权限拦截验证问题（重要）
+ - yshop1.9,新增城市接口,修复小程序登陆与支付问题,发布mpvue1.0小程序
+  - 1、新增城市接口
+  - 2、修复小程序登陆与支付问题
+  - 3、发布mpvue1.0小程序
 
 
 #### 反馈交流

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>co.yixiang</groupId>
     <artifactId>yshop</artifactId>
     <packaging>pom</packaging>
-    <version>1.8</version>
+    <version>1.9</version>
 
     <modules>
         <module>yshop-common</module>
@@ -16,6 +16,7 @@
         <module>yshop-tools</module>
         <module>yshop-monitor</module>
         <module>yshop-generator</module>
+        <module>yshop-api</module>
         <module>yshop-mp</module>
         <module>yshop-shop</module>
     </modules>
@@ -128,7 +129,7 @@
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>swagger-bootstrap-ui</artifactId>
-            <version>1.9.3</version>
+            <version>1.9.6</version>
         </dependency>
 
         <!--Mysql依赖包-->

diff --git a/yshop-common/pom.xml b/yshop-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>yshop</artifactId>
         <groupId>co.yixiang</groupId>
-        <version>1.8</version>
+        <version>1.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/yshop-common/src/main/java/co/yixiang/utils/FileUtil.java b/yshop-common/src/main/java/co/yixiang/utils/FileUtil.java
@@ -114,7 +114,7 @@ public static String getSize(long size){
     /**
      * inputStream 转 File
      */
-    static File inputStreamToFile(InputStream ins, String name) throws Exception{
+    public static File inputStreamToFile(InputStream ins, String name) throws Exception{
         File file = new File(System.getProperty("java.io.tmpdir") + File.separator + name);
         if (file.exists()) {
             return file;
@@ -310,4 +310,31 @@ public static String getMd5(File file) {
         return getMd5(getByte(file));
     }
 
+    /**
+     * 读取json文件，返回json串
+     * @param fileName
+     * @return
+     */
+    public static String readJsonFile(String fileName) {
+        String jsonStr = "";
+        try {
+            File jsonFile = new File(fileName);
+            FileReader fileReader = new FileReader(jsonFile);
+
+            Reader reader = new InputStreamReader(new FileInputStream(jsonFile),"utf-8");
+            int ch = 0;
+            StringBuffer sb = new StringBuffer();
+            while ((ch = reader.read()) != -1) {
+                sb.append((char) ch);
+            }
+            fileReader.close();
+            reader.close();
+            jsonStr = sb.toString();
+            return jsonStr;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
 }
diff --git a/yshop-generator/pom.xml b/yshop-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>yshop</artifactId>
         <groupId>co.yixiang</groupId>
-        <version>1.8</version>
+        <version>1.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-common</artifactId>
-            <version>1.8</version>
+            <version>1.9</version>
         </dependency>
 
         <!--模板引擎-->

diff --git a/yshop-logging/pom.xml b/yshop-logging/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>yshop</artifactId>
         <groupId>co.yixiang</groupId>
-        <version>1.8</version>
+        <version>1.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-common</artifactId>
-            <version>1.8</version>
+            <version>1.9</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/yshop-monitor/pom.xml b/yshop-monitor/pom.xml
@@ -13,7 +13,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>yshop-monitor</artifactId>
-	<version>1.8</version>
+	<version>1.9</version>
 
 	<name>客户端监控模块</name>
 

diff --git a/yshop-mp/pom.xml b/yshop-mp/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>yshop</artifactId>
         <groupId>co.yixiang</groupId>
-        <version>1.8</version>
+        <version>1.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-common</artifactId>
-            <version>1.8</version>
+            <version>1.9</version>
         </dependency>
     </dependencies>
 

diff --git a/yshop-shop/pom.xml b/yshop-shop/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>yshop</artifactId>
         <groupId>co.yixiang</groupId>
-        <version>1.8</version>
+        <version>1.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -20,12 +20,12 @@
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-logging</artifactId>
-            <version>1.8</version>
+            <version>1.9</version>
         </dependency>
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-mp</artifactId>
-            <version>1.8</version>
+            <version>1.9</version>
         </dependency>
 
     </dependencies>

diff --git a/yshop-system/pom.xml b/yshop-system/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>yshop</artifactId>
         <groupId>co.yixiang</groupId>
-        <version>1.8</version>
+        <version>1.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-generator</artifactId>
-            <version>1.8</version>
+            <version>1.9</version>
             <exclusions>
                 <exclusion>
                     <groupId>co.yixiang</groupId>
@@ -34,19 +34,25 @@
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-tools</artifactId>
-            <version>1.8</version>
+            <version>1.9</version>
         </dependency>
 
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-shop</artifactId>
-            <version>1.8</version>
+            <version>1.9</version>
         </dependency>
 
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-mp</artifactId>
-            <version>1.8</version>
+            <version>1.9</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>co.yixiang</groupId>
+                    <artifactId>yshop-common</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

diff --git a/yshop-tools/pom.xml b/yshop-tools/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>yshop</artifactId>
         <groupId>co.yixiang</groupId>
-        <version>1.8</version>
+        <version>1.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-logging</artifactId>
-            <version>1.8</version>
+            <version>1.9</version>
         </dependency>
 
         <!--邮件依赖-->